From 541217452cbd17d908daf8fe139e9870423bbb70 Mon Sep 17 00:00:00 2001 From: Konstantin Aladyshev Date: Tue, 17 Nov 2020 13:15:50 +0300 Subject: meta-ethanolx: Remove devicetree patch as all changes were merged upstream Devicetree patch is no longer needed as all the changes are now merged upstream and will be by default in the next kernel release. As to the current OpenBMC kernel release, all the changes were backported and therefore the devicetree patch is no needed here too. (From meta-amd rev: a6dd837fee1cd0ff765d9f84150baea32b4ab35d) Signed-off-by: Konstantin Aladyshev Change-Id: I81b5a8bd139dcf1da32da6b5005b3e9e015d2fd7 Signed-off-by: Brad Bishop --- ...peed-Add-GPIO-line-names-for-AMD-EthanolX.patch | 64 ---------------------- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 3 +- 2 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-GPIO-line-names-for-AMD-EthanolX.patch diff --git a/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-GPIO-line-names-for-AMD-EthanolX.patch b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-GPIO-line-names-for-AMD-EthanolX.patch deleted file mode 100644 index a8d560c28..000000000 --- a/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-GPIO-line-names-for-AMD-EthanolX.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 29fe80d452e598e15b26d3570b8f460bf14a7e42 Mon Sep 17 00:00:00 2001 -From: Supreeth Venkatesh -Date: Tue, 18 Aug 2020 10:56:37 -0500 -Subject: [PATCH 1/1] ARM:dts:aspeed: Add GPIO line names for AMD EthanolX -Content-Type: text/plain; charset="us-ascii" -Content-Transfer-Encoding: 7bit - -Add GPIO line names for AMD EthanolX customer reference board. -It populates AST2500 GPIO lines (A0-A7 to AC0-AC7) with AMD EthanolX -designated names. - -Signed-off-by: Supreeth Venkatesh ---- - arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 34 +++++++++++++++++++ - 1 file changed, 34 insertions(+) - -diff --git a/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts b/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts -index 60ba86f3e5bc..008001f95399 100644 ---- a/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts -+++ b/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts -@@ -82,6 +82,40 @@ - &pinctrl_adc4_default>; - }; - -+&gpio { -+ status = "okay"; -+ gpio-line-names = -+ /*A0-A7*/ "","","FAULT_LED","CHASSIS_ID_LED","","","","", -+ /*B0-B7*/ "","","","","","","","", -+ /*C0-C7*/ "CHASSIS_ID_BTN","INTRUDER","AC_LOSS","","","","","", -+ /*D0-D7*/ "HDT_DBREQ","LOCAL_SPI_ROM_SEL","FPGA_SPI_ROM_SEL","JTAG_MUX_S","JTAG_MUX_OE","HDT_SEL","ASERT_WARM_RST_BTN","FPGA_RSVD", -+ /*E0-E7*/ "","","MON_P0_PWR_BTN","MON_P0_RST_BTN","MON_P0_NMI_BTN","MON_P0_PWR_GOOD","MON_PWROK","MON_RESET", -+ /*F0-F7*/ "MON_P0_PROCHOT","MON_P1_PROCHOT","MON_P0_THERMTRIP","MON_P1_THERMTRIP","P0_PRESENT","P1_PRESENT","MON_ATX_PWR_OK","", -+ /*G0-G7*/ "BRD_REV_ID_3","BRD_REV_ID_2","BRD_REV_ID_1","BRD_REV_ID_0","P0_APML_ALERT","P1_APML_ALERT","FPGA ALERT","", -+ /*H0-H7*/ "BRD_ID_0","BRD_ID_1","BRD_ID_2","BRD_ID_3","PCIE_DISCONNECTED","USB_DISCONNECTED","SPARE_0","SPARE_1", -+ /*I0-I7*/ "","","","","","","","", -+ /*J0-J7*/ "","","","","","","","", -+ /*K0-K7*/ "","","","","","","","", -+ /*L0-L7*/ "","","","","","","","", -+ /*M0-M7*/ "ASSERT_PWR_BTN","ASSERT_RST_BTN","ASSERT_NMI_BTN","ASSERT_LOCAL_LOCK","ASSERT_P0_PROCHOT","ASSERT_P1_PROCHOT","ASSERT_CLR_CMOS","ASSERT_BMC_READY", -+ /*N0-N7*/ "","","","","","","","", -+ /*O0-O7*/ "","","","","","","","", -+ /*P0-P7*/ "P0_VDD_CORE_RUN_VRHOT","P0_VDD_SOC_RUN_VRHOT","P0_VDD_MEM_ABCD_SUS_VRHOT","P0_VDD_MEM_EFGH_SUS_VRHOT","P1_VDD_CORE_RUN_VRHOT","P1_VDD_SOC_RUN_VRHOT","P1_VDD_MEM_ABCD_SUS_VRHOT","P1_VDD_MEM_EFGH_SUS_VRHOT", -+ /*Q0-Q7*/ "","","","","","","","", -+ /*R0-R7*/ "","","","","","","","", -+ /*S0-S7*/ "","","","","","","","", -+ /*T0-T7*/ "","","","","","","","", -+ /*U0-U7*/ "","","","","","","","", -+ /*V0-V7*/ "","","","","","","","", -+ /*W0-W7*/ "","","","","","","","", -+ /*X0-X7*/ "","","","","","","","", -+ /*Y0-Y7*/ "","","","","","","","", -+ /*Z0-Z7*/ "","","","","","","","", -+ /*AA0-AA7*/ "","SENSOR THERM","","","","","","", -+ /*AB0-AB7*/ "","","","","","","","", -+ /*AC0-AC7*/ "","","","","","","",""; -+}; -+ - //APML for P0 - &i2c0 { - status = "okay"; --- -2.17.1 - diff --git a/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed_%.bbappend index 343a0105b..9f7f1b99d 100644 --- a/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,3 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" -SRC_URI += "file://ethanolx.cfg \ - file://0001-ARM-dts-aspeed-Add-GPIO-line-names-for-AMD-EthanolX.patch" +SRC_URI += "file://ethanolx.cfg" -- cgit v1.2.3 From 4f6f30a9bb1222bdd266453dd663983bc7eb6faf Mon Sep 17 00:00:00 2001 From: Stanley Chu Date: Mon, 25 Jan 2021 16:19:57 +0800 Subject: u-boot-nuvoton: srcrev bump 6870e66f6b...c311158da2 Avi Fishman (1): configs: npcm7xx: add CONFIG_MMC_SDHCI_SDMA=y Brian Ma (2): driver: pinctrl-npcm7xx: allow change gpio persist state cmd: add mcu command for update Runbmc MCU firmware Fii Firmware Team (1): add Fii kudo project dts & dtsi files Fran Hsu (2): dts:npcm730 GSZL add dts/pinctrl support. meta-gis: update quanta-gis DTS. Joseph Liu (1): driver: pinctrl: npcm7xx: fixs cannot enable gpio persist Medad CChien (1): NPCM750: SHA Hash Engine: Enable and Reset Module in hw_sha_init() Stanley Chu (1): driver: i2c-npcm7xx: do bus recovery when transfer has errors. jimliu2 (1): cmd: add gfx command for gfx test (From meta-nuvoton rev: 9be16ae7461763fe638546437b8bc6086031ccc7) Signed-off-by: Stanley Chu Change-Id: I7fa6b25088618164d856ed27244d870588673907 Signed-off-by: Brad Bishop --- meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc index ca05f2b65..62082b10b 100644 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" UBRANCH = "npcm7xx-v2019.01" SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH}" -SRCREV = "6870e66f6bf0653a1e2f2677c5f86b2056454032" +SRCREV = "c311158da2dff0cb2a0a9fefbf9e2979747a2134" S = "${WORKDIR}/git" -- cgit v1.2.3 From 2235f67790cd37e64b3bbb724b5dafdce0a321f6 Mon Sep 17 00:00:00 2001 From: George Hung Date: Wed, 27 Jan 2021 19:24:56 +0800 Subject: meta-quanta: gbs: set CRITILO fan speed to 600 RPM Set CRITILO fan speed to 600 RPM for host tool fan pwm calculation (From meta-quanta rev: 3bee1ba439c56ccb37ee1465a7d4209f757db015) Signed-off-by: George Hung Change-Id: Ica5a0e030f32425f74c30ad5c2dd80b875227b87 Signed-off-by: Brad Bishop --- .../obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf index 5b937e675..66ae42206 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf @@ -2,7 +2,7 @@ LABEL_fan1= "fan0" WARNHI_fan1= "19800" WARNLO_fan1= "3330" CRITHI_fan1= "19800" -CRITLO_fan1= "3330" +CRITLO_fan1= "600" MINVALUE_fan1 = "0" MAXVALUE_fan1 = "20775" PWM_TARGET_fan1 = 1 @@ -11,7 +11,7 @@ LABEL_fan2= "fan1" WARNHI_fan2= "19800" WARNLO_fan2= "3330" CRITHI_fan2= "19800" -CRITLO_fan2= "3330" +CRITLO_fan2= "600" MINVALUE_fan2 = "0" MAXVALUE_fan2 = "20775" PWM_TARGET_fan2 = 2 @@ -20,7 +20,7 @@ LABEL_fan3= "fb_fan0" WARNHI_fan3= "19800" WARNLO_fan3= "3330" CRITHI_fan3= "19800" -CRITLO_fan3= "3330" +CRITLO_fan3= "600" MINVALUE_fan3 = "0" MAXVALUE_fan3 = "20775" PWM_TARGET_fan3 = 3 @@ -29,7 +29,7 @@ LABEL_fan4= "fb_fan2" WARNHI_fan4= "19800" WARNLO_fan4= "3330" CRITHI_fan4= "19800" -CRITLO_fan4= "3330" +CRITLO_fan4= "600" MINVALUE_fan4 = "0" MAXVALUE_fan4 = "20775" PWM_TARGET_fan4 = 4 @@ -38,7 +38,7 @@ LABEL_fan5= "fb_fan1" WARNHI_fan5= "19800" WARNLO_fan5= "3330" CRITHI_fan5= "19800" -CRITLO_fan5= "3330" +CRITLO_fan5= "600" MINVALUE_fan5 = "0" MAXVALUE_fan5 = "20775" PWM_TARGET_fan5 = 5 -- cgit v1.2.3 From 55771c908be882252237b3a7936f5fa3162ab871 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 27 Jan 2021 19:02:13 +0000 Subject: pldm: srcrev bump 6a7ec0c11d..5b5fa4362b Adriana Kobylak (5): oem-ibm: inband: Add processCodeUpdateLid() oem-ibm: inband: Check lid is complete oem-ibm: inband: Remove the lid header oem-ibm: inband: Handle BMC lids oem-ibm: inband: Add assembleCodeUpdateImage() Andrew Geissler (1): softoff: support host transition state Ed Tanous (1): Remove undefined behavior Manojkiran Eda (1): Update State Effecter PDR to support BMC Reboot Sagar Srinivas (3): oem-ibm: create OEM PDRs for all OEM state sensors and effecters oem-ibm: Implement SetEffecter actions corresponding to code update actions Platform: Unit tests for OEM PDRs Sampa Misra (3): oem ibm: infrastructure for oem handlers oem ibm: support reading LIDs based on type oem ibm: marker LID validation Varsha Kaverappa (3): OEM IBM: Platform: event framework to send events to PHYP pldm: inband code update: clear the image LIDs when pldm daemon comes up Inband code update: send PLDM events up for all code update states Change-Id: If3404f38ee03e26a1247a815e77a004601de3d2f Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 14d8ea881..3a73f291d 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "6a7ec0c11d20842800c8540d510aa9354813de7e" +SRCREV = "5b5fa4362bdfb38ffb8254f9471f41c224be281a" -- cgit v1.2.3 From 64f49d6cb4e1433dc6c498288149f16c521a0fd0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 27 Jan 2021 18:51:58 +0000 Subject: phosphor-fan-presence: srcrev bump 23f8757eda..0d0e355482 Matt Spinler (2): monitor: Add ability to delay finding conf file presence: Don't start until JSON config is found Matthew Barth (3): monitor: Move tach sensor template function to header monitor: Enhance tracing of fan & tach sensor states monitor: Add journal traces on tach sensor timer state changes Change-Id: I97603011b47bc22482a62296de33fc7a57888b24 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index b54465e1a..25a577a5e 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "23f8757eda6a18f6da10fc0f9e07080467462ea9" +SRCREV = "0d0e35548262dd96881986042d9828383f05ea2a" -- cgit v1.2.3 From 51a486e9ff5ae808504d552571341ee7d618d93a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 27 Jan 2021 14:11:13 +0000 Subject: telemetry: srcrev bump 982c5b5b1e..d960e1f37e Wludzik, Jozef (3): Add TriggerManager and Trigger objects Implement NumericThreshold for Trigger Implement Trigger Actions Change-Id: I8ca34917381d2e065a3cc6b4b09ba7f0a43cbab6 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index f580fa62f..33e176b50 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "982c5b5b1ebe368329f6a1a95a8893b03953cb9b" +SRCREV = "d960e1f37e72115fdd8ec0163c99bb19e0487b91" S = "${WORKDIR}/git" -- cgit v1.2.3 From c11c871177bc06d21acc7f3ece67e55383092eeb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 27 Jan 2021 11:41:33 +0000 Subject: webui-vue: srcrev bump 2ec04fbb91..6e2cb97842 SurenNeware (3): Update linting and code formatting node packages Update security settings text Fixed icon or text only button accessibility Change-Id: Icfc9cd27ffb6f36a82d33ebe19665cf44d2d9e6b Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 163727394..b2a603efb 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "2ec04fbb915a2d3428312288a282008c138a9a62" +SRCREV = "6e2cb978428ba078ebe0d171a69322308ab48d48" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 6eab4829b6a83108818ad0fcd7b002489e559a81 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 26 Jan 2021 20:31:06 +0000 Subject: phosphor-ipmi-flash: srcrev bump 84904b97d4..ebccf63286 William A. Kennington III (2): tools: Make progress bar starting more consistent tools: Fix missing FD close() Change-Id: I476059785b03f7537dfc1d6389943c335ea7752d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 05ccd7b24..2658423bc 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -46,7 +46,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "84904b97d4952a4f48ace53db67d314efcb02be5" +SRCREV = "ebccf632866584bf7a9d097fdaad7c4bc8f039bc" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ -- cgit v1.2.3 From f7b7d070a23efec1d6ea52d124347e0cba221b23 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 26 Jan 2021 16:50:50 +0000 Subject: bmcweb: srcrev bump a90daf1828..349a2ac392 Albert Zhang (1): Tasks for TFTP upload Gunnar Mills (2): Move to 2020.4 Exclude not used schemas Change-Id: I486f255d3d4733d8aa7b9a93e8a60f0aec686bb8 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index cd5aa1e8f..d9344f64b 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "a90daf182891521fcc7c3e99ba266e6a55d4b4dd" +SRCREV = "349a2ac3921e17ff0e2bce47ba6698112d586e67" S = "${WORKDIR}/git" -- cgit v1.2.3 From 6ecacec9d3bf7edbd8468c0cc77676c0020aef78 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 26 Jan 2021 00:20:34 +0000 Subject: stdplus: srcrev bump 5f22a6c260..be79c1ea9f William A. Kennington III (5): meson: Fix pkgconfig generation raw: noexcept correctness handle: Support functors alongside function pointers handle: Improve noexcept qualification test/raw: Fix missing include Change-Id: I74b0d145244122723d8aecd1bcdfcd5e4323ca92 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/stdplus/stdplus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb index 78c6cdb9a..52bfcb208 100644 --- a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb +++ b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb @@ -17,6 +17,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/stdplus" -SRCREV = "5f22a6c260295b5d8553d77893aba01684e4a72c" +SRCREV = "be79c1ea9f092f55a2437309283f0bfaae9fe6ed" S = "${WORKDIR}/git" -- cgit v1.2.3 From 40afe30e8c47d057ab4a11992ac204678d47829b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 25 Jan 2021 21:32:35 +0000 Subject: phosphor-bmc-code-mgmt: srcrev bump 837de88135..0a06e97ff3 George Liu (1): Add support for tarball contents signature Henry Tian (1): image_verify: Support full image Change-Id: I1aa536995164550a480ecb2ad11681737d739aa8 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index fd24b0f8f..bfb01f0da 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "837de88135a12b43c8fae84937e34d84ab462807" +SRCREV = "0a06e97ff30ba125f13bfcbe2adaaeb1e5333a68" -- cgit v1.2.3 From 8e30b9f697e5c53f3329d6f7ddd757dd517e5bf5 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Tue, 26 Jan 2021 09:18:00 -0800 Subject: Move meta-intel OWNERS file the meta-intel renaming and the OWNERS file checkin went in in to master in a different order than I intended, so the OWNERS file ended up in the wrong folder, an empty meta-intel. This commit moves meta-intel into meta-intel-openbmc, which is what was intended. Signed-off-by: Ed Tanous Change-Id: I0dc521fe7c0f3d495d8fe3d59dc9bcc271c70ee8 --- meta-intel-openbmc/OWNERS | 3 +++ meta-intel/OWNERS | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 meta-intel-openbmc/OWNERS delete mode 100644 meta-intel/OWNERS diff --git a/meta-intel-openbmc/OWNERS b/meta-intel-openbmc/OWNERS new file mode 100644 index 000000000..a3df3d5b4 --- /dev/null +++ b/meta-intel-openbmc/OWNERS @@ -0,0 +1,3 @@ +owners: +- vernon.mauery@linux.intel.com +- jason.m.bills@linux.intel.com diff --git a/meta-intel/OWNERS b/meta-intel/OWNERS deleted file mode 100644 index a3df3d5b4..000000000 --- a/meta-intel/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -owners: -- vernon.mauery@linux.intel.com -- jason.m.bills@linux.intel.com -- cgit v1.2.3 From bd165ffebdda2783c086807ebee154c52e70e7b0 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 27 Jan 2021 13:52:09 -0600 Subject: meta-phosphor: remove ssh test keys class from default image The phosphor-deploy-ssh-keys.bbclass was intended to be an optional method to add additional SSH keys into a test image, but the way it was implemented the class is always creating warnings like: WARNING: obmc-phosphor-image-1.0-r0 do_image: Trying to deploy SSH keys but input variable is empty (SSH_KEYS) Remove the inherit in the phosphor-image. If a user wants this feature they can edit their `conf/local.conf` to add: INHERIT += "phosphor-deploy-ssh-keys" They are likely doing something similar anyhow with the SSH_KEYS variable (adding it to the conf/local.conf). Signed-off-by: Patrick Williams Change-Id: Id06e25ba0d22f021d81ee2cd0110d696591c1f59 --- meta-phosphor/classes/obmc-phosphor-image.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index da8c337f1..7a213e513 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -33,7 +33,6 @@ inherit core-image inherit obmc-phosphor-utils -inherit phosphor-deploy-ssh-keys FEATURE_PACKAGES_obmc-bmc-state-mgmt ?= "packagegroup-obmc-apps-bmc-state-mgmt" FEATURE_PACKAGES_obmc-bmcweb ?= "packagegroup-obmc-apps-bmcweb" -- cgit v1.2.3 From b7af0edd96ccdb2f7974759f7eac24b75596c4d5 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 26 Jan 2021 07:56:51 -0600 Subject: add geissonator as maintainer to ibm layers I've been utilizing my gerrit admin abilities to merge autobumps and backup Brad in these meta layers. The OWNERS plugin disabled this path for me. My intention is to keep with this same workflow. I'll merge autobumps and backup Brad as needed. Signed-off-by: Andrew Geissler Change-Id: Ib248c6122644dbbd4b024ed07eb7259db85daf1e --- meta-ibm/MAINTAINERS | 1 + meta-ibm/OWNERS | 1 + meta-openpower/MAINTAINERS | 1 + meta-openpower/OWNERS | 1 + 4 files changed, 4 insertions(+) diff --git a/meta-ibm/MAINTAINERS b/meta-ibm/MAINTAINERS index bfe81dea1..68f29a274 100644 --- a/meta-ibm/MAINTAINERS +++ b/meta-ibm/MAINTAINERS @@ -43,3 +43,4 @@ START OF MAINTAINERS LIST ------------------------- M: Brad Bishop +M: Andrew Geissler diff --git a/meta-ibm/OWNERS b/meta-ibm/OWNERS index 15c6c2dbd..f7922296e 100644 --- a/meta-ibm/OWNERS +++ b/meta-ibm/OWNERS @@ -1,2 +1,3 @@ owners: - bradleyb@fuzziesquirrel.com +- geissonator@yahoo.com diff --git a/meta-openpower/MAINTAINERS b/meta-openpower/MAINTAINERS index d95ebb624..1171b6c57 100644 --- a/meta-openpower/MAINTAINERS +++ b/meta-openpower/MAINTAINERS @@ -44,3 +44,4 @@ START OF MAINTAINERS LIST M: Brad Bishop M: Joel Stanley +M: Andrew Geissler diff --git a/meta-openpower/OWNERS b/meta-openpower/OWNERS index 0a7814c6a..1a9432277 100644 --- a/meta-openpower/OWNERS +++ b/meta-openpower/OWNERS @@ -1,3 +1,4 @@ owners: - bradleyb@fuzziesquirrel.com - joel@jms.id.au +- geissonator@yahoo.com -- cgit v1.2.3 From f4a1ba5e78e225e598066c0a61474b943be5385a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 26 Jan 2021 08:12:55 -0600 Subject: add geissonator as maintainer to meta-phosphor I've been utilizing my gerrit admin abilities to merge autobumps and backup Brad in meta-phosphor. The OWNERS plugin disabled this path for me. My intention is to keep with this same workflow. I'll merge autobumps and backup Brad as needed. Signed-off-by: Andrew Geissler Change-Id: I315ecda88d16d7698d929e64a8d55db88906a50f --- meta-phosphor/MAINTAINERS | 1 + meta-phosphor/OWNERS | 1 + 2 files changed, 2 insertions(+) diff --git a/meta-phosphor/MAINTAINERS b/meta-phosphor/MAINTAINERS index bfe81dea1..68f29a274 100644 --- a/meta-phosphor/MAINTAINERS +++ b/meta-phosphor/MAINTAINERS @@ -43,3 +43,4 @@ START OF MAINTAINERS LIST ------------------------- M: Brad Bishop +M: Andrew Geissler diff --git a/meta-phosphor/OWNERS b/meta-phosphor/OWNERS index 15c6c2dbd..f7922296e 100644 --- a/meta-phosphor/OWNERS +++ b/meta-phosphor/OWNERS @@ -1,2 +1,3 @@ owners: - bradleyb@fuzziesquirrel.com +- geissonator@yahoo.com -- cgit v1.2.3 From d47f9a099a4ef992351237b0f2f562b5dc843397 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Mon, 25 Jan 2021 13:15:36 -0800 Subject: Add security flags to all phosphor builds Yocto has a built-in class for applying compiler security flags to builds. Some security concious projects within OpenBMC set these flags manually. We should do this project wide, given that it has a negligible performance impact, and brings us in line with modern security requirements. There are some whitepapers on the specifics of what these flags do, which is a much better documentation than I am able to write here, but the key takeaways are that this: 1. Enables position independent code. 2. Enables FORTIFY_SOURCE level 2. 3. Enables -wformat and -wformat-security 4. Enables strong stack protection. None of these flags should have any change in functional behavior. Section 4.3 of this doc goes through this file in more detail: https://www.nccgroup.com/globalassets/our-research/us/whitepapers/2018/improving-embedded-linux-security-yocto3.pdf croserver/eCMD doesn't currently compile with these flags, so it's explicitly excluded for the moment. Patchset has been merged against eCMD master to fix this, but we're so far behind, the bump doesn't build obmc-libobmc-intf has an error that I can't quite understand yet about unused results, which shouldn't have been effected by this, yet it seems to be related to enabling the security hardening, so it is also excluded from the security flags for the moment. libpldm includes an IBM OEM command that relies on undefined behavior with open() the proposed fix is here, but libpldm is excluded until that is merged and bumped. https://gerrit.openbmc-project.xyz/c/openbmc/pldm/+/3998412 Even with those three exceptions, getting a majority of the security flags enabled on a majority of the repos should be an overall win. Signed-off-by: Ed Tanous Change-Id: I0483b1dbe1123a7beff8c5788363685487fb9c09 --- meta-phosphor/conf/distro/include/phosphor-defaults.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index b90f28062..d5e07e34e 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -226,6 +226,19 @@ OBMC_DBUS_IFACE_ROOT ?= "xyz.openbmc_project" # phosphor-ipmi-fru-whitelist-native recipe. VIRTUAL-RUNTIME_phosphor-ipmi-providers ?= "phosphor-ipmi-fru" +# Set security headers on builds +require conf/distro/include/security_flags.inc + +# Disable security on croserver. +# Remove if https://github.com/open-power/eCMD/pull/433 is ever merged +SECURITY_STRINGFORMAT_pn-croserver = "" +# obmc-libobmc-intf doesn't compile with security flags enabled +SECURITY_CFLAGS_pn-obmc-libobmc-intf = "" + +# remove when https://gerrit.openbmc-project.xyz/c/openbmc/pldm/+/39984 +# is merged and rev bumped +SECURITY_CFLAGS_pn-pldm = "" + # Set the root password to '0penBmc' inherit extrausers -- cgit v1.2.3 From 8c5ef9e353ea6ee86772fd6839dc3c907f191d8a Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 14 Jan 2021 15:37:48 -0600 Subject: os-release: Remove --long from git describe The --long was added to address the issue described in openbmc/openbmc#1692 where a tag name may not have a '-' separator, ex: v1.99.6. The parsing of the tag name would then fail. But the parsing was recently refactored so it no longer fails, we can remove the extra verbosity of the VERSION_ID field now. In simplified form, the previous parsing: "version = versionList[0] + "-" + versionList[1]" Current parsing that doesn't fail if versionList[1] doesn't exist: "versionList[0:2]" Tested: Created a tag 2.10.99 and verified the build succeeded and the output of os-release reflected the change in the VERSION_ID: ID=openbmc-witherspoon NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)" VERSION="2.10.99" VERSION_ID=2.10.99 PRETTY_NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro) 2.10.99" BUILD_ID="2.10.99" OPENBMC_TARGET_MACHINE="witherspoon" Change-Id: I502c72a5c3bfd49913b34bbaa041086c11845421 Signed-off-by: Adriana Kobylak --- meta-phosphor/recipes-core/os-release/os-release.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend index 5d4a4afbc..4c9e157a2 100644 --- a/meta-phosphor/recipes-core/os-release/os-release.bbappend +++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend @@ -15,7 +15,7 @@ def run_git(d, cmd): bb.warn("Unexpected exception from 'git' call: %s" % e) pass -VERSION_ID := "${@run_git(d, 'describe --dirty --long')}" +VERSION_ID := "${@run_git(d, 'describe --dirty')}" VERSION = "${@'-'.join(d.getVar('VERSION_ID').split('-')[0:2])}" BUILD_ID := "${@run_git(d, 'describe --abbrev=0')}" -- cgit v1.2.3 From 49054bcb324c0bdd5916ad360bf500db9d9be508 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 14 Jan 2021 15:37:48 -0600 Subject: phosphor-ipmi-config: Handle an empty commit number The VERSION_ID may not have a commit number for the cases a tag is created, ex: 2.10.1. Since the code is expecting a commit number of 1-4 digits, use a '0' if no commit number exists. Tested: Created a tag 2.10.99 which sets VERSION_ID=2.10.99. Without this change, build fails with: "Exception: IndexError: list index out of range" With this change there are no build errors. Change-Id: I3b56ebc1844ec6748b92cca3484f9aa1f4d983f8 Signed-off-by: Adriana Kobylak --- meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index e3e5002bb..7898a1039 100644 --- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -22,14 +22,18 @@ python do_patch_ibm-ac-server() { from shutil import copyfile version_id = do_get_version(d) - # count from the commit version + # count from the commit version, minimum of one digit count = re.findall("-(\d{1,4})-", version_id) + if count: + commit = count[0] + else: + commit = "0" release = re.findall("-r(\d{1,4})", version_id) if release: - auxVer = count[0] + "{0:0>4}".format(release[0]) + auxVer = commit + "{0:0>4}".format(release[0]) else: - auxVer = count[0] + "0000" + auxVer = commit + "0000" workdir = d.getVar('WORKDIR', True) file = os.path.join(workdir, 'dev_id.json') -- cgit v1.2.3 From f197793a823fd9ddbb31a21a465933734e626e24 Mon Sep 17 00:00:00 2001 From: Maksym Sloyko Date: Tue, 8 Dec 2020 22:11:38 +0000 Subject: setup: support any level of machine conf depth Modify setup script to support any level of machine conf depth. Internally Google uses machines that sit yet another layer deep in the repository. Instead of adding yet another level of depth to the expansion, look for all configs using `find`, if it's available. If it's not, ball back to the old wildcard expansion. Signed-off-by: Maksym Sloyko Change-Id: I1066fe5f6ece4454e3555ca97f75bd91d6da1dba --- setup | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/setup b/setup index a5e90474d..57b3ded72 100755 --- a/setup +++ b/setup @@ -31,7 +31,19 @@ machine() { local target=$1 local build_dir=$2 local cfg name tmpl - for cfg in meta-*/meta-*/conf/machine/*.conf meta-*/conf/machine/*.conf; do + local configs + + # zsh requires wordsplit so that variable expansion behaves like bash + if [ -n "$ZSH_NAME" ]; then + setopt local_options shwordsplit + fi + if which find > /dev/null 2>&1; then + configs=$(find meta-* -path "*/conf/machine/*.conf") + else + configs=$(ls -1 meta-*/meta-*/conf/machine/*.conf meta-*/conf/machine/*.conf) + fi + + for cfg in $configs; do name=${cfg##*/} name=${name%.conf} tmpl=${cfg%/machine/*.conf} -- cgit v1.2.3 From f3e7ceeb25c4e1809fd54eb7b6ef97ce4ceba3c6 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Tue, 19 Jan 2021 14:09:34 -0600 Subject: meta-ibm: Use fan-monitor for fan errors Instead of using phosphor-dbus-monitor to create errors and handle power offs for fan errors, use phosphor-fan-monitor instead, now that it has the functionality. To do this, add the new rules to the fan monitor config files, and remove the phosphor-dbus-monitor fan rules files. Signed-off-by: Matt Spinler Change-Id: Ia03186132f04087be76d2fd43412c37698407f60 --- meta-ibm/recipes-phosphor/dbus/fan-policy.bb | 6 ++++ .../rainier/everest/config.json | 36 ++++++++++++++++++- .../rainier/rainier-2u/config.json | 42 +++++++++++++++++++++- .../rainier/rainier-4u/config.json | 42 +++++++++++++++++++++- 4 files changed, 123 insertions(+), 3 deletions(-) diff --git a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb index f8355053d..59e6347cc 100644 --- a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb +++ b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb @@ -12,6 +12,9 @@ SRC_URI += "file://air-cooled.yaml" SRC_URI_append_ibm-ac-server = " file://water-cooled.yaml" SRC_URI += "file://fan-errors.yaml" +SRC_URI_remove_rainier = "file://air-cooled.yaml" +SRC_URI_remove_rainier = "file://fan-errors.yaml" + do_install_append_ibm-ac-server() { install -D ${WORKDIR}/air-cooled.yaml ${D}${config_dir}/air-cooled.yaml install -D ${WORKDIR}/water-cooled.yaml ${D}${config_dir}/water-cooled.yaml @@ -26,3 +29,6 @@ do_install_append_mihawk() { FILES_${PN} += "${config_dir}/air-cooled.yaml" FILES_${PN}_append_ibm-ac-server = " ${config_dir}/water-cooled.yaml" FILES_${PN} += "${config_dir}/fan-errors.yaml" + +FILES_${PN}_remove_rainier = "${config_dir}/air-cooled.yaml" +FILES_${PN}_remove_rainier = "${config_dir}/fan-errors.yaml" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json index 936b71631..93d1bdc21 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json @@ -6,6 +6,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan0_0", @@ -23,6 +26,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan1_0", @@ -40,6 +46,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan2_0", @@ -57,6 +66,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan3_0", @@ -103,5 +115,27 @@ } ] } - ] + ], + "fault_handling": + { + "num_nonfunc_rotors_before_error": 1, + + "power_off_config": + [ + { + "type": "hard", + "cause": "missing_fan_frus", + "count": 1, + "delay": 25, + "state": "at_pgood" + }, + { + "type": "epow", + "cause": "nonfunc_fan_rotors", + "count": 3, + "service_mode_delay": 300, + "meltdown_delay": 300 + } + ] + } } diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json index 95acaa35c..b15003a50 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json @@ -6,6 +6,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan0_0", @@ -25,6 +28,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan1_0", @@ -44,6 +50,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan2_0", @@ -63,6 +72,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan3_0", @@ -82,6 +94,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan4_0", @@ -101,6 +116,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan5_0", @@ -163,5 +181,27 @@ } ] } - ] + ], + "fault_handling": + { + "num_nonfunc_rotors_before_error": 1, + + "power_off_config": + [ + { + "type": "hard", + "cause": "missing_fan_frus", + "count": 1, + "delay": 25, + "state": "at_pgood" + }, + { + "type": "epow", + "cause": "nonfunc_fan_rotors", + "count": 3, + "service_mode_delay": 300, + "meltdown_delay": 300 + } + ] + } } diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json index ce69e2002..71a489944 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json @@ -6,6 +6,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan0_0", @@ -19,6 +22,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan1_0", @@ -32,6 +38,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan2_0", @@ -45,6 +54,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan3_0", @@ -58,6 +70,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan4_0", @@ -71,6 +86,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan5_0", @@ -78,5 +96,27 @@ } ] } - ] + ], + "fault_handling": + { + "num_nonfunc_rotors_before_error": 1, + + "power_off_config": + [ + { + "type": "hard", + "cause": "missing_fan_frus", + "count": 1, + "delay": 25, + "state": "at_pgood" + }, + { + "type": "epow", + "cause": "nonfunc_fan_rotors", + "count": 2, + "service_mode_delay": 300, + "meltdown_delay": 300 + } + ] + } } -- cgit v1.2.3 From 90da9248f281ad5cbea1c91ead98e69ebaab7c4d Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 28 Jan 2021 16:05:52 +1030 Subject: u-boot-aspeed: Enable FIT signature verification This turns on FIT signature verification ("vboot") features in the ast2600_openbmc_spl_emmc_defconfig. A signed FIT will be checked by the loader (either SPl or u-boot proper). Heinrich Schuchardt (1): fit: check return value of fit_image_get_data_size() Joel Stanley (4): ast2600: Allow selection of SPL boot devices config: ast2600: Reduce SPL image size ast2600: Modify SPL SRAM layout config: ast2600: Enable FIT signature verification Change-Id: If0974fffc63072dc922b3bc5899a791adcdb40a3 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index 9cf7ca1b2..a10cc1919 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -8,7 +8,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "90a88ec328b2a9ee6b431217c466c72a32fde47b" +SRCREV = "76a4982c941e83364d04813fbb8015ec15aae1d3" SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https" -- cgit v1.2.3 From 38233d826b85340e01317dfee8e0037a4683362d Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Mon, 14 Sep 2020 14:50:04 -0500 Subject: pldm: Add squashfs-tools The squashfs tools are used by PLDM during inband update. Reference: https://gerrit.openbmc-project.xyz/c/openbmc/pldm/+/37510 Tested: Verified that the rootfs/usr/sbin/mksquashfs existed. Change-Id: Id8d00765e72ce04bc8f039403a570aa7dca98b26 Signed-off-by: Adriana Kobylak --- meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend index 335396bd7..1d6042027 100644 --- a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend +++ b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend @@ -1,8 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append = " \ - -Doem-ibm=enabled \ - " +PACKAGECONFIG += "oem-ibm" +PACKAGECONFIG[oem-ibm] = "-Doem-ibm=enabled, -Doem-ibm=disabled, , squashfs-tools" SRC_URI += "file://fileTable.json" SRC_URI += "file://enum_attrs.json" -- cgit v1.2.3 From 07934fa010e74b680e32e571cd4d1cb7a8bf80ab Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 28 Jan 2021 15:50:55 +0000 Subject: phosphor-bmc-code-mgmt: srcrev bump 0a06e97ff3..878377d3a7 Adriana Kobylak (3): utils: Add execute command reset: Call execute() instead of systemd service Revert "Factory Reset: Wait for env variables" Change-Id: I86da3af4c91d58fe0232f16d677c146b988bdb6d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index bfb01f0da..c4c1d7f21 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "0a06e97ff30ba125f13bfcbe2adaaeb1e5333a68" +SRCREV = "878377d3a7049a113a6c538d860c5caa91fffa24" -- cgit v1.2.3 From 2b6f2e19f5432a234cf1c757b51692ce8f21dfb0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 28 Jan 2021 16:11:08 +0000 Subject: phosphor-power: srcrev bump 589c181a34..9bd94d36aa Shawn McCarney (1): regulators: Clear cached hardware data during boot Change-Id: Ib08a591c7574af93ad7949f4a463e295dd57097a Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index fe7d3bba2..b705607ae 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "589c181a345406e5764084aa177e0616e212b44f" +SRCREV = "9bd94d36aaac4a341d576c241e5379d76b24ef85" -- cgit v1.2.3 From 1feee4254601da77f7db28c0833632bc64b44062 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 28 Jan 2021 09:40:43 +0000 Subject: sdeventplus: srcrev bump b0a0e4db46..cd29b6d01d George Liu (1): Fix the get_new method Change-Id: I3fc866cf1d4f749234720d84e344ea55d8311a80 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb index 9befc924a..dbd461a43 100644 --- a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb +++ b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb @@ -20,6 +20,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/sdeventplus" -SRCREV = "b0a0e4db4628e2bab502767aa08cf236a0d0bf5d" +SRCREV = "cd29b6d01de6fb30d27b1f548f13400131bfef2b" S = "${WORKDIR}/git" -- cgit v1.2.3 From 2faa6931237dc8ecf90e21c072c3e2d65ed7a11d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 28 Jan 2021 20:30:43 +0000 Subject: phosphor-fan-presence: srcrev bump 0d0e355482..11b5d8fcaf Matthew Barth (3): control: Add missing zone.hpp include to functor.hpp control: Declare non-templated handlers as inline monitor: Only stop timer when its running Change-Id: I16ecb0eac0619b414943c1c573b8b36e93dc02ad Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 25a577a5e..56275814a 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "0d0e35548262dd96881986042d9828383f05ea2a" +SRCREV = "11b5d8fcaf5b9b3b00ca3bd1260ed4db1293c8ab" -- cgit v1.2.3 From c67f0e8ed4e5261b5f009695a20240b6eb50952f Mon Sep 17 00:00:00 2001 From: Manojkiran Eda Date: Wed, 27 Jan 2021 08:38:17 +0530 Subject: Package biosconfig-manager for rainier & Tacoma - This commit would package the biosconfig-manager for both tacoma & rainier machines. Tested By : - With the changes booted the tacoma machine & observed that the biosconfig-manager services are up & runnning Signed-off-by: Manojkiran Eda Change-Id: I90542368a70284c97e1f33d29770c751a61631ca --- .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index a349d4b9c..29a567e27 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -30,13 +30,13 @@ RDEPENDS_${PN}-fan-control_append_rainier = " fan-watchdog" RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} webui-vue dbus-sensors phosphor-virtual-sensor" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}" -RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm srvcfg-manager webui-vue" +RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm srvcfg-manager webui-vue biosconfig-manager" RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller phosphor-webui" RDEPENDS_${PN}-logging_append = " ${EXTRA_IBM_LOGGING_PKGS}" -RDEPENDS_${PN}-extras_append_rainier = " pldm openpower-hw-diags srvcfg-manager" +RDEPENDS_${PN}-extras_append_rainier = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager" RDEPENDS_${PN}-leds_remove_rainier = "phosphor-led-manager-faultmonitor" RDEPENDS_${PN}-leds_remove_witherspoon-tacoma = "phosphor-led-manager-faultmonitor" -- cgit v1.2.3 From 2e425a8e47aea661aa1be5a1859a4b3505486289 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Jan 2021 12:40:11 +0000 Subject: fb-ipmi-oem: srcrev bump ad04924d4f..5f8e343516 Manikandan Elumalai (1): meta-yosemitev2: add system get/set guid support Change-Id: Ibac204f61f91eb6a1b0c25b3aeeed7727b7e865c Signed-off-by: Andrew Geissler --- meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index 9b6ce8bb6..03db6c329 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem" -SRCREV = "ad04924d4f42b007c4249d98950e0e60d79d71af" +SRCREV = "5f8e343516c0db488e977084ca7810a6c9fafae8" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 702b75c308d002aee05bdada9b024bf496fcb476 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 28 Jan 2021 22:01:43 +0000 Subject: phosphor-virtual-sensor: srcrev bump fdb826d5a4..a4fe665d15 Matt Spinler (1): Fix threshold checks Change-Id: I8bedd2df8c0841335dc80009d86df4b79d52e828 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb index adcfdecfe..26e09c4d8 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -16,7 +16,7 @@ DEPENDS += "nlohmann-json" DEPENDS += "exprtk" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=git" -SRCREV = "fdb826d5a434c4db6ee202f4d36611d744f327ea" +SRCREV = "a4fe665d15549108a5e644a423950c95ea0e72da" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "phosphor-virtual-sensor.service" -- cgit v1.2.3 From 37442acfadeef1cfb24fc7005e94f31a2b7f0a4b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Jan 2021 14:11:22 +0000 Subject: skeleton: srcrev bump 361716456e..81100ae9ee Ed Tanous (1): Fix build time error Change-Id: I16b21fd62fc18c2753ef80518dc3ae63f16a5839 Signed-off-by: Andrew Geissler --- meta-phosphor/classes/skeleton-rev.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass index 1fb017bf6..75648b004 100644 --- a/meta-phosphor/classes/skeleton-rev.bbclass +++ b/meta-phosphor/classes/skeleton-rev.bbclass @@ -1,4 +1,4 @@ -SRCREV ?= "361716456e43a44eb890c46aaa1d5a0fd6d79344" +SRCREV ?= "81100ae9ee2bb9929989f0fc813e1ac91f8e7ab0" SKELETON_URI ?= "git://github.com/openbmc/skeleton" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -- cgit v1.2.3 From 904fabf4a35bf4fed8f6845d7a744aadd86a7a5c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Jan 2021 04:30:55 +0000 Subject: libmctp: srcrev bump b4ae00b9f8..192752301b Andrew Jeffery (9): core: Set n_busses appropriately on failure to start binding core: Introduce mctp_bus_destroy() core: Drop messages sent before binding enables transmission core: Validate binding MTU before allowing transmission astlpc: Warn on unexpected commands before binding has started astlpc: Initialise with at least a BTU-sized packet tests: astlpc: Exercise mctp_message_tx() before channel init mctp-demux-daemon: Warn about failed messages core: Fail bridge initialisation if a binding fails to start Change-Id: Ieef6dbc11f5dcb426edbbfee6b9f2dc70abd39a8 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/mctp/mctp_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb b/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb index e698a9cb0..b3e986adb 100644 --- a/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb +++ b/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" SRC_URI = "git://github.com/openbmc/libmctp \ file://default" -SRCREV = "b4ae00b9f822f1d136f4684e039057521a30ac47" +SRCREV = "192752301b9d98b8699e88ede61d75e96eaed4bb" CONFFILES_${PN} = "${sysconfdir}/default/mctp" DEPENDS += "autoconf-archive-native \ -- cgit v1.2.3 From c3c24b689560c402d6e08203c6941c3d97f979cf Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Jan 2021 15:41:10 +0000 Subject: phosphor-state-manager: srcrev bump 1e8b164f7b..58477b5287 Andrew Geissler (3): synch targets: ensure wants relationship ensure synch targets started by execution targets clarify power stop and start targets Change-Id: I5bc45f3ec1467edfbb3f47182dbca9e1d7cfa872 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 580cf433d..b8785a256 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -176,6 +176,6 @@ SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHA SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "1e8b164f7b575f9728dd7f46d7b2d27e6081ee3f" +SRCREV = "58477b52876afe889caa7d7ec89ce3fadb384ead" S = "${WORKDIR}/git" -- cgit v1.2.3 From 2b4d845d7cccf10f552b199761d133e2b4736cc4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Jan 2021 17:11:57 +0000 Subject: phosphor-power: srcrev bump 9bd94d36aa..48033bf628 Shawn McCarney (1): regulators: Only configure/monitor if present Change-Id: If1742e8ea7b00cde8509c92575299ed88ec5c1f9 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index b705607ae..85d8abe10 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "9bd94d36aaac4a341d576c241e5379d76b24ef85" +SRCREV = "48033bf62871ac8c2572cebdfb4d5aab31e41f71" -- cgit v1.2.3 From 987fcc7c0eec3e5565df56c49e63d23f40856438 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Jan 2021 17:50:44 +0000 Subject: phosphor-fan-presence: srcrev bump 11b5d8fcaf..ac37297dd3 Matt Spinler (1): monitor: Write fan presence changes to journal Change-Id: If9ce710bec467ac152b3c630406919ad9384b1bd Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 56275814a..c761e978c 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "11b5d8fcaf5b9b3b00ca3bd1260ed4db1293c8ab" +SRCREV = "ac37297dd327028f8ac41e4459eeb539144292a6" -- cgit v1.2.3 From 9c56965c2b91fa63112da1d5241bf5db2ed7449b Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 29 Jan 2021 08:49:25 +1030 Subject: u-boot-aspeed: SHA512 backport and FIT bugfixes These patches bring SHA512 support to the FIT in u-boot, SPL and mkimage. The majority of the feature comes in with "Add support for SHA384 and SHA512", while the rest are relevant bugfixes that have been made to master since v2019.04. There is not yet a change to the configuration to enable the new algorithm and therefore only a minor image size change (an increase of 247 bytes due to "image: Check hash-nodes when checking configurations"). Harald Seiler (1): common: hash: Remove a debug printf statement Heinrich Schuchardt (1): image-fit: fit_check_format check for valid FDT Joel Stanley (1): ast2600: spl: Include RAM loader in BL2 ifdef Patrick Doyle (1): rsa: reject images with unknown padding Reuben Dowle (1): Add support for SHA384 and SHA512 Simon Glass (3): image: Be a little more verbose when checking signatures image: Return an error message from fit_config_verify_sig() image: Check hash-nodes when checking configurations Change-Id: I69d7ac29d8c4d710c57fc6a45b1c48022e6808c0 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index a10cc1919..4e7a92c2e 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -8,7 +8,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "76a4982c941e83364d04813fbb8015ec15aae1d3" +SRCREV = "869b79f73711d5a7b6c0bfa3c8888dc2583d1526" SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https" -- cgit v1.2.3 From 4966184a0a8b01ac055a9e806081fdd0c6cc7f5e Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Thu, 26 Nov 2020 02:24:22 +0000 Subject: meta-ampere: Initial commit of Ampere Computing This commit adds layer configuration, license, and maintainer files for meta-ampere. Signed-off-by: Thang Q. Nguyen Change-Id: I7fc3e08cddb1e402153c8d163576fa36d4441785 --- meta-ampere/COPYING.MIT | 17 ++++ meta-ampere/COPYING.apache-2.0 | 175 +++++++++++++++++++++++++++++++++++++++++ meta-ampere/LICENSE | 12 +++ meta-ampere/MAINTAINERS | 49 ++++++++++++ meta-ampere/conf/layer.conf | 10 +++ 5 files changed, 263 insertions(+) create mode 100644 meta-ampere/COPYING.MIT create mode 100644 meta-ampere/COPYING.apache-2.0 create mode 100644 meta-ampere/LICENSE create mode 100644 meta-ampere/MAINTAINERS create mode 100644 meta-ampere/conf/layer.conf diff --git a/meta-ampere/COPYING.MIT b/meta-ampere/COPYING.MIT new file mode 100644 index 000000000..89de35479 --- /dev/null +++ b/meta-ampere/COPYING.MIT @@ -0,0 +1,17 @@ +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 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. diff --git a/meta-ampere/COPYING.apache-2.0 b/meta-ampere/COPYING.apache-2.0 new file mode 100644 index 000000000..67db85882 --- /dev/null +++ b/meta-ampere/COPYING.apache-2.0 @@ -0,0 +1,175 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. diff --git a/meta-ampere/LICENSE b/meta-ampere/LICENSE new file mode 100644 index 000000000..566c5aef4 --- /dev/null +++ b/meta-ampere/LICENSE @@ -0,0 +1,12 @@ +Different components of meta-ampere are under different licenses (a mix +of MIT and Apache-2.0). Please see: + +COPYING.Apache-2.0 +COPYING.MIT (MIT) + +All metadata is MIT licensed unless otherwise stated. Source code +included in tree for individual recipes is under the LICENSE stated in +the associated recipe (.bb file) unless otherwise stated. + +License information for any other files is either explicitly stated +or defaults to Apache-2.0. diff --git a/meta-ampere/MAINTAINERS b/meta-ampere/MAINTAINERS new file mode 100644 index 000000000..7b44e5883 --- /dev/null +++ b/meta-ampere/MAINTAINERS @@ -0,0 +1,49 @@ +How to use this list: + Find the most specific section entry (described below) that matches where + your change lives and add the reviewers (R) and maintainers (M) as + reviewers. You can use the same method to track down who knows a particular + code base best. + + Your change/query may span multiple entries; that is okay. + + If you do not find an entry that describes your request at all, someone + forgot to update this list; please at least file an issue or send an email + to a maintainer, but preferably you should just update this document. + +Description of section entries: + + Section entries are structured according to the following scheme: + + X: NAME + X: ... + . + . + . + + Where REPO_NAME is the name of the repository within the OpenBMC GitHub + organization; FILE_PATH is a file path within the repository, possibly with + wildcards; X is a tag of one of the following types: + + M: Denotes maintainer; has fields NAME ; + if omitted from an entry, assume one of the maintainers from the + MAINTAINERS entry. + R: Denotes reviewer; has fields NAME ; + these people are to be added as reviewers for a change matching the repo + path. + F: Denotes forked from an external repository; has fields URL. + + Line comments are to be denoted "# SOME COMMENT" (typical shell style + comment); it is important to follow the correct syntax and semantics as we + may want to use automated tools with this file in the future. + + A change cannot be added to an OpenBMC repository without a MAINTAINER's + approval; thus, a MAINTAINER should always be listed as a reviewer. + +START OF MAINTAINERS LIST +------------------------- + +M: Thang Q. Nguyen +M: Tung Nguyen +R: Phong Vo +R: Quan Nguyen + diff --git a/meta-ampere/conf/layer.conf b/meta-ampere/conf/layer.conf new file mode 100644 index 000000000..20fb0b2a5 --- /dev/null +++ b/meta-ampere/conf/layer.conf @@ -0,0 +1,10 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ + ${LAYERDIR}/meta-common/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "ampere-layer" +BBFILE_PATTERN_ampere-layer := "^${LAYERDIR}/" +LAYERSERIES_COMPAT_ampere-layer = "dunfell gatesgarth" -- cgit v1.2.3 From 9340787ec4c07464fb26cfb78f64586af5eff2b0 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Thu, 10 Dec 2020 08:49:53 +0000 Subject: meta-ampere: Add Mt.Jade machine Add initial Mt.Jade platform support with minimal configuration so that the code can be compiled and booted on the Mt.Jade platform system. Tested: 1. Compile OpenBMC image for Mt.Jade successfully and can boot on Mt.Jade. 2. Login to console and WebUI successfully. Signed-off-by: Thang Q. Nguyen Change-Id: Ib4c2c30be7fc0a13cc66f7eb1c8b9604e9a5292f --- meta-ampere/meta-jade/conf/bblayers.conf.sample | 29 + meta-ampere/meta-jade/conf/conf-notes.txt | 2 + meta-ampere/meta-jade/conf/layer.conf | 10 + meta-ampere/meta-jade/conf/local.conf.sample | 216 ++++++++ meta-ampere/meta-jade/conf/machine/mtjade.conf | 9 + ...eed-Add-device-tree-for-Ampere-s-Mt.-Jade.patch | 599 +++++++++++++++++++++ .../recipes-kernel/linux/linux-aspeed/mtjade.cfg | 16 + .../recipes-kernel/linux/linux-aspeed_%.bbappend | 7 + .../packagegroups/packagegroup-obmc-apps.bbappend | 1 + 9 files changed, 889 insertions(+) create mode 100644 meta-ampere/meta-jade/conf/bblayers.conf.sample create mode 100644 meta-ampere/meta-jade/conf/conf-notes.txt create mode 100644 meta-ampere/meta-jade/conf/layer.conf create mode 100644 meta-ampere/meta-jade/conf/local.conf.sample create mode 100644 meta-ampere/meta-jade/conf/machine/mtjade.conf create mode 100644 meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-device-tree-for-Ampere-s-Mt.-Jade.patch create mode 100644 meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/mtjade.cfg create mode 100644 meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend create mode 100644 meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend diff --git a/meta-ampere/meta-jade/conf/bblayers.conf.sample b/meta-ampere/meta-jade/conf/bblayers.conf.sample new file mode 100644 index 000000000..f4d7fc399 --- /dev/null +++ b/meta-ampere/meta-jade/conf/bblayers.conf.sample @@ -0,0 +1,29 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-ampere \ + ##OEROOT##/meta-ampere/meta-jade \ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-ampere \ + ##OEROOT##/meta-ampere/meta-jade \ + " diff --git a/meta-ampere/meta-jade/conf/conf-notes.txt b/meta-ampere/meta-jade/conf/conf-notes.txt new file mode 100644 index 000000000..9b3c01a55 --- /dev/null +++ b/meta-ampere/meta-jade/conf/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-ampere/meta-jade/conf/layer.conf b/meta-ampere/meta-jade/conf/layer.conf new file mode 100644 index 000000000..2cf1805c7 --- /dev/null +++ b/meta-ampere/meta-jade/conf/layer.conf @@ -0,0 +1,10 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "jade-layer" +BBFILE_PATTERN_jade-layer := "^${LAYERDIR}/" +LAYERSERIES_COMPAT_jade-layer = "dunfell gatesgarth" diff --git a/meta-ampere/meta-jade/conf/local.conf.sample b/meta-ampere/meta-jade/conf/local.conf.sample new file mode 100644 index 000000000..200d89797 --- /dev/null +++ b/meta-ampere/meta-jade/conf/local.conf.sample @@ -0,0 +1,216 @@ +# +# This file is your local configuration file and is where all local user settings +# are placed. The comments in this file give some guide to the options a new user +# to the system might want to change but pretty much any configuration option can +# be set in this file. +# +# Lines starting with the '#' character are commented out and in some cases the +# default values are provided as comments to show people example syntax. Enabling +# the option is a question of removing the # character and making any change to the +# variable as required. + +# +# Machine Selection +# +MACHINE ??= "mtjade" + +# +# Where to place downloads +# +# During a first build the system will download many different source code tarballs +# from various upstream projects. This can take a while, particularly if your network +# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you +# can preserve this directory to speed up this part of subsequent builds. This directory +# is safe to share between multiple builds on the same machine too. +# +# The default is a downloads directory under TOPDIR which is the build directory. +# +#DL_DIR ?= "${TOPDIR}/downloads" + +# +# Where to place shared-state files +# +# BitBake has the capability to accelerate builds based on previously built output. +# This is done using "shared state" files which can be thought of as cache objects +# and this option determines where those files are placed. +# +# You can wipe out TMPDIR leaving this directory intact and the build would regenerate +# from these files if no changes were made to the configuration. If changes were made +# to the configuration, only shared state files where the state was still valid would +# be used (done using checksums). +# +# The default is a sstate-cache directory under TOPDIR. +# +#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" + +# +# Where to place the build output +# +# This option specifies where the bulk of the building work should be done and +# where BitBake should place its temporary files and output. Keep in mind that +# this includes the extraction and compilation of many applications and the toolchain +# which can use Gigabytes of hard disk space. +# +# The default is a tmp directory under TOPDIR. +# +#TMPDIR = "${TOPDIR}/tmp" + +# +# Default policy config +# +# The distribution setting controls which policy settings are used as defaults. +# The default value is fine for general Yocto project use, at least initially. +# Ultimately when creating custom policy, people will likely end up subclassing +# these defaults. +# +DISTRO ?= "openbmc-phosphor" +# As an example of a subclass there is a "bleeding" edge policy configuration +# where many versions are set to the absolute latest code from the upstream +# source control systems. This is just mentioned here as an example, its not +# useful to most new users. +# DISTRO ?= "poky-bleeding" + +# +# Package Management configuration +# +# This variable lists which packaging formats to enable. Multiple package backends +# can be enabled at once and the first item listed in the variable will be used +# to generate the root filesystems. +# Options are: +# - 'package_deb' for debian style deb files +# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) +# - 'package_rpm' for rpm style packages +# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" +# We default to rpm: +PACKAGE_CLASSES ?= "package_rpm" + +# +# SDK/ADT target architecture +# +# This variable specifies the architecture to build SDK/ADT items for and means +# you can build the SDK packages for architectures other than the machine you are +# running the build on (i.e. building i686 packages on an x86_64 host). +# Supported values are i686 and x86_64 +#SDKMACHINE ?= "i686" + +SANITY_TESTED_DISTROS_append ?= " *" + +# +# Extra image configuration defaults +# +# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated +# images. Some of these options are added to certain image types automatically. The +# variable can contain the following options: +# "dbg-pkgs" - add -dbg packages for all installed packages +# (adds symbol information for debugging/profiling) +# "dev-pkgs" - add -dev packages for all installed packages +# (useful if you want to develop against libs in the image) +# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages +# (useful if you want to run the package test suites) +# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) +# "tools-debug" - add debugging tools (gdb, strace) +# "eclipse-debug" - add Eclipse remote debugging support +# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) +# "debug-tweaks" - make an image suitable for development +# e.g. ssh root access has a blank password +# 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" + +# +# Additional image features +# +# The following is a list of additional classes to use when building images which +# enable extra features. Some available options which can be included in this variable +# are: +# - 'buildstats' collect build statistics +# - 'image-mklibs' to reduce shared library files size for an image +# - 'image-prelink' in order to prelink the filesystem image +# - 'image-swab' to perform host system intrusion detection +# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink +# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +USER_CLASSES ?= "buildstats image-mklibs image-prelink" + +# +# Runtime testing of images +# +# The build system can test booting virtual machine images under qemu (an emulator) +# after any root filesystems are created and run tests against those images. To +# enable this uncomment this line. See classes/testimage(-auto).bbclass for +# further details. +#TEST_IMAGE = "1" +# +# Interactive shell configuration +# +# Under certain circumstances the system may need input from you and to do this it +# can launch an interactive shell. It needs to do this since the build is +# multithreaded and needs to be able to handle the case where more than one parallel +# process may require the user's attention. The default is iterate over the available +# terminal types to find one that works. +# +# Examples of the occasions this may happen are when resolving patches which cannot +# be applied, to use the devshell or the kernel menuconfig +# +# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none +# Note: currently, Konsole support only works for KDE 3.x due to the way +# newer Konsole versions behave +#OE_TERMINAL = "auto" +# By default disable interactive patch resolution (tasks will just fail instead): +PATCHRESOLVE = "noop" + +# +# Disk Space Monitoring during the build +# +# Monitor the disk space during the build. If there is less that 1GB of space or less +# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully +# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# of the build. The reason for this is that running completely out of space can corrupt +# files and damages the build in ways which may not be easily recoverable. +# It's necessary to monitor /tmp, if there is no space left the build will fail +# with very exotic errors. +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" + +# +# Shared-state files from other locations +# +# As mentioned above, shared state files are prebuilt cache data objects which can +# used to accelerate build time. This variable can be used to configure the system +# to search other mirror locations for these objects before it builds the data itself. +# +# This can be a filesystem directory, or a remote url such as http or ftp. These +# would contain the sstate-cache results from previous builds (possibly from other +# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the +# cache locations to check for the shared objects. +# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH +# at the end as shown in the examples below. This will be substituted with the +# correct path within the directory structure. +#SSTATE_MIRRORS ?= "\ +#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* file:///some/local/dir/sstate/PATH" + + +# +# Qemu configuration +# +# By default qemu will build with a builtin VNC server where graphical output can be +# seen. The two lines below enable the SDL backend too. This assumes there is a +# libsdl library available on your build system. +#PACKAGECONFIG_append_pn-qemu-native = " sdl" +#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +#ASSUME_PROVIDED += "libsdl-native" + + +# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to +# track the version of this file when it was generated. This can safely be ignored if +# this doesn't mean anything to you. +CONF_VERSION = "1" diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf new file mode 100644 index 000000000..c7bf92bfe --- /dev/null +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -0,0 +1,9 @@ +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-ampere-${MACHINE}.dtb" +UBOOT_MACHINE = "ast_g5_phy_config" + +require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/distro/include/phosphor-isolation.inc + +VOLATILE_LOG_DIR = "no" diff --git a/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-device-tree-for-Ampere-s-Mt.-Jade.patch b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-device-tree-for-Ampere-s-Mt.-Jade.patch new file mode 100644 index 000000000..b517fd1d0 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-device-tree-for-Ampere-s-Mt.-Jade.patch @@ -0,0 +1,599 @@ +From 5c45537b1d74c22cd95c196bf261b3ee3aa4856f Mon Sep 17 00:00:00 2001 +From: Quan Nguyen +Date: Thu, 12 Nov 2020 13:42:43 +0700 +Subject: [PATCH 2/2] ARM: dts: aspeed: Add device tree for Ampere's Mt. Jade + BMC + +The Mt. Jade BMC is an ASPEED AST2500-based BMC for the Mt. Jade +hardware reference platform with Ampere's Altra Processor Family. + +Reviewed-by: Andrew Jeffery +Reviewed-by: Joel Stanley +Signed-off-by: Quan Nguyen +Signed-off-by: Phong Vo +Signed-off-by: Thang Q. Nguyen +--- + arch/arm/boot/dts/Makefile | 1 + + .../arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 558 ++++++++++++++++++ + 2 files changed, 559 insertions(+) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index 9f9f3e49132a..5da5e8f93554 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -1398,6 +1398,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ + aspeed-ast2500-evb.dtb \ + aspeed-ast2600-evb.dtb \ + aspeed-bmc-amd-ethanolx.dtb \ ++ aspeed-bmc-ampere-mtjade.dtb \ + aspeed-bmc-arm-centriq2400-rep.dtb \ + aspeed-bmc-arm-stardragon4800-rep2.dtb \ + aspeed-bmc-bytedance-g220a.dtb \ +diff --git a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts +new file mode 100644 +index 000000000000..8f5ec22e51c2 +--- /dev/null ++++ b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts +@@ -0,0 +1,558 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/dts-v1/; ++#include "aspeed-g5.dtsi" ++#include ++ ++/ { ++ model = "Ampere Mt. Jade BMC"; ++ compatible = "ampere,mtjade-bmc", "aspeed,ast2500"; ++ ++ chosen { ++ stdout-path = &uart5; ++ bootargs = "console=ttyS4,115200 earlyprintk"; ++ }; ++ ++ memory@80000000 { ++ reg = <0x80000000 0x20000000>; ++ }; ++ ++ reserved-memory { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ ++ vga_memory: framebuffer@9f000000 { ++ no-map; ++ reg = <0x9f000000 0x01000000>; /* 16M */ ++ }; ++ ++ gfx_memory: framebuffer { ++ size = <0x01000000>; ++ alignment = <0x01000000>; ++ compatible = "shared-dma-pool"; ++ reusable; ++ }; ++ ++ video_engine_memory: jpegbuffer { ++ size = <0x02000000>; /* 32M */ ++ alignment = <0x01000000>; ++ compatible = "shared-dma-pool"; ++ reusable; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ fault { ++ gpios = <&gpio ASPEED_GPIO(B, 6) GPIO_ACTIVE_HIGH>; ++ }; ++ ++ identify { ++ gpios = <&gpio ASPEED_GPIO(Q, 6) GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ ++ shutdown_ack { ++ label = "SHUTDOWN_ACK"; ++ gpios = <&gpio ASPEED_GPIO(G, 2) GPIO_ACTIVE_LOW>; ++ linux,code = ; ++ }; ++ ++ reboot_ack { ++ label = "REBOOT_ACK"; ++ gpios = <&gpio ASPEED_GPIO(J, 3) GPIO_ACTIVE_LOW>; ++ linux,code = ; ++ }; ++ ++ S0_overtemp { ++ label = "S0_OVERTEMP"; ++ gpios = <&gpio ASPEED_GPIO(G, 3) GPIO_ACTIVE_LOW>; ++ linux,code = ; ++ }; ++ ++ S0_hightemp { ++ label = "S0_HIGHTEMP"; ++ gpios = <&gpio ASPEED_GPIO(J, 0) GPIO_ACTIVE_LOW>; ++ linux,code = ; ++ }; ++ ++ S0_cpu_fault { ++ label = "S0_CPU_FAULT"; ++ gpios = <&gpio ASPEED_GPIO(J, 1) GPIO_ACTIVE_HIGH>; ++ linux,code = ; ++ }; ++ ++ S1_overtemp { ++ label = "S1_OVERTEMP"; ++ gpios = <&gpio ASPEED_GPIO(Z, 6) GPIO_ACTIVE_LOW>; ++ linux,code = ; ++ }; ++ ++ S1_hightemp { ++ label = "S1_HIGHTEMP"; ++ gpios = <&gpio ASPEED_GPIO(AB, 0) GPIO_ACTIVE_LOW>; ++ linux,code = ; ++ }; ++ ++ S1_cpu_fault { ++ label = "S1_CPU_FAULT"; ++ gpios = <&gpio ASPEED_GPIO(Z, 1) GPIO_ACTIVE_HIGH>; ++ linux,code = ; ++ }; ++ ++ id_button { ++ label = "ID_BUTTON"; ++ gpios = <&gpio ASPEED_GPIO(Q, 5) GPIO_ACTIVE_LOW>; ++ linux,code = ; ++ }; ++ ++ }; ++ ++ gpioA0mux: mux-controller { ++ compatible = "gpio-mux"; ++ #mux-control-cells = <0>; ++ mux-gpios = <&gpio ASPEED_GPIO(A, 0) GPIO_ACTIVE_LOW>; ++ }; ++ ++ adc0mux: adc0mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 0>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc1mux: adc1mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 1>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc2mux: adc2mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 2>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc3mux: adc3mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 3>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc4mux: adc4mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 4>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc5mux: adc5mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 5>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc6mux: adc6mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 6>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc7mux: adc7mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 7>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc8mux: adc8mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 8>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc9mux: adc9mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 9>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc10mux: adc10mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 10>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc11mux: adc11mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 11>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc12mux: adc12mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 12>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ adc13mux: adc13mux { ++ compatible = "io-channel-mux"; ++ io-channels = <&adc 13>; ++ #io-channel-cells = <1>; ++ io-channel-names = "parent"; ++ mux-controls = <&gpioA0mux>; ++ channels = "s0", "s1"; ++ }; ++ ++ iio-hwmon { ++ compatible = "iio-hwmon"; ++ io-channels = <&adc0mux 0>, <&adc0mux 1>, ++ <&adc1mux 0>, <&adc1mux 1>, ++ <&adc2mux 0>, <&adc2mux 1>, ++ <&adc3mux 0>, <&adc3mux 1>, ++ <&adc4mux 0>, <&adc4mux 1>, ++ <&adc5mux 0>, <&adc5mux 1>, ++ <&adc6mux 0>, <&adc6mux 1>, ++ <&adc7mux 0>, <&adc7mux 1>, ++ <&adc8mux 0>, <&adc8mux 1>, ++ <&adc9mux 0>, <&adc9mux 1>, ++ <&adc10mux 0>, <&adc10mux 1>, ++ <&adc11mux 0>, <&adc11mux 1>, ++ <&adc12mux 0>, <&adc12mux 1>, ++ <&adc13mux 0>, <&adc13mux 1>; ++ }; ++ ++ iio-hwmon-adc14 { ++ compatible = "iio-hwmon"; ++ io-channels = <&adc 14>; ++ }; ++ ++ iio-hwmon-battery { ++ compatible = "iio-hwmon"; ++ io-channels = <&adc 15>; ++ }; ++}; ++ ++&fmc { ++ status = "okay"; ++ flash@0 { ++ status = "okay"; ++ m25p,fast-read; ++ label = "bmc"; ++ /* spi-max-frequency = <50000000>; */ ++#include "openbmc-flash-layout.dtsi" ++ }; ++}; ++ ++&spi1 { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_spi1_default>; ++ ++ flash@0 { ++ status = "okay"; ++ m25p,fast-read; ++ label = "pnor"; ++ /* spi-max-frequency = <100000000>; */ ++ }; ++}; ++ ++&uart1 { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_txd1_default ++ &pinctrl_rxd1_default ++ &pinctrl_ncts1_default ++ &pinctrl_nrts1_default>; ++}; ++ ++&uart2 { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_txd2_default ++ &pinctrl_rxd2_default>; ++}; ++ ++&uart3 { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_txd3_default ++ &pinctrl_rxd3_default>; ++}; ++ ++&uart4 { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_txd4_default ++ &pinctrl_rxd4_default>; ++}; ++ ++/* The BMC's uart */ ++&uart5 { ++ status = "okay"; ++}; ++ ++&mac1 { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; ++}; ++ ++&i2c0 { ++ status = "okay"; ++}; ++ ++&i2c1 { ++ status = "okay"; ++}; ++ ++&i2c2 { ++ status = "okay"; ++}; ++ ++&i2c3 { ++ status = "okay"; ++ eeprom@50 { ++ compatible = "microchip,24c64", "atmel,24c64"; ++ reg = <0x50>; ++ pagesize = <32>; ++ }; ++ ++ inlet_mem2: tmp175@28 { ++ compatible = "ti,tmp175"; ++ reg = <0x28>; ++ }; ++ ++ inlet_cpu: tmp175@29 { ++ compatible = "ti,tmp175"; ++ reg = <0x29>; ++ }; ++ ++ inlet_mem1: tmp175@2a { ++ compatible = "ti,tmp175"; ++ reg = <0x2a>; ++ }; ++ ++ outlet_cpu: tmp175@2b { ++ compatible = "ti,tmp175"; ++ reg = <0x2b>; ++ }; ++ ++ outlet1: tmp175@2c { ++ compatible = "ti,tmp175"; ++ reg = <0x2c>; ++ }; ++ ++ outlet2: tmp175@2d { ++ compatible = "ti,tmp175"; ++ reg = <0x2d>; ++ }; ++}; ++ ++&i2c4 { ++ status = "okay"; ++ rtc@51 { ++ compatible = "nxp,pcf85063a"; ++ reg = <0x51>; ++ }; ++}; ++ ++&i2c5 { ++ status = "okay"; ++}; ++ ++&i2c6 { ++ status = "okay"; ++ psu@58 { ++ compatible = "pmbus"; ++ reg = <0x58>; ++ }; ++ ++ psu@59 { ++ compatible = "pmbus"; ++ reg = <0x59>; ++ }; ++}; ++ ++&i2c7 { ++ status = "okay"; ++}; ++ ++&i2c8 { ++ status = "okay"; ++}; ++ ++&i2c9 { ++ status = "okay"; ++}; ++ ++&gfx { ++ status = "okay"; ++ memory-region = <&gfx_memory>; ++}; ++ ++&pinctrl { ++ aspeed,external-nodes = <&gfx &lhc>; ++}; ++ ++&pwm_tacho { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_pwm2_default &pinctrl_pwm3_default ++ &pinctrl_pwm4_default &pinctrl_pwm5_default ++ &pinctrl_pwm6_default &pinctrl_pwm7_default>; ++ ++ fan@0 { ++ reg = <0x02>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x04>; ++ }; ++ ++ fan@1 { ++ reg = <0x02>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x05>; ++ }; ++ ++ fan@2 { ++ reg = <0x03>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x06>; ++ }; ++ ++ fan@3 { ++ reg = <0x03>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x07>; ++ }; ++ ++ fan@4 { ++ reg = <0x04>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x08>; ++ }; ++ ++ fan@5 { ++ reg = <0x04>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x09>; ++ }; ++ ++ fan@6 { ++ reg = <0x05>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x0a>; ++ }; ++ ++ fan@7 { ++ reg = <0x05>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x0b>; ++ }; ++ ++ fan@8 { ++ reg = <0x06>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x0c>; ++ }; ++ ++ fan@9 { ++ reg = <0x06>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x0d>; ++ }; ++ ++ fan@10 { ++ reg = <0x07>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x0e>; ++ }; ++ ++ fan@11 { ++ reg = <0x07>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x0f>; ++ }; ++ ++}; ++ ++&vhub { ++ status = "okay"; ++}; ++ ++&adc { ++ status = "okay"; ++}; ++ ++&video { ++ status = "okay"; ++ memory-region = <&video_engine_memory>; ++}; ++ ++&gpio { ++ gpio-line-names = ++ /*A0-A7*/ "","","","S0_BMC_SPECIAL_BOOT","","","","", ++ /*B0-B7*/ "BMC_SELECT_EEPROM","","","", ++ "POWER_BUTTON","","","", ++ /*C0-C7*/ "","","","","","","","", ++ /*D0-D7*/ "","","","","","","","", ++ /*E0-E7*/ "","","","","","","","", ++ /*F0-F7*/ "","","BMC_SYS_PSON_L","S0_DDR_SAVE","PGOOD", ++ "S1_DDR_SAVE","","", ++ /*G0-G7*/ "S0_FW_BOOT_OK","SHD_REQ_L","","S0_OVERTEMP_L","","", ++ "","", ++ /*H0-H7*/ "","","","","","","","", ++ /*I0-I7*/ "","","S1_BMC_SPECIAL_BOOT","","","","","", ++ /*J0-J7*/ "S0_HIGHTEMP_L","S0_FAULT_L","S0_SCP_AUTH_FAIL_L","", ++ "","","","", ++ /*K0-K7*/ "","","","","","","","", ++ /*L0-L7*/ "","","","BMC_SYSRESET_L","SPI_AUTH_FAIL_L","","","", ++ /*M0-M7*/ "","","","","","","","", ++ /*N0-N7*/ "","","","","","","","", ++ /*O0-O7*/ "","","","","","","","", ++ /*P0-P7*/ "","","","","","","","", ++ /*Q0-Q7*/ "","","","","","UID_BUTTON","","", ++ /*R0-R7*/ "","","BMC_EXT_HIGHTEMP_L","","","RESET_BUTTON","","", ++ /*S0-S7*/ "","","","","","","","", ++ /*T0-T7*/ "","","","","","","","", ++ /*U0-U7*/ "","","","","","","","", ++ /*V0-V7*/ "","","","","","","","", ++ /*W0-W7*/ "","","","","","","","", ++ /*X0-X7*/ "","","","","","","","", ++ /*Y0-Y7*/ "","","","","","","","", ++ /*Z0-Z7*/ "S0_BMC_PLIMIT","S1_FAULT_L","S1_FW_BOOT_OK","","", ++ "S1_SCP_AUTH_FAIL_L","S1_OVERTEMP_L","", ++ /*AA0-AA7*/ "","","","","","","","", ++ /*AB0-AB7*/ "S1_HIGHTEMP_L","S1_BMC_PLIMIT","S0_BMC_DDR_ADDR", ++ "S1_BMC_DDR_ADR","","","","", ++ /*AC0-AC7*/ "SYS_PWR_GD","","","","","BMC_READY","SLAVE_PRESENT_L", ++ "BMC_OCP_PG"; ++}; +-- +2.28.0 + diff --git a/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/mtjade.cfg b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/mtjade.cfg new file mode 100644 index 000000000..9afe14af8 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/mtjade.cfg @@ -0,0 +1,16 @@ +# +# BOM +# +CONFIG_RTC_DRV_PCF85063=y +CONFIG_IIO_MUX=y +CONFIG_MUX_GPIO=y +CONFIG_I2C_MUX=y + +# +# Mtjade driver build flags +# +CONFIG_SENSORS_IIO_HWMON=y +CONFIG_ASPEED_ADC=y +CONFIG_SENSORS_LM75=y +CONFIG_I2C_SLAVE=y +CONFIG_SENSORS_ASPEED=y diff --git a/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..109cc0721 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS_prepend_mtjade := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://${MACHINE}.cfg \ + file://0001-ARM-dts-aspeed-Add-device-tree-for-Ampere-s-Mt.-Jade.patch \ +" + diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend new file mode 100644 index 000000000..07bff9390 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -0,0 +1 @@ +RDEPENDS_${PN}-extras_append_mtjade = " phosphor-webui phosphor-image-signing" -- cgit v1.2.3 From 51b9ac11f580ea23c7b76e09577d206e882aa028 Mon Sep 17 00:00:00 2001 From: Tung Nguyen Date: Tue, 15 Dec 2020 14:15:44 +0700 Subject: meta-ampere:meta-jade Add skeleton configuation Add the Mt.Jade skeleton configuration to support the basic power control Tested: 1. Compile OpenBMC image and boot successfully on Mt.Jade 2. Check basic gpio get/set and the power control action successfully Signed-off-by: Tung Nguyen Change-Id: Ifc4f5746c3fb7e8d5e30a12cf29dd3f02e5de953 --- .../skeleton/obmc-libobmc-intf/gpio_defs.json | 54 ++++++++++++++++++++++ .../skeleton/obmc-libobmc-intf_%.bbappend | 1 + 2 files changed, 55 insertions(+) create mode 100644 meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json create mode 100644 meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend diff --git a/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json new file mode 100644 index 000000000..dd218c0c9 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json @@ -0,0 +1,54 @@ +{ + "gpio_configs": { + + "power_config": { + "power_good_in": "PGOOD", + "power_up_outs": [ + {"name": "BMC_SYS_PSON_L", "polarity": false}, + {"name": "BMC_READY", "polarity": true} + ], + "reset_outs": [ + {"name": "BMC_S0_SYSRESET_L", "polarity": false}, + {"name": "BMC_S1_SYSRESET_L", "polarity": false} + ] + } + }, + + "gpio_definitions": [ + { + "name": "PGOOD", + "pin": "F4", + "direction": "in" + }, + { + "name": "BMC_SYS_PSON_L", + "pin": "F2", + "direction": "out" + }, + { + "name": "BMC_S0_SYSRESET_L", + "pin": "L3", + "direction": "out" + }, + { + "name": "BMC_S1_SYSRESET_L", + "pin": "L4", + "direction": "out" + }, + { + "name": "POWER_BUTTON", + "pin": "B4", + "direction": "both" + }, + { + "name": "RESET_BUTTON", + "pin": "R5", + "direction": "both" + }, + { + "name": "BMC_READY", + "pin": "AC5", + "direction": "out" + } + ] +} diff --git a/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend new file mode 100644 index 000000000..83a929746 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:" -- cgit v1.2.3 From b0f233179a0ebabc0c40d4b0eaecdddf74d1a709 Mon Sep 17 00:00:00 2001 From: Lancelot Kao Date: Tue, 15 Sep 2020 13:51:43 -0500 Subject: meta-fii: Add new meta layer for Fii USA Inc Create the meta-fii layer for Fii USA Inc. Signed-off-by: Lancelot Kao Change-Id: I354d0b98ae4617896505e794ab5614dd4eb413c6 --- meta-fii/COPYING.MIT | 17 +++++ meta-fii/COPYING.apache-2.0 | 175 ++++++++++++++++++++++++++++++++++++++++++++ meta-fii/LICENSE | 12 +++ meta-fii/MAINTAINERS | 49 +++++++++++++ meta-fii/README.md | 6 ++ meta-fii/conf/layer.conf | 8 ++ 6 files changed, 267 insertions(+) create mode 100644 meta-fii/COPYING.MIT create mode 100644 meta-fii/COPYING.apache-2.0 create mode 100644 meta-fii/LICENSE create mode 100644 meta-fii/MAINTAINERS create mode 100644 meta-fii/README.md create mode 100644 meta-fii/conf/layer.conf diff --git a/meta-fii/COPYING.MIT b/meta-fii/COPYING.MIT new file mode 100644 index 000000000..89de35479 --- /dev/null +++ b/meta-fii/COPYING.MIT @@ -0,0 +1,17 @@ +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 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. diff --git a/meta-fii/COPYING.apache-2.0 b/meta-fii/COPYING.apache-2.0 new file mode 100644 index 000000000..67db85882 --- /dev/null +++ b/meta-fii/COPYING.apache-2.0 @@ -0,0 +1,175 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. diff --git a/meta-fii/LICENSE b/meta-fii/LICENSE new file mode 100644 index 000000000..8566fe509 --- /dev/null +++ b/meta-fii/LICENSE @@ -0,0 +1,12 @@ +Different components of meta-fii are under different licenses (a mix +of MIT and Apache-2.0). Please see: + +COPYING.Apache-2.0 +COPYING.MIT (MIT) + +All metadata is MIT licensed unless otherwise stated. Source code +included in tree for individual recipes is under the LICENSE stated in +the associated recipe (.bb file) unless otherwise stated. + +License information for any other files is either explicitly stated +or defaults to Apache-2.0. diff --git a/meta-fii/MAINTAINERS b/meta-fii/MAINTAINERS new file mode 100644 index 000000000..9be6f8a3d --- /dev/null +++ b/meta-fii/MAINTAINERS @@ -0,0 +1,49 @@ +How to use this list: + Find the most specific section entry (described below) that matches where + your change lives and add the reviewers (R) and maintainers (M) as + reviewers. You can use the same method to track down who knows a particular + code base best. + + Your change/query may span multiple entries; that is okay. + + If you do not find an entry that describes your request at all, someone + forgot to update this list; please at least file an issue or send an email + to a maintainer, but preferably you should just update this document. + +Description of section entries: + + Section entries are structured according to the following scheme: + + X: NAME + X: ... + . + . + . + + Where REPO_NAME is the name of the repository within the OpenBMC GitHub + organization; FILE_PATH is a file path within the repository, possibly with + wildcards; X is a tag of one of the following types: + + M: Denotes maintainer; has fields NAME ; + if omitted from an entry, assume one of the maintainers from the + MAINTAINERS entry. + R: Denotes reviewer; has fields NAME ; + these people are to be added as reviewers for a change matching the repo + path. + F: Denotes forked from an external repository; has fields URL. + + Line comments are to be denoted "# SOME COMMENT" (typical shell style + comment); it is important to follow the correct syntax and semantics as we + may want to use automated tools with this file in the future. + + A change cannot be added to an OpenBMC repository without a MAINTAINER's + approval; thus, a MAINTAINER should always be listed as a reviewer. + +START OF MAINTAINERS LIST +------------------------- + +M: Benjamin Fair +M: Vivekanand Veeracholan +M: Lancelot Kao +M: Mohaimen Alsamarai +M: XP Chen diff --git a/meta-fii/README.md b/meta-fii/README.md new file mode 100644 index 000000000..e0f534465 --- /dev/null +++ b/meta-fii/README.md @@ -0,0 +1,6 @@ +# meta-fii + +Repository for storing metadata for OpenBMC +Fii USA crop + +├── meta-fii diff --git a/meta-fii/conf/layer.conf b/meta-fii/conf/layer.conf new file mode 100644 index 000000000..8895ad5db --- /dev/null +++ b/meta-fii/conf/layer.conf @@ -0,0 +1,8 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" +BBFILE_COLLECTIONS += "fii-layer" +BBFILE_PATTERN_fii-layer := "^${LAYERDIR}/" +LAYERSERIES_COMPAT_fii-layer = "warrior zeus gatesgarth dunfell" -- cgit v1.2.3 From 31c4566d2fa07d0e7e1165ca0097b1d58d3e5c35 Mon Sep 17 00:00:00 2001 From: Lancelot Kao Date: Tue, 22 Sep 2020 14:53:57 -0500 Subject: meta-fii/meta-kudo: Add new meta layer for Fii Kudo project First drop for the meta-kudo layer, initial machine configuration to supports Nuvoton npcm730 chip and the Ampere ARM system Tested-by: 1. Load image on the Nuvoton RunBMC CRB 2. Use ipmitool to test the command under BMC console a. ipmitool mc info b. ipmitool sdr c. ipmitool lan print d. ipmitool channel info 1 e. ipmitool user list 1 f. ipmitool chassis status g. ipmitool raw 0x06 0x01 h. ipmitool power status Signed-off-by: Lancelot Kao Change-Id: Ic34b77affe0c08e84762ef795f9f06011bd269ce --- meta-fii/README.md | 1 + meta-fii/meta-kudo/conf/bblayers.conf.sample | 27 ++++++ meta-fii/meta-kudo/conf/conf-notes.txt | 2 + meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf | 4 + meta-fii/meta-kudo/conf/layer.conf | 10 ++ meta-fii/meta-kudo/conf/local.conf.sample | 18 ++++ meta-fii/meta-kudo/conf/machine/kudo.conf | 21 ++++ .../recipes-bsp/u-boot/u-boot-common-kudo.inc | 3 + .../u-boot/u-boot-fw-utils-nuvoton/fw_env.config | 24 +++++ .../u-boot/u-boot-fw-utils-nuvoton_%.bbappend | 7 ++ .../u-boot/u-boot-nuvoton/fixed_phy.cfg | 2 + .../recipes-bsp/u-boot/u-boot-nuvoton/kudo.cfg | 2 + .../recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend | 10 ++ .../recipes-kernel/linux/linux-nuvoton/kudo.cfg | 108 +++++++++++++++++++++ .../recipes-kernel/linux/linux-nuvoton_%.bbappend | 3 + .../packagegroups/packagegroup-kudo-apps.bb | 30 ++++++ .../image/obmc-phosphor-image.bbappend | 7 ++ 17 files changed, 279 insertions(+) create mode 100644 meta-fii/meta-kudo/conf/bblayers.conf.sample create mode 100644 meta-fii/meta-kudo/conf/conf-notes.txt create mode 100644 meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf create mode 100644 meta-fii/meta-kudo/conf/layer.conf create mode 100644 meta-fii/meta-kudo/conf/local.conf.sample create mode 100644 meta-fii/meta-kudo/conf/machine/kudo.conf create mode 100644 meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-common-kudo.inc create mode 100644 meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config create mode 100644 meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend create mode 100644 meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/fixed_phy.cfg create mode 100644 meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/kudo.cfg create mode 100644 meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend create mode 100644 meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg create mode 100644 meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend create mode 100644 meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb create mode 100644 meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend diff --git a/meta-fii/README.md b/meta-fii/README.md index e0f534465..ec520aa6b 100644 --- a/meta-fii/README.md +++ b/meta-fii/README.md @@ -4,3 +4,4 @@ Repository for storing metadata for OpenBMC Fii USA crop ├── meta-fii + └── meta-kudo diff --git a/meta-fii/meta-kudo/conf/bblayers.conf.sample b/meta-fii/meta-kudo/conf/bblayers.conf.sample new file mode 100644 index 000000000..9fe42076b --- /dev/null +++ b/meta-fii/meta-kudo/conf/bblayers.conf.sample @@ -0,0 +1,27 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-nuvoton \ + ##OEROOT##/meta-google \ + ##OEROOT##/meta-fii/meta-kudo \ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-nuvoton \ + ##OEROOT##/meta-google \ + ##OEROOT##/meta-fii/meta-kudo \ + " diff --git a/meta-fii/meta-kudo/conf/conf-notes.txt b/meta-fii/meta-kudo/conf/conf-notes.txt new file mode 100644 index 000000000..9b3c01a55 --- /dev/null +++ b/meta-fii/meta-kudo/conf/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf b/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf new file mode 100644 index 000000000..047091353 --- /dev/null +++ b/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf @@ -0,0 +1,4 @@ +require conf/distro/openbmc-phosphor.conf + +DISTRO = "openbmc-kudo" + diff --git a/meta-fii/meta-kudo/conf/layer.conf b/meta-fii/meta-kudo/conf/layer.conf new file mode 100644 index 000000000..e5a3c34af --- /dev/null +++ b/meta-fii/meta-kudo/conf/layer.conf @@ -0,0 +1,10 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "kudo-layer" +BBFILE_PATTERN_kudo-layer = "^${LAYERDIR}/" +LAYERSERIES_COMPAT_kudo-layer = "warrior zeus dunfell" diff --git a/meta-fii/meta-kudo/conf/local.conf.sample b/meta-fii/meta-kudo/conf/local.conf.sample new file mode 100644 index 000000000..8f6659537 --- /dev/null +++ b/meta-fii/meta-kudo/conf/local.conf.sample @@ -0,0 +1,18 @@ +MACHINE ??= "kudo" +DISTRO ?= "openbmc-kudo" +PACKAGE_CLASSES ?= "package_rpm" +SANITY_TESTED_DISTROS_append ?= " *" +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" +CONF_VERSION = "1" + diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf new file mode 100644 index 000000000..31036a4ff --- /dev/null +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -0,0 +1,21 @@ +KMACHINE = "nuvoton" +KERNEL_DEVICETREE = "${KMACHINE}-npcm730-kudo.dtb" + +require conf/machine/include/npcm7xx.inc +require conf/machine/include/obmc-bsp-common.inc + +FLASH_SIZE = "65536" +FLASH_UBOOT_OFFSET = "0" +FLASH_KERNEL_OFFSET = "2048" +FLASH_ROFS_OFFSET = "8192" +FLASH_RWFS_OFFSET = "62464" + +UBOOT_MACHINE = "PolegSVB_config" +UBOOT_DEVICETREE = "nuvoton-npcm730-kudo" +IGPS_MACHINE = "EB" + +IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" + +VIRTUAL-RUNTIME_obmc-fan-control = "phosphor-pid-control" +PREFERRED_PROVIDER_virtual/obmc-fan-control = "phosphor-pid-control" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-kudo-apps" diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-common-kudo.inc b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-common-kudo.inc new file mode 100644 index 000000000..9154bc131 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-common-kudo.inc @@ -0,0 +1,3 @@ +UBRANCH = "npcm7xx-v2019.01" +SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH}" +SRCREV = "5caf59416ba1d6316dd78895e69789246a77e00a" diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config new file mode 100644 index 000000000..0c384273f --- /dev/null +++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config @@ -0,0 +1,24 @@ +# Configuration file for fw_(printenv/setenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# Notice, that the "Number of sectors" is not required on NOR and SPI-dataflash. +# Futhermore, if the Flash sector size is ommitted, this value is assumed to +# be the same as the Environment size, which is valid for NOR and SPI-dataflash + +# NOR example +# MTD device name Device offset Env. size Flash sector size Number of sectors +/dev/mtd2 0x0000 0x40000 0x4000 + +# MTD SPI-dataflash example +# MTD device name Device offset Env. size Flash sector size Number of sectors +#/dev/mtd5 0x4200 0x4200 +#/dev/mtd6 0x4200 0x4200 + +# NAND example +#/dev/mtd0 0x4000 0x4000 0x20000 2 + +# Block device example +#/dev/mmcblk0 0xc0000 0x20000 + +# VFAT example +#/boot/uboot.env 0x0000 0x4000 diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend new file mode 100644 index 000000000..5c56e17a0 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" + +SRC_URI_append_kudo = " file://fw_env.config" + +do_install_append_kudo () { + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config +} diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/fixed_phy.cfg b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/fixed_phy.cfg new file mode 100644 index 000000000..125522f84 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/fixed_phy.cfg @@ -0,0 +1,2 @@ +CONFIG_PHY_FIXED=y + diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/kudo.cfg b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/kudo.cfg new file mode 100644 index 000000000..417ffa98c --- /dev/null +++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/kudo.cfg @@ -0,0 +1,2 @@ +CONFIG_CMD_MII=y +CONFIG_NET_RANDOM_ETHADDR=y diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend new file mode 100644 index 000000000..73ad51e15 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/u-boot-nuvoton:" + +require u-boot-common-kudo.inc + +UBOOT_MAKE_TARGET_append_kudo = " DEVICE_TREE=${UBOOT_DEVICETREE}" + +SRC_URI_append_kudo = " \ + file://fixed_phy.cfg \ + file://kudo.cfg \ + " diff --git a/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg new file mode 100644 index 000000000..0811dd9d9 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg @@ -0,0 +1,108 @@ +CONFIG_HWMON=y +CONFIG_SENSORS_TMP100=y +CONFIG_SENSORS_LM75=y +CONFIG_SENSORS_FAN=y +CONFIG_SENSORS_ADC128D818=y +CONFIG_SENSORS_ADM1275=y +CONFIG_SENSORS_TMP102=y +CONFIG_SENSORS_TMP421=y + +CONFIG_PMBUS=y +CONFIG_SENSORS_PMBUS=y +CONFIG_SENSORS_INA2XX=y + +CONFIG_IIO=y +CONFIG_IIO_MUX=y +CONFIG_NPCM_ADC=y +CONFIG_SENSORS_IIO_HWMON=y + +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y + +CONFIG_OVERLAY_FS=y +CONFIG_SQUASHFS=y +CONFIG_SQUASHFS_XZ=y +CONFIG_JFFS2_FS=y +CONFIG_EXT4_FS=y + +CONFIG_SPI=y +CONFIG_SPI_NPCM_FIU=y +CONFIG_MTD_M25P80=y +CONFIG_SPI_NPCM_PSPI=y + +CONFIG_NET_NCSI=y + +CONFIG_EEPROM_AT24=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y +CONFIG_I2C_SLAVE_EEPROM=y +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y +CONFIG_GPIO_PCF857X=y +CONFIG_MUX_MMIO=y +CONFIG_USB_U_ETHER=y +CONFIG_USB_F_ECM=y +CONFIG_USB_F_EEM=y +CONFIG_USB_F_SUBSET=y +CONFIG_USB_F_RNDIS=y +CONFIG_USB_F_MASS_STORAGE=y +CONFIG_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_HID=y + +CONFIG_MEDIA_SUPPORT=y +CONFIG_VIDEO_NUVOTON=y +CONFIG_NPCM750_VCD=y +CONFIG_NPCM750_ECE=y +CONFIG_FORCE_MAX_ZONEORDER=12 + +CONFIG_USB_GADGET_NPCM_USB2=y + +CONFIG_NPCM7XX_PCI_MBOX=y + +CONFIG_RESET_NPCM=y + +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_MQUEUE=y +CONFIG_IPMB_DEVICE_INTERFACE=y +CONFIG_NUVOTON_JTAG=y +CONFIG_NPCM7XX_JTAG_MASTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NET_INGRESS=y +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK=y +CONFIG_NF_CONNTRACK=y +CONFIG_NF_CONNTRACK_PROCFS=y +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_CT_NETLINK=y +CONFIG_NETFILTER_XTABLES=y + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=y +CONFIG_NF_REJECT_IPV4=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_NF_DEFRAG_IPV6=y + + +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS_I2C_INFINEON=y diff --git a/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend new file mode 100644 index 000000000..5276bef59 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/linux-nuvoton:" + +SRC_URI_append_kudo = " file://kudo.cfg" diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb new file mode 100644 index 000000000..be879455d --- /dev/null +++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb @@ -0,0 +1,30 @@ +SUMMARY = "OpenBMC for KUDO system - Applications" +PR = "r1" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = " \ + ${PN}-kudo-system \ + ${PN}-kudo-common-utils \ + " + +PROVIDES += "virtual/obmc-system-mgmt" + +RPROVIDES_${PN}-kudo-system += "virtual-obmc-system-mgmt" + +SUMMARY_${PN}-kudo-system = "KUDO System" +RDEPENDS_${PN}-kudo-system = " \ + google-ipmi-sys \ + google-ipmi-i2c \ + " + +SUMMARY_${PN}-kudo-common-utils = "KUDO common utils" +RDEPENDS_${PN}-kudo-common-utils = " \ + ipmitool \ + phosphor-webui \ + phosphor-host-postd \ + loadsvf \ + obmc-console \ + phosphor-sel-logger \ + " diff --git a/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend new file mode 100644 index 000000000..0efccea65 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend @@ -0,0 +1,7 @@ +OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " ipmitool" +OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " ethtool" +OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " google-ipmi-sys" +OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " google-ipmi-i2c" +OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-blobs" +OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-ethstats" +OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-flash" -- cgit v1.2.3 From df119ccfdf7ec869d41e21648ecdf550574d5638 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Wed, 6 Jan 2021 10:56:57 -0800 Subject: Add Owners Plugin to meta-fii Please see https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/39379 for details about why this is necessary. Signed-off-by: Ed Tanous Change-Id: I87dafdd811d51678cd06430d29b36104ec979dfe --- meta-fii/OWNERS | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 meta-fii/OWNERS diff --git a/meta-fii/OWNERS b/meta-fii/OWNERS new file mode 100644 index 000000000..be8df7924 --- /dev/null +++ b/meta-fii/OWNERS @@ -0,0 +1,6 @@ +owners: +- benjaminfair@google.com +- vveerach@google.com +- lancelot.kao@fii-usa.com +- Mohaimen.Alsamarai@fii-na.com +- Xiao-Peng.Chen@fii-na.com -- cgit v1.2.3 From a89d924754daa77fe2956dbadd07191d836a7b81 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 Jan 2021 20:18:02 -0800 Subject: phosphor-ipmi-flash: Add version blob library We need this library to load when phosphor-ipmi-flash is installed, to provide the version blobs that associate with firmware. Change-Id: Id80b60a826ca67674282a66b45ca39456b1cb447 Signed-off-by: William A. Kennington III --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 2658423bc..26d95ee0e 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -65,6 +65,7 @@ FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" BLOBIPMI_PROVIDER_LIBRARY += "libfirmwareblob.so" +BLOBIPMI_PROVIDER_LIBRARY += "libversionblob.so" BLOBIPMI_PROVIDER_LIBRARY += "${@bb.utils.contains('PACKAGECONFIG', 'cleanup-delete', 'libfirmwarecleanupblob.so', '', d)}" do_configure[depends] += "virtual/kernel:do_shared_workdir" -- cgit v1.2.3 From 16d3ad0b223537740111bc4787052d2cfda282d3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 Jan 2021 20:19:07 -0800 Subject: phosphor-ipmi-flash: Allow tmpfiles.d configs A recent version of phosphor-ipmi-flash introduced a tmpfile configuration that populates non-persistent directories at bootup. Change-Id: Ida66eb430d98d70ff02814ec14bc71a52e92d615 Signed-off-by: William A. Kennington III --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 26d95ee0e..fe9a256ad 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -63,6 +63,7 @@ SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'host-bios', '${ FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" +FILES_${PN}_append = " ${libdir}/tmpfiles.d" BLOBIPMI_PROVIDER_LIBRARY += "libfirmwareblob.so" BLOBIPMI_PROVIDER_LIBRARY += "libversionblob.so" -- cgit v1.2.3 From 7c9805840d4a9d4c02c6a18e5fbfef48bd621fec Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 30 Jan 2021 03:40:50 +0000 Subject: phosphor-ipmi-flash: srcrev bump ebccf63286..43344a1b9f William A. Kennington III (6): bmc/fs: Ignore missing directories bmc/fs: Replace regex with fs functions buildjson: Support multiple configuration paths buildjson: Add a non-persistent path configure: Refactor systemunitdir expression to use PKG_CHECK_VAR bmc: Create runtime directory for non-persistent configs Change-Id: I7ab7deedc69bbe9ec083ed248f7b3c44c4a8ca6f Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index fe9a256ad..ced05bc7b 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -46,7 +46,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "ebccf632866584bf7a9d097fdaad7c4bc8f039bc" +SRCREV = "43344a1b9fc0ef493059c7a1b0155330f0db43a1" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ -- cgit v1.2.3 From c60845c87403beb867c541f4271d05287f38a985 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Jan 2021 15:55:05 -0600 Subject: meta-xilinx: subtree update:a9025136f5..eb4ba06eb1 David Roman (1): picozed-zynq7.dts: add marvell,88e1510 to eth phy Jaewon Lee (3): xilinx-board.inc: fixing BOARD_ARCH and BOARDVARIANT_ARCH names Adding BOARD and BOARD_VARIANT level hierarchy ultra96: Using BOARD level hiearchy for ultra96 overrides Madhurkiran Harikrishnan (1): weston: Update the weston patches to comply with weston-9.0 Philip Balister (2): u-boot-xlnx: Fix build error by applying patch from upstream u-boot. linux-xlnx: Fix build with patch from upstream kernel for gcc-10. Raju Kumar Pothuraju (1): linux-xlnx.inc: Update overlay config fragments Sai Hari Chandana Kalluri (4): Update LICENSE_CHECKSUM for kernel-module-hdmi zcu102-zynqmp.conf: Fix qemuboot for zcu102-zynqmp Cleanup QB_MACHINE for xilinx machines qemu-xilinx: Fix patch puzz warning during do_patch Varalaxmi Bingi (1): meta-xilinx-bsp: Move uboot-device-tree to meta-xilinx-tools layer Signed-off-by: Andrew Geissler Change-Id: I2c1c51b9988cb36185f3218075ea007c14f82ff8 --- .../classes/qemuboot-xilinx.bbclass | 6 +- .../conf/machine/include/xilinx-board.inc | 8 +-- .../conf/machine/ultra96-zynqmp.conf | 3 + .../conf/machine/vc-p-a2197-00-versal.conf | 1 - .../conf/machine/vck190-versal.conf | 1 - .../conf/machine/versal-generic.conf | 2 +- .../conf/machine/vmk180-versal.conf | 1 - .../conf/machine/zcu102-zynqmp.conf | 1 - .../meta-xilinx-bsp/conf/machine/zynq-generic.conf | 1 + .../conf/machine/zynqmp-generic.conf | 2 +- .../device-tree/files/picozed-zynq7.dts | 2 +- ...Remove-redundant-YYLOC-global-declaration.patch | 28 ++++++++ .../recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb | 4 ++ .../uboot-device-tree/uboot-device-tree.bb | 78 -------------------- .../qemu/files/0001-Add-enable-disable-udev.patch | 12 ++-- ....c-Use-gr-egl_config-to-create-pbuffer-su.patch | 84 ---------------------- ...ton-Remove-substitute-format-for-ARGB8888.patch | 12 ++-- .../recipes-graphics/weston/weston_%.bbappend | 4 +- .../recipes-kernel/hdmi/kernel-module-hdmi_git.bb | 2 +- .../linux-firmware/linux-firmware_%.bbappend | 9 +-- .../recipes-kernel/linux/linux-xlnx.inc | 4 +- ...-Remove-redundant-YYLOC-global-declaratio.patch | 51 +++++++++++++ .../recipes-kernel/linux/linux-xlnx_2020.2.bb | 1 + .../meta-xilinx-pynq/classes/xilinx-pynq.bbclass | 2 +- .../pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb | 3 +- .../pynq-ultra96-helloworld_1.0.bb | 3 +- 26 files changed, 125 insertions(+), 200 deletions(-) create mode 100644 meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch delete mode 100644 meta-xilinx/meta-xilinx-bsp/recipes-bsp/uboot-device-tree/uboot-device-tree.bb delete mode 100644 meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-gl-renderer.c-Use-gr-egl_config-to-create-pbuffer-su.patch create mode 100644 meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch diff --git a/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass b/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass index 62ecbdf91..1c3f2bb61 100644 --- a/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass +++ b/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass @@ -5,10 +5,10 @@ OVERRIDES .= ":qemuboot-xilinx" # Default machine targets for Xilinx QEMU (FDT Generic) # Allow QB_MACHINE to be overridden by a BSP config QB_MACHINE ?= "${QB_MACHINE_XILINX}" - +QB_RNG="" QB_MACHINE_XILINX_aarch64 = "-machine arm-generic-fdt" -QB_MACHINE_XILINX_arm = "-machine arm-generic-fdt-7series" -QB_MACHINE_XILINX_microblaze = "-machine microblaze-fdt-plnx" +QB_MACHINE_XILINX_arm = "-M arm-generic-fdt-7series" +QB_MACHINE_XILINX_microblaze = "-M microblaze-fdt-plnx" # defaults QB_DEFAULT_KERNEL ?= "none" diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc index ae209fd6a..700a2f805 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc @@ -5,8 +5,8 @@ MACHINEOVERRIDES =. "${@['', '${BOARD}:']['${BOARD}' != '']}" MACHINEOVERRIDES =. "${@['', '${BOARD}${BOARD_VARIANT}:']['${BOARD_VARIANT}' != '']}" -SOC_BOARD_ARCH ?= "${BOARD}" -SOC_BOARDVARIANT_ARCH ?= "${BOARD}${BOARD_VARIANT}" +BOARD_ARCH ?= "${BOARD}" +BOARDVARIANT_ARCH ?= "${BOARD}${BOARD_VARIANT}" -PACKAGE_EXTRA_ARCHS_append = " ${SOC_BOARD_ARCH}" -PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${SOC_BOARDVARIANT_ARCH}'][d.getVar('SOC_BOARDVARIANT_ARCH') != d.getVar('SOC_BOARD_ARCH')]}" +PACKAGE_EXTRA_ARCHS_append = " ${BOARD_ARCH}" +PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}" diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf index 045e9422c..f31c10cf2 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf @@ -5,6 +5,9 @@ require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-default.inc +require conf/machine/include/xilinx-board.inc + +BOARD = "ultra96" MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth mipi" diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf index 4c174d2f5..bbc068874 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf @@ -37,7 +37,6 @@ IMAGE_BOOT_FILES += " \ boot.scr \ " # This machine has a QEMU model, runqemu setup: -QB_MACHINE = "-M arm-generic-fdt" QB_MEM = "-m 8G" QB_DEFAULT_KERNEL = "none" QB_NETWORK_DEVICE = "" diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf index c9813b70c..1ab6a1c75 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf @@ -43,7 +43,6 @@ PSM_FIRMWARE_IMAGE_NAME ?= "psm-firmware-versal-mb" # This machine has a QEMU model, runqemu setup: -QB_MACHINE = "-M arm-generic-fdt" QB_MEM = "-m 8G" QB_DEFAULT_KERNEL = "none" QB_NETWORK_DEVICE = "" diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf index a1a894ec4..dd6966a0a 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf @@ -5,6 +5,7 @@ require conf/machine/include/soc-versal.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-qemu.inc +require conf/machine/include/xilinx-board.inc MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" @@ -47,7 +48,6 @@ PSM_FIRMWARE_IMAGE_NAME ?= "psm-firmware-versal-mb" HDF_MACHINE = "vc-p-a2197-00-versal" # This machine has a QEMU model, runqemu setup: -QB_MACHINE = "-M arm-generic-fdt" QB_MEM = "-m 8G" QB_DEFAULT_KERNEL = "none" QB_NETWORK_DEVICE = "" diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf index baa5e12f0..e9044ba7f 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf @@ -35,7 +35,6 @@ IMAGE_BOOT_FILES += " \ " # This machine has a QEMU model, runqemu setup: -QB_MACHINE = "-M arm-generic-fdt" QB_MEM = "-m 8G" QB_DEFAULT_KERNEL = "none" QB_NETWORK_DEVICE = "" diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index dee379785..2c890cfb8 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -37,7 +37,6 @@ IMAGE_BOOT_FILES += " \ " # This machine has a QEMU model, runqemu setup: -QB_MACHINE = "-machine xlnx-zcu102" QB_MEM = "-m 4096" QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null" QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@" diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf index 0f38e32b0..be0f701cb 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf @@ -5,6 +5,7 @@ require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-qemu.inc +require conf/machine/include/xilinx-board.inc MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf index 7e8316f50..9c7dbe839 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf @@ -8,6 +8,7 @@ SOC_VARIANT ?= "cg" require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-qemu.inc +require conf/machine/include/xilinx-board.inc MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" @@ -46,7 +47,6 @@ IMAGE_BOOT_FILES += " \ " # This machine has a QEMU model, runqemu setup: -QB_MACHINE = "-machine xlnx-zcu102" QB_MEM = "-m 4096" QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null" QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@" diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts index 4ec64f5e2..6f9b653ab 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts +++ b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts @@ -34,7 +34,7 @@ phy-handle = <ðernet_phy>; ethernet_phy: ethernet-phy@0 { - compatible = "marvell,88e1512"; + compatible = "marvell,88e1512", "marvell,88e1510"; device_type = "ethernet-phy"; reg = <0>; }; diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch new file mode 100644 index 000000000..7091098ca --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch @@ -0,0 +1,28 @@ +From 8127b19aa42ccfb3faae1173a12b3eb0cebf8941 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Thu, 30 Jan 2020 09:37:15 +0000 +Subject: [PATCH] Remove redundant YYLOC global declaration + +Same as the upstream fix for building dtc with gcc 10. + +Signed-off-by: Peter Robinson +State: upstream (e33a814e772cdc36436c8c188d8c42d019fda639) +--- + scripts/dtc/dtc-lexer.l | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l +index fd825ebba6..24af549977 100644 +--- a/scripts/dtc/dtc-lexer.l ++++ b/scripts/dtc/dtc-lexer.l +@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ +-- +2.29.2 + diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb index 9e289a089..95c7254c6 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb +++ b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb @@ -7,6 +7,10 @@ SRCREV ?= "bb4660c33aa7ea64f78b2682bf0efd56765197d6" include u-boot-xlnx.inc include u-boot-spl-zynq-init.inc +# Patch required for latest gcc and 2020.2 version of u-boot-xlnx +# This will be removed once the SRCREV above has been updated to include this change +SRC_URI += " file://0001-Remove-redundant-YYLOC-global-declaration.patch" + LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/uboot-device-tree/uboot-device-tree.bb b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/uboot-device-tree/uboot-device-tree.bb deleted file mode 100644 index 885dce8c8..000000000 --- a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/uboot-device-tree/uboot-device-tree.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "Xilinx BSP u-boot device trees" -DESCRIPTION = "Xilinx BSP u-boot device trees from within layer." -SECTION = "bsp" - -LICENSE = "MIT & GPLv2" -LIC_FILES_CHKSUM = " \ - file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ - file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ - " - -inherit devicetree xsctdt xsctyaml - - -REPO ??= "git://github.com/xilinx/device-tree-xlnx.git;protocol=https" -BRANCH ??= "master" -BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -SRC_URI = "${REPO};${BRANCHARG}" - -PROVIDES = "virtual/uboot-dtb" - -S = "${WORKDIR}/git" -B = "${WORKDIR}/build" - -SRCREV ??= "bc8445833318e9320bf485ea125921eecc3dc97a" -PV = "xilinx+git${SRCPV}" - -PACKAGE_ARCH ?= "${MACHINE_ARCH}" - -COMPATIBLE_MACHINE ?= "^$" -COMPATIBLE_MACHINE_zynqmp = ".*" -COMPATIBLE_MACHINE_zynq = ".*" -COMPATIBLE_MACHINE_versal = ".*" - -XSCTH_BUILD_CONFIG ?= "" - -DT_FILES_PATH = "${XSCTH_WS}/${XSCTH_PROJ}" -DT_INCLUDE_append = " ${WORKDIR}" -DT_PADDING_SIZE = "0x1000" - -UBOOT_DTS ?= "" -XSCTH_MISC = " -hdf_type ${HDF_EXT}" -XSCTH_APP = "device-tree" -YAML_DT_BOARD_FLAGS_zynqmp-generic ?= "" -YAML_DT_BOARD_FLAGS_versal-generic ?= "" -YAML_DT_BOARD_FLAGS_zynq-generic ?= "" -UBOOT_DTS_NAME = "u-boot" -DTB_FILE = "u-boot.dtb" - -do_configure[dirs] += "${DT_FILES_PATH}" -SRC_URI_append = "${@" ".join(["file://%s" % f for f in (d.getVar('UBOOT_DTS') or "").split()])}" - -do_configure_prepend () { - if [ ! -z "${UBOOT_DTS}" ]; then - for f in ${UBOOT_DTS}; do - cp -rf ${WORKDIR}/${f} ${DT_FILES_PATH}/ - done - return - fi -} - - -#Both linux dtb and uboot dtb are installing -#system-top.dtb for uboot env recipe while do_prepare_recipe_sysroot -#moving system-top.dts to othername. -do_compile_prepend() { - import shutil - - listpath = d.getVar("DT_FILES_PATH") - try: - os.remove(os.path.join(listpath, "system.dts")) - shutil.move(os.path.join(listpath, "system-top.dts"), os.path.join(listpath, d.getVar("UBOOT_DTS_NAME") + ".dts")) - except OSError: - pass -} - -do_deploy() { - install -Dm 0644 ${B}/${UBOOT_DTS_NAME}.dtb ${DEPLOYDIR}/${UBOOT_DTS_NAME}.dtb -} diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch index c2c5849d6..f38862fac 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch @@ -1,21 +1,23 @@ -From a471cf4e4c73350e090eb2cd87ec959d138012e5 Mon Sep 17 00:00:00 2001 +From 96f204df74f7dde5f4c9ad6e6eefc2d46219ccd9 Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Thu, 19 Mar 2020 11:54:26 -0700 Subject: [PATCH] Add enable/disable libudev Upstream-Status: Pending Signed-off-by: Jeremy Puhlman + +%% original patch: 0001-Add-enable-disable-udev.patch --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure -index cac271c..bd116eb 100755 +index c9a4e73..75f9773 100755 --- a/configure +++ b/configure -@@ -1539,6 +1539,10 @@ for opt do +@@ -1606,6 +1606,10 @@ for opt do ;; - --disable-plugins) plugins="no" + --gdb=*) gdb_bin="$optarg" ;; + --enable-libudev) libudev="yes" + ;; @@ -25,5 +27,5 @@ index cac271c..bd116eb 100755 echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information" -- -1.8.3.1 +2.7.4 diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-gl-renderer.c-Use-gr-egl_config-to-create-pbuffer-su.patch b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-gl-renderer.c-Use-gr-egl_config-to-create-pbuffer-su.patch deleted file mode 100644 index d7d411f63..000000000 --- a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-gl-renderer.c-Use-gr-egl_config-to-create-pbuffer-su.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 7cc76d50bddd6ff1eb5fb19712415f385f5d3f49 Mon Sep 17 00:00:00 2001 -From: Madhurkiran Harikrishnan -Date: Mon, 3 Feb 2020 14:26:21 -0800 -Subject: [PATCH] gl-renderer.c: Use gr->egl_config to create pbuffer surface - -The original implementation always chose first egl config for pbuffer -surface type, however the returned configs are implementation specific -and egl config may not always match between ctx and surface. Hence, -use gr->egl_config which already has the matching config but ensure that -windows and pbuffer bit are set for the surface type. - -Signed-off-by: Madhurkiran Harikrishnan -Upstream-status: Pending ---- - libweston/renderer-gl/gl-renderer.c | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c -index 54f8b1c..f50c959 100644 ---- a/libweston/renderer-gl/gl-renderer.c -+++ b/libweston/renderer-gl/gl-renderer.c -@@ -3567,7 +3567,7 @@ gl_renderer_setup_egl_extensions(struct weston_compositor *ec) - } - - static const EGLint gl_renderer_opaque_attribs[] = { -- EGL_SURFACE_TYPE, EGL_WINDOW_BIT, -+ EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT, - EGL_RED_SIZE, 1, - EGL_GREEN_SIZE, 1, - EGL_BLUE_SIZE, 1, -@@ -3577,7 +3577,7 @@ static const EGLint gl_renderer_opaque_attribs[] = { - }; - - static const EGLint gl_renderer_alpha_attribs[] = { -- EGL_SURFACE_TYPE, EGL_WINDOW_BIT, -+ EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT, - EGL_RED_SIZE, 1, - EGL_GREEN_SIZE, 1, - EGL_BLUE_SIZE, 1, -@@ -3682,15 +3682,7 @@ static int - gl_renderer_create_pbuffer_surface(struct gl_renderer *gr) { - EGLConfig pbuffer_config; - -- static const EGLint pbuffer_config_attribs[] = { -- EGL_SURFACE_TYPE, EGL_PBUFFER_BIT, -- EGL_RED_SIZE, 1, -- EGL_GREEN_SIZE, 1, -- EGL_BLUE_SIZE, 1, -- EGL_ALPHA_SIZE, 0, -- EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, -- EGL_NONE -- }; -+ EGLint surface_type; - - static const EGLint pbuffer_attribs[] = { - EGL_WIDTH, 10, -@@ -3698,13 +3690,21 @@ gl_renderer_create_pbuffer_surface(struct gl_renderer *gr) { - EGL_NONE - }; - -- if (egl_choose_config(gr, pbuffer_config_attribs, NULL, 0, &pbuffer_config) < 0) { -- weston_log("failed to choose EGL config for PbufferSurface\n"); -+ if(!eglGetConfigAttrib(gr->egl_display, gr->egl_config, EGL_SURFACE_TYPE, &surface_type)) { -+ weston_log("failed to get surface type for PbufferSurface\n"); -+ return -1; -+ } -+ -+ if (!((surface_type & EGL_WINDOW_BIT) && (surface_type & EGL_PBUFFER_BIT)) && -+ !gr->has_configless_context) { -+ weston_log("attempted to use a different EGL config for an " -+ "output but EGL_KHR_no_config_context or " -+ "EGL_MESA_configless_context is not supported\n"); - return -1; - } - - gr->dummy_surface = eglCreatePbufferSurface(gr->egl_display, -- pbuffer_config, -+ gr->egl_config, - pbuffer_attribs); - - if (gr->dummy_surface == EGL_NO_SURFACE) { --- -2.7.4 - diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch index e8e8a1f00..33d33b0f5 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch @@ -1,6 +1,6 @@ -From 77afc64239199f75041ec344f8f886ee20bba0f8 Mon Sep 17 00:00:00 2001 +From 3fbb596e53524e78703b76c4fdc33cd6ac62f777 Mon Sep 17 00:00:00 2001 From: Madhurkiran Harikrishnan -Date: Tue, 11 Feb 2020 19:07:45 -0800 +Date: Fri, 11 Dec 2020 16:21:38 -0800 Subject: [PATCH] libweston: Remove substitute format for ARGB8888 Xilinx DP gfx layer does not support XRGB8888. Hence, remove the same @@ -13,17 +13,17 @@ Upstream-Status : Inappropriate [Xilinx specific] 1 file changed, 1 deletion(-) diff --git a/libweston/pixel-formats.c b/libweston/pixel-formats.c -index b96f3b2..e2a7715 100644 +index 79dc709..ec2d3b7 100644 --- a/libweston/pixel-formats.c +++ b/libweston/pixel-formats.c -@@ -165,7 +165,6 @@ static const struct pixel_format_info pixel_format_table[] = { - }, +@@ -193,7 +193,6 @@ static const struct pixel_format_info pixel_format_table[] = { { DRM_FORMAT(ARGB8888), + BITS_RGBA_FIXED(8, 8, 8, 8), - .opaque_substitute = DRM_FORMAT_XRGB8888, .depth = 32, .bpp = 32, GL_FORMAT(GL_BGRA_EXT), -- -2.7.4 +2.17.1 diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/weston_%.bbappend b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/weston_%.bbappend index a13b627a4..d1912a814 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/weston_%.bbappend +++ b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/weston_%.bbappend @@ -1,5 +1,3 @@ FILESEXTRAPATHS_prepend_zynqmp := "${THISDIR}/files:" -SRC_URI_append_zynqmp = " file://0001-gl-renderer.c-Use-gr-egl_config-to-create-pbuffer-su.patch \ - file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch \ - " +SRC_URI_append_zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch" diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb index 6a88ac51d..b26ecd948 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb +++ b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Xilinx HDMI Linux Kernel module" DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices" SECTION = "kernel/modules" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=498a38cdcb922b9e987bbbb46e8a9ee5" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=570506b747d768e7802376f932dff926" XLNX_HDMI_VERSION = "5.4.0" PV = "${XLNX_HDMI_VERSION}" diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index a1e4cb0ba..eb64045a8 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -1,14 +1,14 @@ # TIInit_11.8.32.bts is required for bluetooth support but this particular # version is not available in the linux-firmware repository. # -SRC_URI_append_ultra96-zynqmp = "\ +SRC_URI_append_ultra96 = "\ https://git.ti.com/ti-bt/service-packs/blobs/raw/c290f8af9e388f37e509ecb111a1b64572b7c225/initscripts/TIInit_11.8.32.bts;name=TIInit_11.8.32 \ " SRC_URI[TIInit_11.8.32.md5sum] = "b1e142773e8ef0537b93895ebe2fcae3" SRC_URI[TIInit_11.8.32.sha256sum] = "962322c05857ad6b1fb81467bdfc59c125e04a6a8eaabf7f24b742ddd68c3bfa" -do_install_append_ultra96-zynqmp() { +do_install_append_ultra96() { cp ${WORKDIR}/TIInit_11.8.32.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/ ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) rm -f ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_7* @@ -17,12 +17,13 @@ do_install_append_ultra96-zynqmp() { INSANE_SKIP_${PN} += "installed-vs-shipped" -PACKAGES_remove_ultra96-zynqmp = "${PN}-wl12xx" +PACKAGES_remove_ultra96 = "${PN}-wl12xx" -FILES_${PN}-wl18xx_ultra96-zynqmp = " \ +FILES_${PN}-wl18xx_ultra96 = " \ ${nonarch_base_libdir}/firmware/wl18* \ ${nonarch_base_libdir}/firmware/TI* \ ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \ ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \ " +PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}" diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc index 6b4264f54..a98fc8018 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc @@ -56,10 +56,10 @@ KERNEL_FEATURES_append_kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-feat KERNEL_FEATURES_append_zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}" -KERNEL_FEATURES_append_zynqmp = "${@' features/xilinx/overlay/overlay_of.scc' if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1' else ''}" +KERNEL_FEATURES_append_zynqmp = "${@' features/xilinx/overlay_of/overlay_of.scc' if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1' else ''}" KERNEL_FEATURES_append_versal = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)} features/xilinx/hdmi-module/hdmi-module.scc" -KERNEL_FEATURES_append_ultra96-zynqmp = " bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc" +KERNEL_FEATURES_append_ultra96 = " bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', ' features/ocicontainer/ocicontainer.scc', '', d)}" diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch new file mode 100644 index 000000000..d5b96c2d1 --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch @@ -0,0 +1,51 @@ +From e33a814e772cdc36436c8c188d8c42d019fda639 Mon Sep 17 00:00:00 2001 +From: Dirk Mueller +Date: Tue, 14 Jan 2020 18:53:41 +0100 +Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration + +gcc 10 will default to -fno-common, which causes this error at link +time: + + (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here + +This is because both dtc-lexer as well as dtc-parser define the same +global symbol yyloc. Before with -fcommon those were merged into one +defintion. The proper solution would be to to mark this as "extern", +however that leads to: + + dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls] + 26 | extern YYLTYPE yylloc; + | ^~~~~~ +In file included from dtc-lexer.l:24: +dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here + 127 | extern YYLTYPE yylloc; + | ^~~~~~ +cc1: all warnings being treated as errors + +which means the declaration is completely redundant and can just be +dropped. + +Signed-off-by: Dirk Mueller +Signed-off-by: David Gibson +[robh: cherry-pick from upstream] +Cc: stable@vger.kernel.org +Signed-off-by: Rob Herring +--- + scripts/dtc/dtc-lexer.l | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l +index 5c6c3fd557d7..b3b7270300de 100644 +--- a/scripts/dtc/dtc-lexer.l ++++ b/scripts/dtc/dtc-lexer.l +@@ -23,7 +23,6 @@ LINECOMMENT "//".*\n + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ +-- +2.29.2 + diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb index 314b293ab..44fa42de1 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb +++ b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb @@ -10,5 +10,6 @@ SRC_URI_append = " \ file://0001-perf-tests-bp_account-Make-global-variable-static.patch \ file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \ file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch \ + file://0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch \ " diff --git a/meta-xilinx/meta-xilinx-pynq/classes/xilinx-pynq.bbclass b/meta-xilinx/meta-xilinx-pynq/classes/xilinx-pynq.bbclass index 645d1da21..a183a78e5 100644 --- a/meta-xilinx/meta-xilinx-pynq/classes/xilinx-pynq.bbclass +++ b/meta-xilinx/meta-xilinx-pynq/classes/xilinx-pynq.bbclass @@ -14,7 +14,7 @@ INSANE_SKIP_${PN} += "staticdev dev-so" inherit python3-dir # Used for setup.py on PYNQ -BOARD_NAME_ultra96-zynqmp = "Ultra96" +BOARD_NAME_ultra96 = "Ultra96" BOARD_NAME_zcu104-zynqmp = "ZCU104" do_compile_prepend() { diff --git a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb index 6a69ea210..c20ac5d64 100644 --- a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb +++ b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb @@ -22,7 +22,7 @@ RDEPENDS_${PN}-notebooks += "\ " COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE_ultra96-zynqmp = "ultra96-zynqmp" +COMPATIBLE_MACHINE_ultra96 = "${MACHINE}" S = "${WORKDIR}/git" @@ -55,3 +55,4 @@ do_install () { cp -r ${S}/notebooks/* ${JUPYTER_NOTEBOOKS}/bnn_examples/ } +PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}" diff --git a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb index 1cddb6021..d1aabb7d2 100644 --- a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb +++ b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/Xilinx/PYNQ-HelloWorld.git;protocol=https \ " COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE_ultra96-zynqmp = "ultra96-zynqmp" +COMPATIBLE_MACHINE_ultra96 = "${MACHINE}" SRC_URI[md5sum] = "ac1bfe94a18301b26ae5110ea26ca596" SRC_URI[sha256sum] = "f522c54c9418d1b1fdb6098cd7139439d47b041900000812c51200482d423460" @@ -37,3 +37,4 @@ do_install() { } +PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}" -- cgit v1.2.3 From eef6386ca7c8a62f37fc84a0a5a68842183cdfb0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Jan 2021 15:58:13 -0600 Subject: meta-openembedded: subtree update:4599fea881..fd123c9bb2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian (1): networkmanager: add missing readline depends Adrian Freihofer (2): nftables: upgrade 0.9.7 -> 0.9.8 firewalld: upgrade 0.9.2 -> 0.9.3 Adrian Herrera (2): cppunit: add support for native version protobuf: apply fix for pkg-config pthread flags Alejandro Enedino Hernandez Samaniego (2): remmina: Update to 1.4.10 imapfilter: Upgrade 2.6.16 -> 2.7.5 Anatol Belski (1): xmlsec1: Fix configure QA error caused by host lookup path Andreas Müller (24): libunique: remove xfce4-screenshooter: replace gtk+ -> gtk+3 in DEPENDS libxfce4ui: Fix sporadic install error poppler: upgrade 20.12.1 -> 21.01.0 dconf: upgrade 0.36.0 -> 0.38.0 dconf-editor: upgrade 3.36.2 -> 3.38.2 amtk: upgrade 5.1.1 -> 5.2.0 evince: upgrade 3.36.7 -> 3.38.0 catfish: upgrade 1.4.13 -> 4.16.0 xfwm4: upgrade 4.16.0 -> 4.16.1 parole: upgrade 1.0.5 -> 4.16.0 garcon: upgrade 0.8.0 -> 4.16.1 xfce4-whiskermenu-plugin: upgrade 2.5.1 -> 2.5.2 thunar: upgrade 4.16.0 -> 4.16.2 jack: upgrade 1.19.16 -> 1.19.17 networkmanager: upgrade 1.22.14 -> 1.28.0 appstream-glib: upgrade 0.7.17 -> 0.7.18 vlc: upgrade 3.0.11.1 -> 3.0.12 python3-mypy-extensions: Initial add 0.4.3 python3-mypy: initial add 0.800 python3-send2trash_ initial add 1.5.0 python3-asttokens: initial add 2.0.4 python3-typed-ast: Initial add 1.4.1 packagegroup-meta-python: Add asttokens/mypy/mypy-extensions/typed-ast/send2trash Andrew Jeffery (2): meta-python: Add hexdump package meta-python: Add jstyleson Armin Kuster (3): wireshark: Several securtiy fixes ipset: add recipe lua: update to 5.3.6 Clément Péron (2): re2: Add recipe for Google RE2 library abseil-cpp: bump to LTS 2020_09_23 Patch Release 3 Daniel Gomez (2): zbar: Add support for mchehab/zbar zbar: Remove support for 0.10 version Diego Santa Cruz (1): net-snmp: control smux via PACKAGECONFIG Gianfranco (2): vboxguestdrivers: upgrade 6.1.16 -> 6.1.18 vboxguestdrivers: Add patch proposed upstream to fix a build failure on i386 Gianfranco Costamagna (1): dlt-daemon: update to new release 2.18.6 Harpritkaur Bhandari (1): rapidjson: Upgrade SRCREV to latest He Zhe (2): lmbench: Fix webpage-lm and manual page typos lmbench: lat_fifo: Fix cleanup sequence Junjie Mao (1): python3-xmlschema: Yocto recipes for validating against XSD 1.1 Kai Kang (4): xfce4-panel-profiles: fix do install failure with dash xfce4-panel-profiles: update remove-bashisms.patch for centos 7 blueman: refresh patch mariadb: add package config zstd Khem Raj (6): influxdb: Fix build on mips packagegroup-meta-oe: Add new package influxdb packagegroup-meta-networking: Add ipset packagegroup-meta-oe: Add re2 autoconf-2.13-native,xserver-xorg-cvt-native: Move inheriting native to the end dfu-util-native: Adjust Inherit order Leon Anavi (75): python3-aiohttp: Upgrade 3.7.2 -> 3.7.3 python3-coloredlogs: Upgrade 14.0 -> 15.0 python3-jsonrpcserver: Upgrade 4.1.3 -> 4.2.0 python3-pymisp: Upgrade 2.4.133 -> 2.4.135.3 python3-parso: Upgrade 0.8.0 -> 0.8.1 python3-pillow: Upgrade 7.2.0 -> 8.1.0 python3-croniter: Upgrade 0.3.37 -> 1.0.1 python3-pychromecast: Upgrade 7.7.1 -> 7.7.2 python3-hyperlink: Upgrade 20.0.1 -> 21.0.0 python3-dnspython: Upgrade 2.0.0 -> 2.1.0 python3-prompt-toolkit: Upgrade 3.0.9 -> 3.0.10 python3-ptyprocess: Upgrade 0.6.0 -> 0.7.0 python3-certifi: Upgrade 2020.11.8 -> 2020.12.5 python3-jedi: Upgrade 0.17.2 -> 0.18.0 python3-mock: Upgrade 4.0.2 -> 4.0.3 python3-pyscaffold: Upgrade 3.2.3 -> 3.3 python3-cffi: Upgrade 1.14.3 -> 1.14.4 python3-rsa: Upgrade 4.6 -> 4.7 python3-pyjwt: Upgrade 1.7.1 -> 2.0.0 python3-isort: Upgrade 5.6.4 -> 5.7.0 python3-lz4: Upgrade 3.1.0 -> 3.1.1 python3-msgpack: Upgrade 1.0.0 -> 1.0.2 python3-pyopenssl: Upgrade 19.1.0 -> 20.0.1 python3-ecdsa: Upgrade 0.16.0 -> 0.16.1 python3-regex: Upgrade 2020.10.28 -> 2020.11.13 python3-cryptography: Upgrade 3.2 -> 3.3.1 python3-cryptography-vectors: Upgrade 3.2 -> 3.3.1 python3-wheel: Upgrade 0.35.1 -> 0.36.2 python3-pyzmq: Upgrade 19.0.2 -> 20.0.0 python3-greenlet: Upgrade 0.4.17 -> 1.0.0 python3-parse: Upgrade 1.18.0 -> 1.19.0 python3-colorlog: Upgrade 4.6.2 -> 4.7.2 python3-pyephem: Upgrade 3.7.7.0 -> 3.7.7.1 python3-pyperf: Upgrade 2.0.0 -> 2.1.0 python3-cheetah: Upgrade 3.2.5 -> 3.2.6 python3-pyscaffold: Upgrade 3.3 -> 3.3.1 python3-lxml: Upgrade 4.6.1 -> 4.6.2 python3-openpyxl: Upgrade 3.0.5 -> 3.0.6 python3-pymysql: Upgrade 0.10.1 -> 1.0.2 python3-dbus-next: Upgrade 0.1.4 -> 0.2.2 python3-yappi: Upgrade 1.3.0 -> 1.3.2 python3-pyyaml: Upgrade 5.3.1 -> 5.4 python3-google-api-python-client: Upgrade 1.12.5 -> 1.12.8 python3-evdev: Upgrade 1.3.0 -> 1.4.0 python3-pyusb: Upgrade 1.1.0 -> 1.1.1 python3-pyserial: Upgrade 3.4 -> 3.5 python3-pandas: Upgrade 1.2.0 -> 1.2.1 python3-alembic: Upgrade 1.4.3 -> 1.5.1 python3-coverage: Upgrade 5.3 -> 5.3.1 python3-lz4: Upgrade 3.1.1 -> 3.1.3 python3-bitarray: Upgrade 1.6.1 -> 1.6.3 python3-pykwalify: Upgrade 1.7.0 -> 1.8.0 python3-croniter: Upgrade 1.0.1 -> 1.0.2 python3-ujson: Upgrade 4.0.1 -> 4.0.2 python3-smbus2: Upgrade 0.4.0 -> 0.4.1 python3-pyzmq: Upgrade 20.0.0 -> 21.0.1 python3-alembic: Upgrade 1.5.1 -> 1.5.2 python3-prompt-toolkit: Upgrade 3.0.10 -> 3.0.11 python3-pyjwt: Upgrade 2.0.0 -> 2.0.1 python3-pyyaml: Upgrade 5.4 -> 5.4.1 python3-natsort: Upgrade 7.1.0 -> 7.1.1 python3-pymisp: Upgrade 2.4.135.3 -> 2.4.137.1 python3-socketio: Upgrade 4.6.0 -> 5.0.4 python3-lazy-object-proxy: Upgrade 1.5.1 -> 1.5.2 python3-custom-inherit: Upgrade 2.3.0 -> 2.3.1 python3-cachetools: Upgrade 4.2.0 -> 4.2.1 python3-coverage: Upgrade 5.3.1 -> 5.4 python3-diskcache: Upgrade 5.1.0 -> 5.2.1 python3-aenum: Upgrade 2.2.6 -> 3.0.0 python3-xmlschema: Upgrade 1.4.1 -> 1.4.2 python3-intervals: Upgrade 1.10.0 -> 1.10.0.post1 python3-portion: Add recipe python3-pako: Upgrade 0.2.3 -> 0.3.0 python3-typed-ast: Upgrade 1.4.1 -> 1.4.2 python3-pyzmq: Upgrade 21.0.1 -> 21.0.2 Luca Boccassi (4): dbus-broker: enable SO_PEERSEC usage by default fsverity: update to 1.3 fsverity: fix MinGW build dbus-broker: update to v26 Mario Schuknecht (1): dnsmasq: Fix systemd service Mikko Rapeli (3): fuse: set CVE_PRODUCT to "fuse_project:fuse" flatbuffers: whitelist CVE-2020-35864 giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT Mingli Yu (2): mcelog: fix the pfa test hang mariadb: upgrade to 10.5.8 Nicolas Jeker (1): networkmanager: Add Wireless Extensions to PACKAGECONFIG[wifi] Oleksiy Obitotskyy (1): libsmi: set awk as target path Robert Joslyn (1): htop: Update to 3.0.4 Ross Burton (1): libmicrohttpd: allow native/nativesdk builds S. Lockwood-Childs (1): sip3: simplify recipe Shlomi Vaknin (1): python3-sh: remove python3-tests from RDEPENDS Stefano Babic (1): libconfig: split package for C++ Søren Andersen (1): zram: fix sourcing of zram parameters Thomas Perrot (1): influxdb: add new recipe Trevor Gamblin (2): packagegroup-meta-python: sort package names, add notes packagegroup-meta-python: add ptest packages to ptest group Wang Mingyu (1): dovecot: upgrade 2.2.36.4 -> 2.3.13 Yi Zhao (1): nss: upgrade 3.60 -> 3.60.1 Zang Ruochen (9): c-periphery: upgrade 2.3.0 -> 2.3.1 htop: upgrade 3.0.4 -> 3.0.5 hwdata: upgrade 0.342 -> 0.343 spitools: upgrade 0.8.6 -> 0.8.7 librole-tiny-perl: upgrade 2.001004 -> 2.002003 python3-smbus: upgrade 4.1 -> 4.2 python3-snappy: upgrade 0.5.4 -> 0.6.0 python3-zopeinterface: upgrade 5.1.0 -> 5.2.0 python3-nmap: upgrade 1.4.8 -> 1.5.0 Zheng Ruoqin (7): cifs-utils: upgrade 6.11 -> 6.12 firewalld: upgrade 0.9.1 -> 0.9.2 igmpproxy: upgrade 0.2.1 -> 0.3 mdns: upgrade 1096.40.7 -> 1310.40.42 opensc: Fix the wrong version number. python3-djangorestframework: upgrade 3.12.1 -> 3.12.2 python3-ipy: upgrade 1.00 -> 1.01 changqing.li@windriver.com (1): celt051: update SRC_URI zangrc (6): libnftnl: upgrade 1.1.8 -> 1.1.9 czmq: upgrade 4.2.0 -> 4.2.1 dialog: upgrade 1.3-20201126 -> 1.3-20210117 modemanager: upgrade 1.14.8 -> 1.14.10 monit: upgrade 5.27.1 -> 5.27.2 python3-networkmanager: upgrade 2.1 -> 2.2 zhengruoqin (3): openldap: upgrade 2.4.56 -> 2.4.57 satyr: upgrade 0.35 -> 0.36 zeromq: upgrade 4.3.3 -> 4.3.4 Signed-off-by: Andrew Geissler Change-Id: I2469d162f1db8072fec106f629872618082bbeac --- .../recipes-support/fuse/fuse3_3.10.1.bb | 2 + .../recipes-support/fuse/fuse_2.9.9.bb | 2 + .../meta-gnome/recipes-gnome/amtk/amtk_5.1.1.bb | 15 - .../meta-gnome/recipes-gnome/amtk/amtk_5.2.0.bb | 14 + .../recipes-gnome/dconf/dconf-editor_3.36.2.bb | 17 - .../recipes-gnome/dconf/dconf-editor_3.38.2.bb | 16 + .../meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb | 25 - .../meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb | 24 + ...1-Add-format-attribute-to-_synctex_malloc.patch | 27 - .../0002-add-a-formatting-attribute-check.patch | 93 --- .../recipes-gnome/evince/evince_3.36.7.bb | 55 -- .../recipes-gnome/evince/evince_3.38.0.bb | 50 ++ .../appstream-glib/appstream-glib_0.7.17.bb | 37 -- .../appstream-glib/appstream-glib_0.7.18.bb | 36 + ...hread-Use-SYS_futex-instead-of-__NR_futex.patch | 46 -- .../vlc/vlc/0005-Fix-build-with-Qt-5.15.patch | 56 -- ...hread-Use-SYS_futex-instead-of-__NR_futex.patch | 46 ++ .../recipes-multimedia/vlc/vlc_3.0.11.1.bb | 136 ---- .../recipes-multimedia/vlc/vlc_3.0.12.bb | 135 ++++ .../0002-fix-fail-to-enable-bluetooth.patch | 17 +- .../firewalld/firewalld_0.9.1.bb | 91 --- .../firewalld/firewalld_0.9.3.bb | 92 +++ ...ewalld-to-var-libdir-rather-than-hardcod-.patch | 30 - ...te-settings-settings-property-documentati.patch | 43 +- ...ewalld-to-var-libdir-rather-than-hardcod-.patch | 30 + .../0004-fix_reallocarray_check.patch | 27 + .../networkmanager/fix_reallocarray_check.patch | 27 - ...0001-Fix-build-with-musl-systemd-specific.patch | 29 +- .../musl/0002-Fix-build-with-musl.patch | 23 +- .../0003-Fix-build-with-musl-for-n-dhcp4.patch | 61 -- ...0003-Fix-build-with-musl-systemd-specific.patch | 26 + ...0004-Fix-build-with-musl-systemd-specific.patch | 26 - .../networkmanager/networkmanager_1.22.14.bb | 180 ----- .../networkmanager/networkmanager_1.28.0.bb | 183 ++++++ .../python3-networkmanager_2.1.bb | 13 - .../python3-networkmanager_2.2.bb | 13 + .../packagegroups/packagegroup-meta-networking.bb | 1 + .../recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb | 13 - .../recipes-daemons/igmpproxy/igmpproxy_0.3.bb | 13 + .../recipes-filter/ipset/ipset_7.9.bb | 21 + .../recipes-filter/libnftnl/libnftnl_1.1.8.bb | 14 - .../recipes-filter/libnftnl/libnftnl_1.1.9.bb | 14 + .../recipes-filter/nftables/nftables_0.9.7.bb | 31 - .../recipes-filter/nftables/nftables_0.9.8.bb | 31 + .../0001-mdns-include-stddef.h-for-NULL.patch | 2 +- .../recipes-protocols/mdns/mdns_1096.40.7.bb | 102 --- .../recipes-protocols/mdns/mdns_1310.40.42.bb | 102 +++ .../recipes-protocols/net-snmp/net-snmp_5.9.bb | 8 +- .../recipes-support/celt051/celt051_git.bb | 2 +- ...x-Modify-the-dir-of-install-exec-hook-and.patch | 43 -- .../recipes-support/cifs/cifs-utils_6.11.bb | 37 -- .../recipes-support/cifs/cifs-utils_6.12.bb | 33 + .../dnsmasq/files/dnsmasq-resolvconf.service | 2 +- ...c-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch | 99 +-- .../dovecot/0001-doveadm-Fix-parallel-build.patch | 38 -- .../dovecot/dovecot/0001-not-check-pandoc.patch | 26 + .../recipes-support/dovecot/dovecot_2.2.36.4.bb | 73 -- .../recipes-support/dovecot/dovecot_2.3.13.bb | 73 ++ .../recipes-support/wireshark/wireshark_3.2.10.bb | 80 +++ .../recipes-support/wireshark/wireshark_3.2.7.bb | 80 --- .../0001-doc-Fix-typos-in-manual-pages.patch | 100 +++ .../0001-lat_fifo-Fix-cleanup-sequence.patch | 42 ++ ...ench-Point-webpage-lm-to-target-directory.patch | 77 +++ .../recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 4 + .../modemmanager/modemmanager_1.14.10.bb | 53 ++ .../modemmanager/modemmanager_1.14.8.bb | 53 -- .../recipes-connectivity/zeromq/czmq_4.2.0.bb | 32 - .../recipes-connectivity/zeromq/czmq_4.2.1.bb | 32 + .../recipes-connectivity/zeromq/zeromq_4.3.3.bb | 29 - .../recipes-connectivity/zeromq/zeromq_4.3.4.bb | 29 + .../meta-oe/recipes-core/dbus/dbus-broker_25.bb | 32 - .../meta-oe/recipes-core/dbus/dbus-broker_26.bb | 33 + .../packagegroups/packagegroup-meta-oe.bb | 2 + .../fsverity-utils/fsverity-utils_1.2.bb | 28 - .../fsverity-utils/fsverity-utils_1.3.bb | 31 + ...module-for-mips-ispeed-ospeed-termios-abs.patch | 20 + .../meta-oe/recipes-dbs/influxdb/influxdb/influxdb | 235 +++++++ .../recipes-dbs/influxdb/influxdb/influxdb.conf | 586 +++++++++++++++++ .../recipes-dbs/influxdb/influxdb_1.7.10.bb | 65 ++ .../recipes-dbs/mysql/mariadb-native_10.5.6.bb | 20 - .../recipes-dbs/mysql/mariadb-native_10.5.8.bb | 20 + .../meta-oe/recipes-dbs/mysql/mariadb.inc | 4 +- ...-stacktrace-t.c-make-the-test-conditional.patch | 38 ++ .../recipes-dbs/mysql/mariadb/c11_atomics.patch | 14 +- .../meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb | 27 - .../meta-oe/recipes-dbs/mysql/mariadb_10.5.8.bb | 27 + ...01-Add-RISCV-support-to-GetProgramCounter.patch | 29 - .../abseil-cpp/0001-Fix-build-on-riscv32.patch | 74 --- ...Remove-maes-option-from-cross-compilation.patch | 53 -- .../0001-absl-always-use-asm-sgidefs.h.patch | 8 +- ...gotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch | 35 - ...Remove-maes-option-from-cross-compilation.patch | 37 ++ .../abseil-cpp/0003-Add-fPIC-option.patch | 27 - .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 24 +- .../autoconf-2.13/autoconf-2.13-native_2.13.bb | 2 +- .../flatbuffers/flatbuffers_1.12.0.bb | 2 + .../giflib/files/CVE-2019-15133.patch | 23 + .../recipes-devtools/giflib/giflib_5.1.4.bb | 7 +- .../meta-oe/recipes-devtools/lua/lua_5.3.5.bb | 70 -- .../meta-oe/recipes-devtools/lua/lua_5.3.6.bb | 70 ++ .../protobuf/0001-fix-m4-pthread-update.patch | 731 +++++++++++++++++++++ .../recipes-devtools/protobuf/protobuf_3.14.0.bb | 1 + .../recipes-devtools/rapidjson/rapidjson_git.bb | 5 +- .../meta-oe/recipes-devtools/sip/sip3_4.19.23.bb | 17 +- .../recipes-extended/dialog/dialog_1.3-20201126.bb | 33 - .../recipes-extended/dialog/dialog_1.3-20210117.bb | 33 + .../dlt-daemon/dlt-daemon/241.patch | 30 - .../dlt-daemon/dlt-daemon/245.patch | 74 --- .../dlt-daemon/dlt-daemon/275.patch | 38 -- .../dlt-daemon/dlt-daemon_2.18.5.bb | 69 -- .../dlt-daemon/dlt-daemon_2.18.6.bb | 66 ++ .../recipes-extended/libconfig/libconfig_1.7.2.bb | 4 + .../recipes-extended/zram/zram/zram-swap-init | 2 +- .../0001-Use-SYS_futex-instead-of-__NR_futex.patch | 62 -- .../recipes-multimedia/jack/jack_1.19.16.bb | 54 -- .../recipes-multimedia/jack/jack_1.19.17.bb | 53 ++ .../c-periphery/c-periphery_2.3.0.bb | 21 - .../c-periphery/c-periphery_2.3.1.bb | 21 + .../dfu-util/dfu-util-native_0.10.bb | 2 +- .../htop/files/0001-Use-pkg-config.patch | 19 +- .../meta-oe/recipes-support/htop/htop_3.0.1.bb | 31 - .../meta-oe/recipes-support/htop/htop_3.0.5.bb | 33 + .../meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 +- .../imapfilter/imapfilter_2.6.16.bb | 21 - .../recipes-support/imapfilter/imapfilter_2.7.5.bb | 21 + .../libmicrohttpd/libmicrohttpd_0.9.72.bb | 5 +- .../meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb | 2 +- .../mcelog/0001-test-avoid-the-pfa-test-hang.patch | 36 + .../meta-oe/recipes-support/mcelog/mcelog_170.bb | 1 + .../meta-oe/recipes-support/monit/monit_5.27.1.bb | 53 -- .../meta-oe/recipes-support/monit/monit_5.27.2.bb | 53 ++ .../meta-oe/recipes-support/nss/nss_3.60.1.bb | 271 ++++++++ .../meta-oe/recipes-support/nss/nss_3.60.bb | 271 -------- .../recipes-support/openldap/openldap_2.4.56.bb | 254 ------- .../recipes-support/openldap/openldap_2.4.57.bb | 254 +++++++ .../recipes-support/opensc/opensc_0.20.1.bb | 48 -- .../recipes-support/opensc/opensc_0.21.0.bb | 48 ++ .../recipes-support/poppler/poppler_20.12.1.bb | 51 -- .../recipes-support/poppler/poppler_21.01.0.bb | 51 ++ .../meta-oe/recipes-support/re2/re2_2020.11.01.bb | 23 + .../recipes-support/remmina/remmina_1.4.10.bb | 36 + .../recipes-support/remmina/remmina_1.4.8.bb | 34 - .../meta-oe/recipes-support/satyr/satyr_0.35.bb | 35 - .../meta-oe/recipes-support/satyr/satyr_0.36.bb | 35 + .../recipes-support/spitools/spitools_git.bb | 4 +- ...tions-linux-drm-Adjustment-for-Linux-5.10.patch | 321 --------- ...obj-r0drv-linux.c-Changes-to-support-the-.patch | 119 ---- ...sf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch | 46 -- .../vboxguestdrivers/kernel-5.10.patch | 23 + .../vboxguestdrivers/vboxguestdrivers_6.1.16.bb | 85 --- .../vboxguestdrivers/vboxguestdrivers_6.1.18.bb | 83 +++ .../xmlsec1/ensure-search-path-non-host.patch | 22 + .../recipes-support/xmlsec1/xmlsec1_1.2.31.bb | 1 + .../xserver-xorg-cvt-native_1.20.10.bb | 2 +- .../zbar/0001-make-relies-GNU-extentions.patch | 36 - .../zbar/0001-qt-Create-subdir-in-Makefile.patch | 35 + .../0002-zbarcam-Create-subdir-in-Makefile.patch | 40 ++ .../meta-oe/recipes-support/zbar/zbar_git.bb | 62 +- .../meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb | 2 + .../librole/librole-tiny-perl_2.001004.bb | 29 - .../librole/librole-tiny-perl_2.002003.bb | 29 + .../packagegroups/packagegroup-meta-python.bb | 691 ++++++++++--------- .../python/python-pyzmq/club-rpath-out.patch | 24 +- .../recipes-devtools/python/python3-aenum_2.2.6.bb | 11 - .../recipes-devtools/python/python3-aenum_3.0.0.bb | 10 + .../python/python3-aiohttp_3.7.2.bb | 23 - .../python/python3-aiohttp_3.7.3.bb | 22 + .../python/python3-alembic_1.4.3.bb | 17 - .../python/python3-alembic_1.5.2.bb | 16 + .../python/python3-asttokens_2.0.4.bb | 17 + .../python/python3-bitarray_1.6.1.bb | 11 - .../python/python3-bitarray_1.6.3.bb | 10 + .../python/python3-cachetools_4.2.0.bb | 33 - .../python/python3-cachetools_4.2.1.bb | 32 + .../python/python3-certifi_2020.11.8.bb | 15 - .../python/python3-certifi_2020.12.5.bb | 14 + .../recipes-devtools/python/python3-cffi_1.14.3.bb | 19 - .../recipes-devtools/python/python3-cffi_1.14.4.bb | 18 + .../python/python3-cheetah_3.2.5.bb | 15 - .../python/python3-cheetah_3.2.6.bb | 14 + .../python/python3-coloredlogs_14.0.bb | 24 - .../python/python3-coloredlogs_15.0.bb | 23 + .../python/python3-colorlog_4.6.2.bb | 11 - .../python/python3-colorlog_4.7.2.bb | 10 + .../python/python3-coverage_5.3.bb | 10 - .../python/python3-coverage_5.4.bb | 9 + .../python/python3-croniter_0.3.37.bb | 12 - .../python/python3-croniter_1.0.2.bb | 12 + .../python/python3-cryptography-vectors_3.2.bb | 20 - .../python/python3-cryptography-vectors_3.3.1.bb | 19 + .../python/python3-cryptography_3.2.bb | 66 -- .../python/python3-cryptography_3.3.1.bb | 65 ++ .../python/python3-custom-inherit_2.3.0.bb | 12 - .../python/python3-custom-inherit_2.3.1.bb | 10 + .../python/python3-dbus-next_0.1.4.bb | 13 - .../python/python3-dbus-next_0.2.2.bb | 12 + .../python/python3-diskcache_5.1.0.bb | 14 - .../python/python3-diskcache_5.2.1.bb | 13 + .../python/python3-djangorestframework_3.12.1.bb | 16 - .../python/python3-djangorestframework_3.12.2.bb | 16 + .../python/python3-dnspython_2.0.0.bb | 33 - .../python/python3-dnspython_2.1.0.bb | 32 + .../python/python3-ecdsa_0.16.0.bb | 14 - .../python/python3-ecdsa_0.16.1.bb | 13 + .../python/python3-elementpath_2.1.2.bb | 12 + .../recipes-devtools/python/python3-evdev_1.3.0.bb | 23 - .../recipes-devtools/python/python3-evdev_1.4.0.bb | 22 + .../python3-google-api-python-client_1.12.5.bb | 9 - .../python3-google-api-python-client_1.12.8.bb | 8 + .../python/python3-greenlet_0.4.17.bb | 9 - .../python/python3-greenlet_1.0.0.bb | 8 + .../recipes-devtools/python/python3-hexdump_3.3.bb | 27 + .../python/python3-hyperlink_20.0.1.bb | 17 - .../python/python3-hyperlink_21.0.0.bb | 16 + .../python/python3-intervals_1.10.0.bb | 28 - .../python/python3-intervals_1.10.0.post1.bb | 27 + .../recipes-devtools/python/python3-ipy_1.00.bb | 32 - .../recipes-devtools/python/python3-ipy_1.01.bb | 32 + .../recipes-devtools/python/python3-isort_5.6.4.bb | 17 - .../recipes-devtools/python/python3-isort_5.7.0.bb | 16 + .../recipes-devtools/python/python3-jedi_0.17.2.bb | 14 - .../recipes-devtools/python/python3-jedi_0.18.0.bb | 13 + .../python/python3-jsonrpcserver_4.1.3.bb | 23 - .../python/python3-jsonrpcserver_4.2.0.bb | 22 + .../python/python3-jstyleson/LICENSE | 8 + .../python/python3-jstyleson_0.0.2.bb | 15 + .../python/python3-lazy-object-proxy_1.5.1.bb | 12 - .../python/python3-lazy-object-proxy_1.5.2.bb | 11 + .../recipes-devtools/python/python3-lxml_4.6.1.bb | 42 -- .../recipes-devtools/python/python3-lxml_4.6.2.bb | 41 ++ .../recipes-devtools/python/python3-lz4_3.1.0.bb | 16 - .../recipes-devtools/python/python3-lz4_3.1.3.bb | 15 + .../recipes-devtools/python/python3-mock_4.0.2.bb | 17 - .../recipes-devtools/python/python3-mock_4.0.3.bb | 16 + .../python/python3-msgpack_1.0.0.bb | 28 - .../python/python3-msgpack_1.0.2.bb | 27 + .../python/python3-mypy-extensions_0.4.3.bb | 12 + .../recipes-devtools/python/python3-mypy_0.800.bb | 18 + .../python/python3-natsort_7.1.0.bb | 11 - .../python/python3-natsort_7.1.1.bb | 11 + .../recipes-devtools/python/python3-nmap_1.4.8.bb | 16 - .../recipes-devtools/python/python3-nmap_1.5.0.bb | 19 + .../python/python3-openpyxl_3.0.5.bb | 15 - .../python/python3-openpyxl_3.0.6.bb | 14 + .../recipes-devtools/python/python3-pako_0.2.3.bb | 13 - .../recipes-devtools/python/python3-pako_0.3.0.bb | 12 + .../python/python3-pandas_1.2.0.bb | 24 - .../python/python3-pandas_1.2.1.bb | 24 + .../python/python3-parse_1.18.0.bb | 26 - .../python/python3-parse_1.19.0.bb | 25 + .../recipes-devtools/python/python3-parso_0.8.0.bb | 12 - .../recipes-devtools/python/python3-parso_0.8.1.bb | 11 + .../0001-support-cross-compiling.patch | 43 +- .../python/python3-pillow_7.2.0.bb | 38 -- .../python/python3-pillow_8.1.0.bb | 37 ++ .../python/python3-portion_2.1.4.bb | 12 + .../python/python3-prompt-toolkit_3.0.11.bb | 23 + .../python/python3-prompt-toolkit_3.0.9.bb | 23 - .../python/python3-ptyprocess_0.6.0.bb | 43 -- .../python/python3-ptyprocess_0.7.0.bb | 42 ++ .../python/python3-pychromecast_7.7.1.bb | 10 - .../python/python3-pychromecast_7.7.2.bb | 10 + .../recipes-devtools/python/python3-pyjwt_1.7.1.bb | 16 - .../recipes-devtools/python/python3-pyjwt_2.0.1.bb | 15 + .../0001-rule.py-fix-missing-comma.patch | 34 - .../python/python3-pykwalify_1.7.0.bb | 22 - .../python/python3-pykwalify_1.8.0.bb | 19 + .../python/python3-pymisp_2.4.133.bb | 21 - .../python/python3-pymisp_2.4.137.1.bb | 22 + .../python/python3-pymysql_0.10.1.bb | 17 - .../python/python3-pymysql_1.0.2.bb | 16 + .../python/python3-pyopenssl_19.1.0.bb | 24 - .../python/python3-pyopenssl_20.0.1.bb | 23 + .../python/python3-pyperf_2.0.0.bb | 24 - .../python/python3-pyperf_2.1.0.bb | 23 + .../python/python3-pyscaffold_3.2.3.bb | 18 - .../python/python3-pyscaffold_3.3.1.bb | 17 + .../python/python3-pyserial_3.4.bb | 62 -- .../python/python3-pyserial_3.5.bb | 62 ++ .../recipes-devtools/python/python3-pyusb_1.1.0.bb | 12 - .../recipes-devtools/python/python3-pyusb_1.1.1.bb | 12 + .../python/python3-pyyaml_5.3.1.bb | 18 - .../python/python3-pyyaml_5.4.1.bb | 18 + .../python/python3-pyzmq_19.0.2.bb | 27 - .../python/python3-pyzmq_21.0.2.bb | 26 + .../python/python3-regex_2020.10.28.bb | 11 - .../python/python3-regex_2020.11.13.bb | 10 + .../recipes-devtools/python/python3-rsa_4.6.bb | 41 -- .../recipes-devtools/python/python3-rsa_4.7.bb | 40 ++ .../recipes-devtools/python/python3-sh_1.14.1.bb | 1 - .../python/python3-smbus2_0.4.0.bb | 18 - .../python/python3-smbus2_0.4.1.bb | 18 + .../recipes-devtools/python/python3-smbus_4.1.bb | 13 - .../recipes-devtools/python/python3-smbus_4.2.bb | 13 + .../python/python3-snappy_0.5.4.bb | 15 - .../python/python3-snappy_0.6.0.bb | 15 + .../python/python3-socketio_4.6.0.bb | 28 - .../python/python3-socketio_5.0.4.bb | 27 + .../python/python3-typed-ast_1.4.2.bb | 12 + .../recipes-devtools/python/python3-ujson_4.0.1.bb | 32 - .../recipes-devtools/python/python3-ujson_4.0.2.bb | 31 + .../python/python3-wheel_0.35.1.bb | 13 - .../python/python3-wheel_0.36.2.bb | 12 + .../python/python3-xmlschema_1.4.2.bb | 19 + .../recipes-devtools/python/python3-yappi_1.3.0.bb | 32 - .../recipes-devtools/python/python3-yappi_1.3.2.bb | 31 + .../python/python3-zopeinterface_5.1.0.bb | 23 - .../python/python3-zopeinterface_5.2.0.bb | 23 + .../python-pyephem/python3-pyephem_3.7.7.0.bb | 17 - .../python-pyephem/python3-pyephem_3.7.7.1.bb | 16 + .../send2trash/python3-send2trash_1.5.0.bb | 9 + .../recipes-apps/catfish/catfish_1.4.13.bb | 17 - .../recipes-apps/catfish/catfish_4.16.0.bb | 14 + .../0001-Makefile.in.in-remove-bashisms.patch | 56 ++ .../xfce4-panel-profiles_1.0.12.bb | 1 + .../xfce4-screenshooter_1.9.8.bb | 2 +- ...-use-LIBTOOL-instead-of-hardcoded-libtool.patch | 27 - ...-unique-Add-format-qualifier-s-for-string.patch | 32 - .../libunique/libunique/build.patch | 421 ------------ .../libunique/fix_for_compile_with_gcc-4.6.0.patch | 36 - .../libunique/libunique/noconst.patch | 130 ---- .../recipes-extended/libunique/libunique_1.1.6.bb | 34 - .../recipes-multimedia/parole/parole_1.0.5.bb | 33 - .../recipes-multimedia/parole/parole_4.16.0.bb | 32 + .../whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb | 10 - .../whiskermenu/xfce4-whiskermenu-plugin_2.5.2.bb | 10 + .../meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb | 20 - .../meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb | 20 + ...-private-xfce4-keyboard-shortcuts.xml-fix.patch | 32 - ...-private-xfce4-keyboard-shortcuts.xml-fix.patch | 32 + .../libxfce4ui/0002-Remove-GTK2-leftovers.patch | 44 ++ .../recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb | 7 +- .../meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb | 28 - .../meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb | 28 + .../meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb | 37 -- .../meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb | 37 ++ 336 files changed, 7068 insertions(+), 6518 deletions(-) delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.1.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.2.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.36.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.7.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.38.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0001-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.3.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb create mode 100644 meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.9.bb delete mode 100644 meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.8.bb create mode 100644 meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.9.bb delete mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.7.bb create mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.8.bb delete mode 100644 meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1096.40.7.bb create mode 100644 meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.40.42.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.13.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-manual-pages.patch create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_fifo-Fix-cleanup-sequence.patch create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lmbench-Point-webpage-lm-to-target-directory.patch create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_25.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_26.bb delete mode 100644 meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch create mode 100755 meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/influxdb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/influxdb.conf create mode 100644 meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-stacktrace-t.c-make-the-test-conditional.patch delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Add-RISCV-support-to-GetProgramCounter.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Fix-build-on-riscv32.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Remove-maes-option-from-cross-compilation.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Add-forgotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Add-fPIC-option.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-m4-pthread-update.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20201126.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20210117.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.56.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.57.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.21.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.01.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.35.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.36.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch delete mode 100644 meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.001004.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.002003.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.4.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.5.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-asttokens_2.0.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.11.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.12.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_14.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_15.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.6.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.7.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.37.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.3.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-custom-inherit_2.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-custom-inherit_2.3.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-next_0.1.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-next_0.2.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.2.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.16.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.16.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.8.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.17.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_1.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-hexdump_3.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_20.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_21.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.post1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.00.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.01.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.6.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.7.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.17.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.18.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jstyleson/LICENSE create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_3.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_3.1.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-mypy-extensions_0.4.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.800.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.4.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.5.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pako_0.2.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pako_0.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.18.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.19.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_7.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_8.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.1.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.11.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.7.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify/0001-rule.py-fix-missing-comma.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.133.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.137.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.10.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_19.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_20.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_3.2.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_3.3.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.4.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_19.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_21.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.28.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.11.13.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.7.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.5.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_4.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.0.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-typed-ast_1.4.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.35.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.36.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.4.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_5.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_5.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_3.7.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_3.7.7.1.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.5.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.13.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.5.bb create mode 100644 meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.1.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.1.bb index 80ce02872..49d6c15da 100644 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.1.bb +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.1.bb @@ -20,6 +20,8 @@ S = "${WORKDIR}/fuse-${PV}" UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" UPSTREAM_CHECK_REGEX = "fuse\-(?P3(\.\d+)+).tar.xz" +CVE_PRODUCT = "fuse_project:fuse" + inherit meson pkgconfig ptest SRC_URI += " \ diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb index 95e870691..2c272d452 100644 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb @@ -22,6 +22,8 @@ SRC_URI[sha256sum] = "d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7 UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" UPSTREAM_CHECK_REGEX = "fuse\-(?P2(\.\d+)+).tar.gz" +CVE_PRODUCT = "fuse_project:fuse" + inherit autotools pkgconfig update-rc.d systemd INITSCRIPT_NAME = "fuse" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.1.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.1.1.bb deleted file mode 100644 index 58713c35c..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.1.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Actions, Menus and Toolbars Kit" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ -" - -inherit gnomebase gettext features_check gobject-introspection - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -SRC_URI[archive.md5sum] = "f11c2e0cde10d5224a942b1e13d598b2" -SRC_URI[archive.sha256sum] = "f9656bdd4278aabfb8554f029049b9ffaf51b53faa463483a840365463355df1" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.2.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.2.0.bb new file mode 100644 index 000000000..41cda1ebc --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.2.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Actions, Menus and Toolbars Kit" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + glib-2.0-native \ + gtk+3 \ +" + +inherit gnomebase gettext features_check gobject-introspection + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI[archive.sha256sum] = "820545bb4cf87ecebc2c3638d6b6e58b8dbd60a419a9b43cf020124e5dad7078" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.36.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.36.2.bb deleted file mode 100644 index 25f409c41..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.36.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Configuration editor for dconf" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = "dconf gtk+3" - -inherit gnomebase vala gettext gsettings bash-completion - -SRC_URI[archive.md5sum] = "78bd905ed3c770a00c850d8cffec88a4" -SRC_URI[archive.sha256sum] = "edcec8867f018589125f177407760c642bbbb52fe5122daac5905223d6b3e1c7" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.2.bb new file mode 100644 index 000000000..02e604f0c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.2.bb @@ -0,0 +1,16 @@ +SUMMARY = "Configuration editor for dconf" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = "dconf gtk+3" + +inherit gnomebase vala gettext gsettings bash-completion + +SRC_URI[archive.sha256sum] = "1253dad87e6213fbf313ff9ec9dc4358aa1b10261f28072c1dc0e0997b92f835" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb deleted file mode 100644 index 4b924d89a..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "configuation database system" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -SECTION = "x11/gnome" - -SRC_URI[archive.md5sum] = "1a50c988d9f0206f74a44f7c6d09cead" -SRC_URI[archive.sha256sum] = "9fe6bb22191fc2a036ad86fd8e7d165e9983c687b9fedccf85d46c799301da2d" - -DEPENDS = "dbus glib-2.0 intltool-native" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase bash-completion vala - -# I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl -EXTRA_OEMESON = "-Dman=false" -# no bash-completion for native -EXTRA_OEMESON_append_class-native = " -Dbash_completion=false" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/gio/modules/*.so \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb new file mode 100644 index 000000000..162748d30 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "configuation database system" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" +SECTION = "x11/gnome" + +SRC_URI[archive.sha256sum] = "45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58" + +DEPENDS = "dbus glib-2.0 intltool-native" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase bash-completion vala + +# I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl +EXTRA_OEMESON = "-Dman=false" +# no bash-completion for native +EXTRA_OEMESON_append_class-native = " -Dbash_completion=false" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${libdir}/gio/modules/*.so \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch deleted file mode 100644 index 32ca073f9..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3776fd0b42e473fe51d3678bf26cdaa37e1d8e0d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 8 Apr 2017 13:36:12 -0700 -Subject: [PATCH] Add format attribute to _synctex_malloc - -Helps in avoiding compile errors about formating with clang - -Signed-off-by: Khem Raj ---- - cut-n-paste/synctex/synctex_parser_utils.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cut-n-paste/synctex/synctex_parser_utils.c b/cut-n-paste/synctex/synctex_parser_utils.c -index 08053f0..0519b38 100644 ---- a/cut-n-paste/synctex/synctex_parser_utils.c -+++ b/cut-n-paste/synctex/synctex_parser_utils.c -@@ -136,6 +136,7 @@ int _synctex_log(int level, const char * prompt, const char * reason,va_list arg - return result; - } - -+__attribute__((__format__ (__printf__, 1, 0))) - int _synctex_error(const char * reason,...) { - va_list arg; - int result; --- -2.20.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch deleted file mode 100644 index 94794a5f9..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch +++ /dev/null @@ -1,93 +0,0 @@ -From ef170dda7fbab53682c9bc287dec93fa86130bc9 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 9 Sep 2018 21:49:59 -0700 -Subject: [PATCH] add a formatting attribute check - -Tell Clang that parameter is a printf style format using the -attribute flag - -This helps in avoiding below warnings seen with clang - -unarr.c:106:22: error: format string is not a string literal -[-Werror,-Wformat-nonliteral] -| vfprintf(stderr, msg, args); -| ^~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - cut-n-paste/unarr/common/unarr.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/cut-n-paste/synctex/synctex_parser_utils.c -+++ b/cut-n-paste/synctex/synctex_parser_utils.c -@@ -87,11 +87,11 @@ void _synctex_free(void * ptr) { - # include - #endif - --int _synctex_error(const char * reason, ...) __attribute__((__format__ (__printf__, 1, 2))); --int _synctex_log(int level, const char * prompt, const char * reason, va_list arg) __attribute__((__format__ (__printf__, 3, 0))); -- --int _synctex_log(int level, const char * prompt, const char * reason,va_list arg) { -+static int _synctex_log(int level, const char * prompt, const char * reason, ...) SYNCTEX_PRINTF_FORMAT(3, 0); -+static int _synctex_log(int level, const char * prompt, const char * reason, ...) { -+ va_list arg; - int result; -+ va_start(arg, reason); - # ifdef SYNCTEX_RECENT_WINDOWS - {/* This code is contributed by William Blum. - As it does not work on some older computers, -@@ -133,10 +133,10 @@ int _synctex_log(int level, const char * - result += vfprintf(where, reason, arg); - result += fprintf(where,"\n"); - # endif -+ va_end(arg); - return result; - } - --__attribute__((__format__ (__printf__, 1, 0))) - int _synctex_error(const char * reason,...) { - va_list arg; - int result; -@@ -355,6 +355,7 @@ char * _synctex_merge_strings(const char - size_t len = strlen(temp); - if(UINT_MAX-len -Date: Mon, 16 Nov 2020 12:08:43 -0800 -Subject: [PATCH] linux/thread: Use SYS_futex instead of __NR_futex - -SYS_futex it expected from system C library. -in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) -some newer 32bit architectures e.g. riscv32 are using 64bit time_t from -get go unlike other 32bit architectures in glibc, therefore it wont have -NR_futex defined but just NR_futex_time64 this aliases it to NR_futex so -that SYS_futex is then defined for rv32 - -Upstream-Status: Submitted [https://github.com/videolan/vlc/pull/117] -Signed-off-by: Khem Raj ---- - src/linux/thread.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/linux/thread.c b/src/linux/thread.c -index 20da296..30639a3 100644 ---- a/src/linux/thread.c -+++ b/src/linux/thread.c -@@ -30,6 +30,11 @@ - #include - #include - -+/* 32bit architectures with 64bit time_t do not define __NR_futex syscall */ -+#if !defined(SYS_futex) && defined(SYS_futex_time64) -+#define SYS_futex SYS_futex_time64 -+#endif -+ - #ifndef FUTEX_PRIVATE_FLAG - #define FUTEX_WAKE_PRIVATE FUTEX_WAKE - #define FUTEX_WAIT_PRIVATE FUTEX_WAIT -@@ -50,7 +55,7 @@ unsigned long vlc_thread_id(void) - static int sys_futex(void *addr, int op, unsigned val, - const struct timespec *to, void *addr2, int val3) - { -- return syscall(__NR_futex, addr, op, val, to, addr2, val3); -+ return syscall(SYS_futex, addr, op, val, to, addr2, val3); - } - - static int vlc_futex_wake(void *addr, int nr) --- -2.29.2 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch deleted file mode 100644 index c4465b6af..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c805c6f64da6d8b03355b4796865b75e2f3b500d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 8 Jun 2020 00:50:08 +0200 -Subject: [PATCH] Fix build with Qt >= 5.15 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - modules/gui/qt/components/playlist/views.cpp | 1 + - modules/gui/qt/dialogs/plugins.cpp | 1 + - modules/gui/qt/util/timetooltip.hpp | 1 + - 3 files changed, 3 insertion(+) - -diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp -index 24db9d9..71d8514 100644 ---- a/modules/gui/qt/components/playlist/views.cpp -+++ b/modules/gui/qt/components/playlist/views.cpp -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include - -diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp -index d233382..9ae9a63 100644 ---- a/modules/gui/qt/dialogs/plugins.cpp -+++ b/modules/gui/qt/dialogs/plugins.cpp -@@ -66,6 +66,7 @@ - #include - #include - #include -+#include - - //match the image source (width/height) - #define SCORE_ICON_WIDTH_SCALE 4 -diff --git a/modules/gui/qt/util/timetooltip.hpp b/modules/gui/qt/util/timetooltip.hpp -index 6a1329e..9f50b18 100644 ---- a/modules/gui/qt/util/timetooltip.hpp -+++ b/modules/gui/qt/util/timetooltip.hpp -@@ -25,6 +25,7 @@ - #include "qt.hpp" - - #include -+#include - - class TimeTooltip : public QWidget - { --- -2.26.2 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch new file mode 100644 index 000000000..405490dcf --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch @@ -0,0 +1,46 @@ +From f7957c35654222e5bd1038341612bbb40a88e98b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 16 Nov 2020 12:08:43 -0800 +Subject: [PATCH] linux/thread: Use SYS_futex instead of __NR_futex + +SYS_futex it expected from system C library. +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) +some newer 32bit architectures e.g. riscv32 are using 64bit time_t from +get go unlike other 32bit architectures in glibc, therefore it wont have +NR_futex defined but just NR_futex_time64 this aliases it to NR_futex so +that SYS_futex is then defined for rv32 + +Upstream-Status: Submitted [https://github.com/videolan/vlc/pull/117] +Signed-off-by: Khem Raj +--- + src/linux/thread.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/linux/thread.c b/src/linux/thread.c +index 20da296..30639a3 100644 +--- a/src/linux/thread.c ++++ b/src/linux/thread.c +@@ -30,6 +30,11 @@ + #include + #include + ++/* 32bit architectures with 64bit time_t do not define __NR_futex syscall */ ++#if !defined(SYS_futex) && defined(SYS_futex_time64) ++#define SYS_futex SYS_futex_time64 ++#endif ++ + #ifndef FUTEX_PRIVATE_FLAG + #define FUTEX_WAKE_PRIVATE FUTEX_WAKE + #define FUTEX_WAIT_PRIVATE FUTEX_WAIT +@@ -50,7 +55,7 @@ unsigned long vlc_thread_id(void) + static int sys_futex(void *addr, int op, unsigned val, + const struct timespec *to, void *addr2, int val3) + { +- return syscall(__NR_futex, addr, op, val, to, addr2, val3); ++ return syscall(SYS_futex, addr, op, val, to, addr2, val3); + } + + static int vlc_futex_wake(void *addr, int nr) +-- +2.29.2 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb deleted file mode 100644 index 7902825f2..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb +++ /dev/null @@ -1,136 +0,0 @@ -DESCRIPTION = "Video player and streamer - davinci edition" -HOMEPAGE = "http://www.videolan.org" -SECTION = "multimedia" - -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ - dbus libxml2 gnutls \ - tremor faad2 ffmpeg flac alsa-lib \ - lua-native lua libidn \ - avahi jpeg xz libmodplug mpeg2dec \ - libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ - tiff" - -LDFLAGS_append_riscv64 = " -latomic" -LDFLAGS_append_riscv32 = " -latomic" - -# While this item does not require it, it depends on ffmpeg which does -LICENSE_FLAGS = "commercial" - -SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ - file://0001-make-opencv-configurable.patch \ - file://0002-use-vorbisidec.patch \ - file://0003-fix-luaL-checkint.patch \ - file://0004-Use-packageconfig-to-detect-mmal-support.patch \ - file://0005-Fix-build-with-Qt-5.15.patch \ - file://0001-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch \ -" -SRC_URI[sha256sum] = "189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8" - -inherit autotools features_check gettext pkgconfig mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -export BUILDCC = "${BUILD_CC}" -EXTRA_OECONF = "\ - --enable-run-as-root \ - --enable-xvideo \ - --disable-screen --disable-caca \ - --enable-vlm \ - --enable-freetype \ - --enable-tremor \ - --enable-v4l2 --disable-aa --disable-faad \ - --enable-dbus \ - --without-contrib \ - --without-kde-solid \ - --enable-realrtsp \ - --disable-libtar \ - --enable-avcodec \ - ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ - ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ - ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ -" - -PACKAGECONFIG ?= " \ - live555 dc1394 dv1394 notify fontconfig fluidsynth freetype dvdread png \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - x264 \ -" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} - -PACKAGECONFIG[mmal] = "--enable-omxil --enable-omxil-vout --enable-rpi-omxil --enable-mmal,,userland" -PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" -PACKAGECONFIG[fluidsynth] = ",,fluidsynth" -PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" -PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" -PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" -PACKAGECONFIG[live555] = "--enable-live555 LIVE555_PREFIX=${STAGING_DIR_HOST}${prefix},--disable-live555,live555" -PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" -PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" -PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" -PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" -PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" -PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" -PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" -PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" -PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" -PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" -PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" -PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss" -PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2" -PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" -PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg" -PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394" -PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394" -PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg" -PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo" -PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+3" -PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig" -PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" -PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" -PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" -PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" -PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" -PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" -PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native" - -do_configure_append() { - sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool - - # moc needs support: precreate build paths - for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do - mkdir -p "${B}/modules/gui/qt/$qtpath" - done -} - -# This recipe packages vlc as a library as well, so qt4 dependencies -# can be avoided when only the library is installed. -PACKAGES =+ "libvlc" - -LEAD_SONAME_libvlc = "libvlc.so.5" -FILES_libvlc = "${libdir}/lib*.so.*" - -FILES_${PN} += "\ - ${bindir}/vlc \ - ${libdir}/vlc/vlc/libvlc_vdpau.so \ - ${datadir}/applications \ - ${datadir}/vlc/ \ - ${datadir}/icons \ - ${datadir}/metainfo/vlc.appdata.xml \ -" - -FILES_${PN}-dbg += "\ - ${libdir}/vlc/*/.debug \ - ${libdir}/vlc/plugins/*/.debug \ -" - -FILES_${PN}-staticdev += "\ - ${libdir}/vlc/plugins/*/*.a \ -" - -INSANE_SKIP_${PN} = "dev-so" - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb new file mode 100644 index 000000000..046c059fb --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb @@ -0,0 +1,135 @@ +DESCRIPTION = "Video player and streamer - davinci edition" +HOMEPAGE = "http://www.videolan.org" +SECTION = "multimedia" + +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ + dbus libxml2 gnutls \ + tremor faad2 ffmpeg flac alsa-lib \ + lua-native lua libidn \ + avahi jpeg xz libmodplug mpeg2dec \ + libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ + tiff" + +LDFLAGS_append_riscv64 = " -latomic" +LDFLAGS_append_riscv32 = " -latomic" + +# While this item does not require it, it depends on ffmpeg which does +LICENSE_FLAGS = "commercial" + +SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ + file://0001-make-opencv-configurable.patch \ + file://0002-use-vorbisidec.patch \ + file://0003-fix-luaL-checkint.patch \ + file://0004-Use-packageconfig-to-detect-mmal-support.patch \ + file://0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch \ +" +SRC_URI[sha256sum] = "eff458f38a92126094f44f2263c2bf2c7cdef271b48192d0fe7b1726388cf879" + +inherit autotools features_check gettext pkgconfig mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +export BUILDCC = "${BUILD_CC}" +EXTRA_OECONF = "\ + --enable-run-as-root \ + --enable-xvideo \ + --disable-screen --disable-caca \ + --enable-vlm \ + --enable-freetype \ + --enable-tremor \ + --enable-v4l2 --disable-aa --disable-faad \ + --enable-dbus \ + --without-contrib \ + --without-kde-solid \ + --enable-realrtsp \ + --disable-libtar \ + --enable-avcodec \ + ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ + ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ + ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ +" + +PACKAGECONFIG ?= " \ + live555 dc1394 dv1394 notify fontconfig fluidsynth freetype dvdread png \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + x264 \ +" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} + +PACKAGECONFIG[mmal] = "--enable-omxil --enable-omxil-vout --enable-rpi-omxil --enable-mmal,,userland" +PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" +PACKAGECONFIG[fluidsynth] = ",,fluidsynth" +PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" +PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[live555] = "--enable-live555 LIVE555_PREFIX=${STAGING_DIR_HOST}${prefix},--disable-live555,live555" +PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" +PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" +PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" +PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" +PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" +PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" +PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" +PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" +PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" +PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" +PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" +PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" +PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss" +PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg" +PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394" +PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394" +PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg" +PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo" +PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+3" +PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig" +PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" +PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" +PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" +PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" +PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" +PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native" + +do_configure_append() { + sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool + + # moc needs support: precreate build paths + for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do + mkdir -p "${B}/modules/gui/qt/$qtpath" + done +} + +# This recipe packages vlc as a library as well, so qt4 dependencies +# can be avoided when only the library is installed. +PACKAGES =+ "libvlc" + +LEAD_SONAME_libvlc = "libvlc.so.5" +FILES_libvlc = "${libdir}/lib*.so.*" + +FILES_${PN} += "\ + ${bindir}/vlc \ + ${libdir}/vlc/vlc/libvlc_vdpau.so \ + ${datadir}/applications \ + ${datadir}/vlc/ \ + ${datadir}/icons \ + ${datadir}/metainfo/vlc.appdata.xml \ +" + +FILES_${PN}-dbg += "\ + ${libdir}/vlc/*/.debug \ + ${libdir}/vlc/plugins/*/.debug \ +" + +FILES_${PN}-staticdev += "\ + ${libdir}/vlc/plugins/*/*.a \ +" + +INSANE_SKIP_${PN} = "dev-so" + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch index 00115cfca..55d1ac94c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch @@ -20,7 +20,7 @@ https://github.com/blueman-project/blueman/pull/1121 Signed-off-by: Kai Kang --- - blueman/Functions.py | 12 +++++++++++- + blueman/Functions.py | 10 ++++++++++ blueman/plugins/applet/PowerManager.py | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) @@ -28,24 +28,15 @@ diff --git a/blueman/Functions.py b/blueman/Functions.py index 3b76271..c5eeb27 100644 --- a/blueman/Functions.py +++ b/blueman/Functions.py -@@ -17,7 +17,7 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see . - # --from time import sleep -+from time import sleep, time - import re - import os - import signal @@ -86,6 +86,16 @@ def check_bluetooth_status(message, exitfunc): return applet.SetBluetoothStatus('(b)', True) + -+ timeout = time() + 10 ++ timeout = time.time() + 10 + while applet.GetRequestStatus(): -+ sleep(0.1) -+ if time() > timeout: ++ time.sleep(0.1) ++ if time.time() > timeout: + # timeout 5s has been set in applet/PowerManager.py + # so it should NOT reach timeout here + logging.warning('Should NOT reach timeout.') diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.1.bb deleted file mode 100644 index eca926ee4..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.1.bb +++ /dev/null @@ -1,91 +0,0 @@ -SUMMARY = "Dynamic firewall daemon with a D-Bus interface" -HOMEPAGE = "https://firewalld.org/" -BUGTRACKER = "https://github.com/firewalld/firewalld/issues" -UPSTREAM_CHECK_URI = "https://github.com/firewalld/firewalld/releases" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ - file://firewalld.init \ -" -SRC_URI[sha256sum] = "7e3db6ed84919dd10add39cc7a28d97b5a9e27a53aeb73abf8af01ef082b74f9" - -# glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 -DEPENDS = "intltool-native glib-2.0-native" - -inherit gettext autotools bash-completion python3native gsettings systemd update-rc.d - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" -PACKAGECONFIG[docs] = "--with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog,--disable-docs,libxslt-native docbook-xsl-stylesheets-native" - -PACKAGES += "${PN}-zsh-completion" - -# iptables, ip6tables, ebtables, and ipset *should* be unnecessary -# when the nftables backend is available, because nftables supersedes all of them. -# However we still need iptables and ip6tables to be available otherwise any -# application relying on "direct passthrough" rules (such as docker) will break. -# /etc/sysconfig/firewalld is a Red Hat-ism, only referenced by -# the Red Hat-specific init script which we aren't using, so we disable that. -EXTRA_OECONF = "\ - --without-ipset \ - --with-iptables=${sbindir}/iptables \ - --with-iptables-restore=${sbindir}/iptables-restore \ - --with-ip6tables=${sbindir}/ip6tables \ - --with-ip6tables-restore=${sbindir}/ip6tables-restore \ - --without-ebtables \ - --without-ebtables-restore \ - --disable-sysconfig \ -" - -INITSCRIPT_NAME = "firewalld" -SYSTEMD_SERVICE_${PN} = "firewalld.service" - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - : - else - # firewalld ships an init script but it contains Red Hat-isms, replace it with our own - rm -rf ${D}${sysconfdir}/rc.d/ - install -d ${D}${sysconfdir}/init.d - install -m0755 ${WORKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld - fi - - # We ran ./configure with PYTHON pointed at the binary inside $STAGING_BINDIR_NATIVE - # so now we need to fix up any references to point at the proper path in the image. - # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools. - if [ ${PN} != "${BPN}-native" ]; then - sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \ - ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml - fi - sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ - ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml - - # This file contains Red Hat-isms. Modules get loaded without it. - rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf -} - -FILES_${PN} += "\ - ${PYTHON_SITEPACKAGES_DIR}/firewall \ - ${nonarch_libdir}/firewalld \ - ${datadir}/dbus-1 \ - ${datadir}/polkit-1 \ - ${datadir}/metainfo \ -" -FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" - -RDEPENDS_${PN} = "\ - nftables \ - iptables \ - python3-core \ - python3-io \ - python3-fcntl \ - python3-shell \ - python3-syslog \ - python3-xml \ - python3-dbus \ - python3-slip-dbus \ - python3-decorator \ - python3-pygobject \ - nftables-python \ -" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.3.bb new file mode 100644 index 000000000..9aad510b4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.3.bb @@ -0,0 +1,92 @@ +SUMMARY = "Dynamic firewall daemon with a D-Bus interface" +HOMEPAGE = "https://firewalld.org/" +BUGTRACKER = "https://github.com/firewalld/firewalld/issues" +UPSTREAM_CHECK_URI = "https://github.com/firewalld/firewalld/releases" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ + file://firewalld.init \ +" +SRC_URI[sha256sum] = "5998894db976d77996ca0a6b700a2f4125b9f283465fb255da9bddfb1640cb27" + +# glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 +DEPENDS = "intltool-native glib-2.0-native nftables" + +inherit gettext autotools bash-completion python3native gsettings systemd update-rc.d + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" +PACKAGECONFIG[docs] = "--with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog,--disable-docs,libxslt-native docbook-xsl-stylesheets-native" + +PACKAGES += "${PN}-zsh-completion" + +# iptables, ip6tables, ebtables, and ipset *should* be unnecessary +# when the nftables backend is available, because nftables supersedes all of them. +# However we still need iptables and ip6tables to be available otherwise any +# application relying on "direct passthrough" rules (such as docker) will break. +# /etc/sysconfig/firewalld is a Red Hat-ism, only referenced by +# the Red Hat-specific init script which we aren't using, so we disable that. +EXTRA_OECONF = "\ + --without-ipset \ + --with-iptables=${sbindir}/iptables \ + --with-iptables-restore=${sbindir}/iptables-restore \ + --with-ip6tables=${sbindir}/ip6tables \ + --with-ip6tables-restore=${sbindir}/ip6tables-restore \ + --without-ebtables \ + --without-ebtables-restore \ + --disable-sysconfig \ +" + +INITSCRIPT_NAME = "firewalld" +SYSTEMD_SERVICE_${PN} = "firewalld.service" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + : + else + # firewalld ships an init script but it contains Red Hat-isms, replace it with our own + rm -rf ${D}${sysconfdir}/rc.d/ + install -d ${D}${sysconfdir}/init.d + install -m0755 ${WORKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld + fi + + # We ran ./configure with PYTHON pointed at the binary inside $STAGING_BINDIR_NATIVE + # so now we need to fix up any references to point at the proper path in the image. + # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools. + if [ ${PN} != "${BPN}-native" ]; then + sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \ + ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + fi + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ + ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + + # This file contains Red Hat-isms. Modules get loaded without it. + rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf +} + +FILES_${PN} += "\ + ${PYTHON_SITEPACKAGES_DIR}/firewall \ + ${nonarch_libdir}/firewalld \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ + ${datadir}/metainfo \ +" +FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +RDEPENDS_${PN} = "\ + nftables-python \ + iptables \ + python3-core \ + python3-io \ + python3-fcntl \ + python3-shell \ + python3-syslog \ + python3-xml \ + python3-dbus \ + python3-slip-dbus \ + python3-decorator \ + python3-pygobject \ + python3-json \ + python3-ctypes \ +" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch deleted file mode 100644 index 11741897f..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6388b16b93ba805f8877a94f47509f701250812f Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 6 Jul 2020 19:33:54 -0700 -Subject: [PATCH] install firewalld to var-libdir rather than hardcod lib - -The oe install firewalld (split packages) to ${libdir}/firewalld/zones - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 358b01a..5745339 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4778,7 +4778,7 @@ data/server.conf: $(srcdir)/data/server.conf.in - $(AM_V_GEN) $(data_edit) $< >$@ - - if WITH_FIREWALLD_ZONE --firewalldzonedir = $(prefix)/lib/firewalld/zones -+firewalldzonedir = $(libdir)/firewalld/zones - firewalldzone_DATA = data/nm-shared.xml - endif - --- -2.21.0 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch index 446637b27..ecd13504d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch @@ -1,6 +1,6 @@ From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 22 Mar 2018 11:08:30 +0100 +Date: Sat, 16 Jan 2021 14:27:38 +0100 Subject: [PATCH] Do not create settings settings/property documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -11,38 +11,44 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -It was tried to get this work but gi / GirRepository could not be found by -python. Anyway it is not necessary for us to have the settings/property docs. +It was tried to get this work by adding python3-pygobject-native to DEPENDS but +compile could not find (configure passed) python module gi. +Anyway it is not necessary for us to have the settings/property docs. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller --- - Makefile.am | 11 ----------- + Makefile.am | 13 ------------- configure.ac | 5 ----- - 2 files changed, 16 deletions(-) + 2 files changed, 18 deletions(-) diff --git a/Makefile.am b/Makefile.am -index d5cbcf5..2a1819a 100644 +index 110957a..b4cfbcc 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir +@@ -1587,14 +1587,10 @@ libnm/libnm.typelib: libnm/libnm.gir INTROSPECTION_GIRS += libnm/NM-1.0.gir libnm_noinst_data = \ -- libnm/nm-property-docs.xml \ - libnm/nm-settings-docs-overrides.xml \ -- libnm/nm-settings-docs.xml \ - libnm/nm-settings-keyfile-docs.xml \ - libnm/nm-settings-ifcfg-rh-docs.xml +- clients/cli/generate-docs-nm-settings-nmcli.xml \ + libnm/nm-property-infos-dbus.xml \ + libnm/nm-property-infos-ifcfg-rh.xml \ + libnm/nm-property-infos-keyfile.xml \ + libnm/nm-property-infos-nmcli.xml \ +- libnm/nm-settings-docs-gir.xml \ +- man/nm-settings-docs-dbus.xml \ +- man/nm-settings-docs-nmcli.xml \ + $(NULL) -@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) + noinst_DATA += $(libnm_noinst_data) +@@ -4448,18 +4444,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp clients_common_settings_doc_h = clients/common/settings-docs.h -if HAVE_INTROSPECTION --$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp +-$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-settings-docs-gir.xml clients/common/.dirstamp - $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) -DISTCLEANFILES += $(clients_common_settings_doc_h) -check-local-settings-docs: $(clients_common_settings_doc_h) @@ -57,18 +63,21 @@ index d5cbcf5..2a1819a 100644 $(clients_common_settings_doc_h) \ $(clients_common_settings_doc_h).in diff --git a/configure.ac b/configure.ac -index ad4b0fc..0092092 100644 +index 704b1c1..18bba87 100644 --- a/configure.ac +++ b/configure.ac -@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0) +@@ -1228,11 +1228,6 @@ GTK_DOC_CHECK(1.0) # check if we can build setting property documentation build_docs=no if test -n "$INTROSPECTION_MAKEFILE"; then - # If g-i is installed we know we have python, but we might not have pygobject -- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then +- if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then - AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) - fi - AC_PATH_PROG(PERL, perl) if test -z "$PERL"; then AC_MSG_ERROR([--enable-introspection requires perl]) +-- +2.26.2 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch new file mode 100644 index 000000000..11741897f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch @@ -0,0 +1,30 @@ +From 6388b16b93ba805f8877a94f47509f701250812f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 6 Jul 2020 19:33:54 -0700 +Subject: [PATCH] install firewalld to var-libdir rather than hardcod lib + +The oe install firewalld (split packages) to ${libdir}/firewalld/zones + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 358b01a..5745339 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4778,7 +4778,7 @@ data/server.conf: $(srcdir)/data/server.conf.in + $(AM_V_GEN) $(data_edit) $< >$@ + + if WITH_FIREWALLD_ZONE +-firewalldzonedir = $(prefix)/lib/firewalld/zones ++firewalldzonedir = $(libdir)/firewalld/zones + firewalldzone_DATA = data/nm-shared.xml + endif + +-- +2.21.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch new file mode 100644 index 000000000..2df449f2e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch @@ -0,0 +1,27 @@ +reallocarray() is coming from stdlib.h which maybe indirectly included +by malloc.h but not on all libc implementations + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/meson.build ++++ b/meson.build +@@ -114,7 +114,7 @@ config_h.set10('HAVE_GETRANDOM', use_sys + #include ''')) + config_h.set('HAVE_SECURE_GETENV', cc.has_function('secure_getenv')) + config_h.set('HAVE___SECURE_GETENV', cc.has_function('__secure_getenv')) +-config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include ')) ++config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include ')) + config_h.set10('HAVE_DECL_EXPLICIT_BZERO', cc.has_function('explicit_bzero', prefix: '#include ')) + config_h.set10('HAVE_DECL_MEMFD_CREATE', cc.has_function('memfd_create', prefix: '#include ')) + +--- a/configure.ac ++++ b/configure.ac +@@ -82,7 +82,7 @@ AC_CHECK_DECLS([ + AC_CHECK_DECLS([ + reallocarray], + [], [], [[ +-#include ++#include + ]]) + + AC_CHECK_DECLS([ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch deleted file mode 100644 index 0a8de5410..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch +++ /dev/null @@ -1,27 +0,0 @@ -reallocarray() is coming from stdlib.h which maybe indirectly included -by malloc.h but not on all libc implementations - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- a/meson.build -+++ b/meson.build -@@ -114,7 +114,7 @@ config_h.set10('HAVE_GETRANDOM', use_sys - # FIXME secure_getenv check is not useful? - config_h.set('HAVE_SECURE_GETENV', cc.has_function('secure_getenv')) - config_h.set('HAVE___SECURE_GETENV', cc.has_function('__secure_getenv')) --config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include ')) -+config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include ')) - config_h.set10('HAVE_DECL_EXPLICIT_BZERO', cc.has_function('explicit_bzero', prefix: '#include ')) - config_h.set10('HAVE_DECL_MEMFD_CREATE', cc.has_function('memfd_create', prefix: '#include ')) - ---- a/configure.ac -+++ b/configure.ac -@@ -82,7 +82,7 @@ AC_CHECK_DECLS([ - AC_CHECK_DECLS([ - reallocarray], - [], [], [[ --#include -+#include - ]]) - - AC_CHECK_DECLS([ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch index c23fc308f..7807fc77c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch @@ -1,4 +1,4 @@ -From e7ed91c48e1a07527a860637a7865eb67ce34cf3 Mon Sep 17 00:00:00 2001 +From 9597122867c22e949ef3b69c779e0facebce6eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 2 Apr 2019 01:34:35 +0200 Subject: [PATCH] Fix build with musl - systemd specific @@ -6,6 +6,11 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + Networkmanager imported some code from systemd. This requires some adjustments for musl. @@ -23,7 +28,7 @@ Signed-off-by: Andreas Müller 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c -index 91d687c..8388304 100644 +index 1ea3e7f..1204393 100644 --- a/shared/systemd/src/basic/in-addr-util.c +++ b/shared/systemd/src/basic/in-addr-util.c @@ -15,6 +15,7 @@ @@ -32,10 +37,10 @@ index 91d687c..8388304 100644 #include "parse-util.h" +#include "string-util.h" #include "random-util.h" + #include "string-util.h" #include "strxcpyx.h" - #include "util.h" diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c -index 1456167..42f51a0 100644 +index 03ca04e..be8bca8 100644 --- a/shared/systemd/src/basic/process-util.c +++ b/shared/systemd/src/basic/process-util.c @@ -17,6 +17,9 @@ @@ -48,7 +53,7 @@ index 1456167..42f51a0 100644 #if 0 /* NM_IGNORED */ #if HAVE_VALGRIND_VALGRIND_H #include -@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) { +@@ -1152,11 +1155,13 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } @@ -62,7 +67,7 @@ index 1456167..42f51a0 100644 pid_t getpid_cached(void) { static bool installed = false; -@@ -1156,7 +1161,11 @@ pid_t getpid_cached(void) { +@@ -1185,7 +1190,11 @@ pid_t getpid_cached(void) { * only half-documented (glibc doesn't document it but LSB does — though only superficially) * we'll check for errors only in the most generic fashion possible. */ @@ -75,7 +80,7 @@ index 1456167..42f51a0 100644 cached_pid = CACHED_PID_UNSET; return new_pid; diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h -index a0886e0..da47d14 100644 +index 1ece911..290e94c 100644 --- a/shared/systemd/src/basic/socket-util.h +++ b/shared/systemd/src/basic/socket-util.h @@ -14,6 +14,12 @@ @@ -92,7 +97,7 @@ index a0886e0..da47d14 100644 #include "missing_socket.h" #include "sparse-endian.h" diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h -index e029f86..1e8b6e1 100644 +index a8dc3bb..ff0aa88 100644 --- a/shared/systemd/src/basic/sort-util.h +++ b/shared/systemd/src/basic/sort-util.h @@ -5,15 +5,10 @@ @@ -115,9 +120,9 @@ index e029f86..1e8b6e1 100644 /** * Normal bsearch requires base to be nonnull. Here were require -@@ -54,17 +49,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn +@@ -54,17 +49,3 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, __compar_f int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \ - qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ + _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ }) - -static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) { @@ -148,7 +153,7 @@ index c3b9448..e80a938 100644 #include #include diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h -index 04cc82b..2cf589a 100644 +index cefbda3..71e4dec 100644 --- a/shared/systemd/src/basic/string-util.h +++ b/shared/systemd/src/basic/string-util.h @@ -26,6 +26,11 @@ @@ -161,5 +166,5 @@ index 04cc82b..2cf589a 100644 +#endif + int strcmp_ptr(const char *a, const char *b) _pure_; + int strcasecmp_ptr(const char *a, const char *b) _pure_; - static inline bool streq_ptr(const char *a, const char *b) { diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch index 196a3358d..0f43c0c68 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch @@ -1,4 +1,4 @@ -From 877fbb4e848629ff57371b5bdb0d56369abe9d81 Mon Sep 17 00:00:00 2001 +From bacc14089c80ec757025789ff054a05e1f9c088d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 8 Apr 2019 23:10:43 +0200 Subject: [PATCH] Fix build with musl @@ -6,6 +6,11 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + The build issues caused by definition conflicts musl vs linux-libc headers (error: redefinition of ...) can be reduced to two headers: @@ -42,7 +47,7 @@ Signed-off-by: Andreas Müller 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c -index 4ab5932..915248c 100644 +index 692a467..cf9b32e 100644 --- a/clients/tui/nmt-device-entry.c +++ b/clients/tui/nmt-device-entry.c @@ -26,7 +26,6 @@ @@ -54,11 +59,11 @@ index 4ab5932..915248c 100644 #include "nmtui.h" diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 5418a1e..f492da6 100644 +index 9589c51..b82c5cf 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -10,6 +10,10 @@ - #error "Only can be included directly." + #error "Only can be included directly." #endif +/* include as early as possible for musl */ @@ -69,10 +74,10 @@ index 5418a1e..f492da6 100644 #include diff --git a/shared/nm-default.h b/shared/nm-default.h -index ace6ede..25357da 100644 +index b322f1d..c287dbe 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h -@@ -182,6 +182,9 @@ +@@ -178,6 +178,9 @@ #endif #include @@ -83,7 +88,7 @@ index ace6ede..25357da 100644 /*****************************************************************************/ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index 3bbc975..4e8a3f6 100644 +index 0be05f2..04061f9 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -9,6 +9,7 @@ @@ -100,10 +105,10 @@ index 3bbc975..4e8a3f6 100644 #include -#include #include - #include + #include "nm-std-aux/unaligned.h" diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c -index 7abe4df..9f53147 100644 +index b377c85..87af59a 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -14,7 +14,6 @@ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch deleted file mode 100644 index 62252826e..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch +++ /dev/null @@ -1,61 +0,0 @@ -From aff5cded8847f3eee59f5cec22afb8630d401a85 Mon Sep 17 00:00:00 2001 -From: Adrian Freihofer -Date: Sat, 7 Mar 2020 14:22:36 +0100 -Subject: [PATCH 3/4] Fix build with musl for n-dhcp4 - ---- - shared/n-dhcp4/src/n-dhcp4-c-probe.c | 8 ++++++++ - shared/n-dhcp4/src/n-dhcp4-private.h | 4 ++++ - 2 files changed, 12 insertions(+) - -diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c -index e4477a7..75713c8 100644 ---- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c -+++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c -@@ -360,8 +360,12 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe - seed16v[1] = (u64 >> 16) ^ (u64 >> 0); - seed16v[2] = (u64 >> 32) ^ (u64 >> 16); - -+#ifdef __GLIBC__ - r = seed48_r(seed16v, &config->entropy); - c_assert(!r); -+#else -+ memcpy(config->entropy, seed16v, sizeof seed16v); -+#endif - } - - /** -@@ -375,10 +379,14 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe - */ - uint32_t n_dhcp4_client_probe_config_get_random(NDhcp4ClientProbeConfig *config) { - long int result; -+#ifdef __GLIBC__ - int r; - - r = mrand48_r(&config->entropy, &result); - c_assert(!r); -+#else -+ result = jrand48(config->entropy); -+#endif - - return result; - }; -diff --git a/shared/n-dhcp4/src/n-dhcp4-private.h b/shared/n-dhcp4/src/n-dhcp4-private.h -index 436ee80..ffcb4b2 100644 ---- a/shared/n-dhcp4/src/n-dhcp4-private.h -+++ b/shared/n-dhcp4/src/n-dhcp4-private.h -@@ -267,7 +267,11 @@ struct NDhcp4ClientProbeConfig { - bool inform_only; - bool init_reboot; - struct in_addr requested_ip; -+#ifdef __GLIBC__ - struct drand48_data entropy; /* entropy pool */ -+#else -+ unsigned short entropy[3]; /* entropy pool */ -+#endif - uint64_t ms_start_delay; /* max ms to wait before starting probe */ - NDhcp4ClientProbeOption *options[UINT8_MAX + 1]; - int8_t request_parameters[UINT8_MAX + 1]; --- -2.24.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch new file mode 100644 index 000000000..5735d51a8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch @@ -0,0 +1,26 @@ +From ed748a28076eada9f38e3f4a476f28d7a10ba84b Mon Sep 17 00:00:00 2001 +From: Adrian Freihofer +Date: Sat, 7 Mar 2020 14:24:01 +0100 +Subject: [PATCH] Fix build with musl - systemd specific + +--- + src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c +index ec7f1be..31bcd4d 100644 +--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c +@@ -7,7 +7,9 @@ + + #include + #include ++#ifdef __GLIBC__ /* musl supplies full set of userspace headers */ + #include ++#endif + #include + + #include "sd-dhcp6-client.h" +-- +2.24.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch deleted file mode 100644 index 55aa4d265..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 80c7d3391510993cba1a7499bf33a5b2b115280d Mon Sep 17 00:00:00 2001 -From: Adrian Freihofer -Date: Sat, 7 Mar 2020 14:24:01 +0100 -Subject: [PATCH 4/4] Fix build with musl - systemd specific - ---- - src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c -index e1150f9..2c63bac 100644 ---- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c -+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c -@@ -7,7 +7,9 @@ - - #include - #include -+#ifdef __GLIBC__ /* musl supplies full set of userspace headers */ - #include -+#endif - #include - - #include "sd-dhcp6-client.h" --- -2.24.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb deleted file mode 100644 index aa8ab899b..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb +++ /dev/null @@ -1,180 +0,0 @@ -SUMMARY = "NetworkManager" -HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" -SECTION = "net/misc" - -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = " \ - intltool-native \ - libxslt-native \ - libnl \ - udev \ - util-linux \ - libndp \ - libnewt \ - jansson \ - curl \ -" - -inherit gnomebase gettext update-rc.d systemd bash-completion vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even - -SRC_URI = " \ - ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://${BPN}.initd \ - file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ - file://0002-Do-not-create-settings-settings-property-documentati.patch \ - file://0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ - file://fix_reallocarray_check.patch \ -" -SRC_URI_append_libc-musl = " \ - file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ - file://musl/0002-Fix-build-with-musl.patch \ - file://musl/0003-Fix-build-with-musl-for-n-dhcp4.patch \ - file://musl/0004-Fix-build-with-musl-systemd-specific.patch \ -" -SRC_URI[sha256sum] = "c6893971936a1ce252ba4fdff830c972d2ae93fec6751b57dcfd3ad9f0c949dd" - -S = "${WORKDIR}/NetworkManager-${PV}" - -EXTRA_OECONF = " \ - --disable-ifcfg-rh \ - --disable-more-warnings \ - --with-iptables=${sbindir}/iptables \ - --with-tests \ - --with-nmtui=yes \ - --with-udev-dir=${nonarch_base_libdir}/udev \ - --with-dhclient=no \ - --with-dhcpcd=no \ - --with-dhcpcanon=no \ - --with-netconfig=no \ -" - -# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template -# avoids: -# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? -CFLAGS_append_libc-musl = " \ - -DRTLD_DEEPBIND=0 \ -" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" -} - -PACKAGECONFIG ??= "nss ifupdown dnsmasq \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ -" -PACKAGECONFIG[systemd] = " \ - --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ - --without-systemdsystemunitdir, \ -" -PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" -PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" -# consolekit is not picked by shlibs, so add it to RDEPENDS too -PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" -PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" -PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" -PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" -PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" -PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" -PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" -PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant" -PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" -PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" -PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" - -PACKAGES =+ " \ - ${PN}-nmcli ${PN}-nmcli-doc \ - ${PN}-nmtui ${PN}-nmtui-doc \ - ${PN}-adsl ${PN}-cloud-setup \ -" - -SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" - -FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" - -FILES_${PN}-cloud-setup = " \ - ${libexecdir}/nm-cloud-setup \ - ${systemd_system_unitdir}/nm-cloud-setup.service \ - ${systemd_system_unitdir}/nm-cloud-setup.timer \ - ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ - ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ -" -ALLOW_EMPTY_${PN}-cloud-setup = "1" -SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" - -FILES_${PN} += " \ - ${libexecdir} \ - ${libdir}/NetworkManager/${PV}/*.so \ - ${libdir}/NetworkManager \ - ${libdir}/firewalld/zones \ - ${nonarch_libdir}/NetworkManager/conf.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ - ${nonarch_libdir}/NetworkManager/VPN \ - ${nonarch_libdir}/NetworkManager/system-connections \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${nonarch_base_libdir}/udev/* \ - ${systemd_system_unitdir} \ - ${libdir}/pppd \ -" - -RRECOMMENDS_${PN} += "iptables \ - ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ -" -RCONFLICTS_${PN} = "connman" - -FILES_${PN}-dev += " \ - ${datadir}/NetworkManager/gdb-cmd \ - ${libdir}/pppd/*/*.la \ - ${libdir}/NetworkManager/*.la \ - ${libdir}/NetworkManager/${PV}/*.la \ -" - -FILES_${PN}-nmcli = " \ - ${bindir}/nmcli \ -" - -FILES_${PN}-nmcli-doc = " \ - ${mandir}/man1/nmcli* \ -" - -FILES_${PN}-nmtui = " \ - ${bindir}/nmtui \ - ${bindir}/nmtui-edit \ - ${bindir}/nmtui-connect \ - ${bindir}/nmtui-hostname \ -" - -FILES_${PN}-nmtui-doc = " \ - ${mandir}/man1/nmtui* \ -" - -INITSCRIPT_NAME = "network-manager" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" -ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}" -ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" - -do_install_append() { - install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager - - rm -rf ${D}/run ${D}${localstatedir}/run - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - # For read-only filesystem, do not create links during bootup - ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager - - # systemd v210 and newer do not need this rule file - rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules - fi -} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb new file mode 100644 index 000000000..dcb23d05c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb @@ -0,0 +1,183 @@ +SUMMARY = "NetworkManager" +HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ +" + +DEPENDS = " \ + intltool-native \ + libxslt-native \ + libnl \ + udev \ + util-linux \ + libndp \ + libnewt \ + jansson \ + curl \ +" + +inherit gnomebase gettext update-rc.d systemd vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even + +SRC_URI = " \ + ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://${BPN}.initd \ + file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ + file://0002-Do-not-create-settings-settings-property-documentati.patch \ + file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ + file://0004-fix_reallocarray_check.patch \ +" +SRC_URI_append_libc-musl = " \ + file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ + file://musl/0002-Fix-build-with-musl.patch \ + file://musl/0003-Fix-build-with-musl-systemd-specific.patch \ +" +SRC_URI[sha256sum] = "3e170e9045e20598d2630e40c5789b2e2c46b942bfe5cb220f36202299253062" + +S = "${WORKDIR}/NetworkManager-${PV}" + +EXTRA_OECONF = " \ + --disable-ifcfg-rh \ + --disable-more-warnings \ + --with-iptables=${sbindir}/iptables \ + --with-tests \ + --with-nmtui=yes \ + --with-udev-dir=${nonarch_base_libdir}/udev \ + --with-dhclient=no \ + --with-dhcpcd=no \ + --with-dhcpcanon=no \ + --with-netconfig=no \ +" + +# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template +# avoids: +# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? +CFLAGS_append_libc-musl = " \ + -DRTLD_DEEPBIND=0 \ +" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" +} + +PACKAGECONFIG ??= "nss ifupdown dnsmasq nmcli \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ +" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'nmcli', 'bash-completion', '', d)} + +PACKAGECONFIG[systemd] = " \ + --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ + --without-systemdsystemunitdir, \ +" +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" +PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" +# consolekit is not picked by shlibs, so add it to RDEPENDS too +PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" +PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" +PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" +PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" +PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" +PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" +PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" +PACKAGECONFIG[wifi] = "--with-wext=yes --enable-wifi=yes,--with-wext=no --enable-wifi=no,,wpa-supplicant" +PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" +PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" +PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" +PACKAGECONFIG[nmcli] = "--with-nmcli=yes,--with-nmcli=no,readline" + +PACKAGES =+ " \ + ${PN}-nmcli ${PN}-nmcli-doc \ + ${PN}-nmtui ${PN}-nmtui-doc \ + ${PN}-adsl ${PN}-cloud-setup \ +" + +SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" + +FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" + +FILES_${PN}-cloud-setup = " \ + ${libexecdir}/nm-cloud-setup \ + ${systemd_system_unitdir}/nm-cloud-setup.service \ + ${systemd_system_unitdir}/nm-cloud-setup.timer \ + ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ + ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ +" +ALLOW_EMPTY_${PN}-cloud-setup = "1" +SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" + +FILES_${PN} += " \ + ${libexecdir} \ + ${libdir}/NetworkManager/${PV}/*.so \ + ${libdir}/NetworkManager \ + ${libdir}/firewalld/zones \ + ${nonarch_libdir}/NetworkManager/conf.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ + ${nonarch_libdir}/NetworkManager/VPN \ + ${nonarch_libdir}/NetworkManager/system-connections \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${nonarch_base_libdir}/udev/* \ + ${systemd_system_unitdir} \ + ${libdir}/pppd \ +" + +RRECOMMENDS_${PN} += "iptables \ + ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ +" +RCONFLICTS_${PN} = "connman" + +FILES_${PN}-dev += " \ + ${datadir}/NetworkManager/gdb-cmd \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ + ${libdir}/NetworkManager/${PV}/*.la \ +" + +FILES_${PN}-nmcli = " \ + ${bindir}/nmcli \ +" + +FILES_${PN}-nmcli-doc = " \ + ${mandir}/man1/nmcli* \ +" + +FILES_${PN}-nmtui = " \ + ${bindir}/nmtui \ + ${bindir}/nmtui-edit \ + ${bindir}/nmtui-connect \ + ${bindir}/nmtui-hostname \ +" + +FILES_${PN}-nmtui-doc = " \ + ${mandir}/man1/nmtui* \ +" + +INITSCRIPT_NAME = "network-manager" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" +ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}" +ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" + +do_install_append() { + install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager + + rm -rf ${D}/run ${D}${localstatedir}/run + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + # For read-only filesystem, do not create links during bootup + ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager + + # systemd v210 and newer do not need this rule file + rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules + fi +} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.1.bb deleted file mode 100644 index 91a6edd24..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Easy communication with NetworkManager from Python" -HOMEPAGE = "https://github.com/seveas/python-networkmanager" -LICENSE = "Zlib" - -LIC_FILES_CHKSUM = "file://COPYING;md5=8d8bac174bf8422b151200e6cc78ebe4" - -SRC_URI[md5sum] = "f638d854a3639fb37c0e06d1092a771e" -SRC_URI[sha256sum] = "aef1e34d98d7bec7cc368e0ca0f2e97493f9b5ebe6d7103f8f6460cfca3dc6fc" - -PYPI_PACKAGE = "python-networkmanager" -inherit pypi setuptools3 - -RDEPENDS_${PN} = "networkmanager python3-dbus python3-six" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb new file mode 100644 index 000000000..d447231fc --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "Easy communication with NetworkManager from Python" +HOMEPAGE = "https://github.com/seveas/python-networkmanager" +LICENSE = "Zlib" + +LIC_FILES_CHKSUM = "file://COPYING;md5=9f8a5b5844f027357ab19ef3e3c6a956" + +SRC_URI[md5sum] = "7e05d3ca40a4fa50222ba93cda3d0d02" +SRC_URI[sha256sum] = "de6eb921d94aba7549f428ed2b3aa482a5d543ecb6965cbaa0fbb555ab31b9d5" + +PYPI_PACKAGE = "python-networkmanager" +inherit pypi setuptools3 + +RDEPENDS_${PN} = "networkmanager python3-dbus python3-six" diff --git a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index 1a34c4b34..231d8d4da 100644 --- a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -112,6 +112,7 @@ RDEPENDS_packagegroup-meta-networking-filter = "\ libnftnl \ conntrack-tools \ ebtables \ + ipset \ libnetfilter-acct \ libnetfilter-conntrack \ libnetfilter-cthelper \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb b/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb deleted file mode 100644 index 004433b6b..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "simple dynamic multicast routing daemon that only uses IGMP signalling" -HOMEPAGE = "http://sourceforge.net/projects/igmpproxy/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=432040ff3a55670c1dec0c32b209ad69" - -SRC_URI = "https://github.com/pali/igmpproxy/releases/download/${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "3a9c2cb42c1f5ee0cb769a4884545641" -SRC_URI[sha256sum] = "d351e623037390f575c1203d9cbb7ba33a8bdef85a3c5e1d2901c5a2a38449a1" - -UPSTREAM_CHECK_URI = "https://github.com/pali/${BPN}/releases" - -inherit autotools pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb b/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb new file mode 100644 index 000000000..119475f25 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb @@ -0,0 +1,13 @@ +SUMMARY = "simple dynamic multicast routing daemon that only uses IGMP signalling" +HOMEPAGE = "http://sourceforge.net/projects/igmpproxy/" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=432040ff3a55670c1dec0c32b209ad69" + +SRC_URI = "https://github.com/pali/igmpproxy/releases/download/${PV}/${BP}.tar.gz" +SRC_URI[md5sum] = "5565874d9631103109a72452cecb5ce7" +SRC_URI[sha256sum] = "d1fc244cb2fbbf99f720bda3e841fe59ece9b6919073790b4b892739b1b844eb" + +UPSTREAM_CHECK_URI = "https://github.com/pali/${BPN}/releases" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.9.bb b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.9.bb new file mode 100644 index 000000000..95e48f013 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.9.bb @@ -0,0 +1,21 @@ +# Copyright (C) 2017 Aaron Brice +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Administration tool for IP sets" +HOMEPAGE = "http://ipset.netfilter.org" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +SECTION = "base" + +DEPENDS = "libtool libmnl" + +SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2" +SRC_URI[sha256sum] = "b75c13689eddf1d95b396840a69dc04fd7ae4112b10b70594bc0405df7b9b30a" + +inherit autotools pkgconfig module-base + +EXTRA_OECONF += "-with-kbuild=${KBUILD_OUTPUT} --with-ksource=${STAGING_KERNEL_DIR}" + +RRCOMMENDS_${PN} = "\ + kernel-module-ip-set \ +" diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.8.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.8.bb deleted file mode 100644 index f1fd61be7..000000000 --- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.8.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26" -SECTION = "libs" -DEPENDS = "libmnl" - -SRCREV = "b2cd6d28fab02934c4ddff0699718d74272eccd3" -SRC_URI = "git://git.netfilter.org/libnftnl \ - file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.9.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.9.bb new file mode 100644 index 000000000..5532af8d9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.9.bb @@ -0,0 +1,14 @@ +SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26" +SECTION = "libs" +DEPENDS = "libmnl" + +SRCREV = "c3fdda6ac8675aea9b35772458544f03157be415" +SRC_URI = "git://git.netfilter.org/libnftnl \ + file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.7.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.7.bb deleted file mode 100644 index e5dfef92b..000000000 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.7.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Netfilter Tables userspace utillites" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" - -DEPENDS = "libmnl libnftnl bison-native \ - ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" - -# Ensure we reject the 0.099 version by matching at least two dots -UPSTREAM_CHECK_REGEX = "nftables-(?P\d+(\.\d+){2,}).tar.bz2" - -SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" -SRC_URI[sha256sum] = "fe6b8a8c326a2c09c02ca162b840d7d4aadb043ce7a367c166d6455b0e112cb0" - -inherit autotools manpages pkgconfig - -PACKAGECONFIG ??= "python readline" -PACKAGECONFIG[json] = "--with-json, --without-json, jansson" -PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" -PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" -PACKAGECONFIG[python] = "--enable-python --with-python-bin=${PYTHON}, --with-python-bin="", python3" -PACKAGECONFIG[readline] = "--with-cli=readline, --without-cli, readline" -PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} - -RRECOMMENDS_${PN} += "kernel-module-nf-tables" - -PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" -RDEPENDS_${PN}-python = "python3-core python3-json" diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.8.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.8.bb new file mode 100644 index 000000000..6990ae3ae --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.8.bb @@ -0,0 +1,31 @@ +SUMMARY = "Netfilter Tables userspace utillites" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" + +DEPENDS = "libmnl libnftnl bison-native \ + ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" + +# Ensure we reject the 0.099 version by matching at least two dots +UPSTREAM_CHECK_REGEX = "nftables-(?P\d+(\.\d+){2,}).tar.bz2" + +SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" +SRC_URI[sha256sum] = "60fc004656dae4fefc4901c939c9d64120b4dedb49738e420a9a34989f108fe4" + +inherit autotools manpages pkgconfig + +PACKAGECONFIG ??= "python readline json" +PACKAGECONFIG[json] = "--with-json, --without-json, jansson" +PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" +PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" +PACKAGECONFIG[python] = "--enable-python --with-python-bin=${PYTHON}, --with-python-bin="", python3" +PACKAGECONFIG[readline] = "--with-cli=readline, --without-cli, readline" +PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} + +RRECOMMENDS_${PN} += "kernel-module-nf-tables" + +PACKAGES =+ "${PN}-python" +FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" +RDEPENDS_${PN}-python = "python3-core python3-json ${PN}" diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-mdns-include-stddef.h-for-NULL.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-mdns-include-stddef.h-for-NULL.patch index 3e9be7d6a..c57ce8fa5 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-mdns-include-stddef.h-for-NULL.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-mdns-include-stddef.h-for-NULL.patch @@ -34,7 +34,7 @@ index 2fbea04..d4b9af5 100755 +#include /* for NULL */ #include "DNSCommon.h" // Defines general DNS utility routines #include "uDNS.h" // Defines entry points into unicast-specific routines - #include "nsec.h" + -- 2.20.1 diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1096.40.7.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1096.40.7.bb deleted file mode 100644 index 086b40869..000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1096.40.7.bb +++ /dev/null @@ -1,102 +0,0 @@ -SUMMARY = "Publishes & browses available services on a link according to the Zeroconf / Bonjour protocol" -DESCRIPTION = "Bonjour, also known as zero-configuration networking, enables automatic discovery of computers, devices, and services on IP networks." -HOMEPAGE = "http://developer.apple.com/networking/bonjour/" -LICENSE = "Apache-2.0 & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=31c50371921e0fb731003bbc665f29bf" - -COMPATIBLE_HOST_libc-musl = 'null' - -RPROVIDES_${PN} += "libdns_sd.so" - -SRC_URI = "https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ - file://mdns.service \ - file://0001-mdns-include-stddef.h-for-NULL.patch;patchdir=.. \ - file://0002-mdns-cross-compilation-fixes-for-bitbake.patch;patchdir=.. \ - file://0001-Create-subroutine-for-cleaning-recent-interfaces.patch;patchdir=.. \ - file://0002-Create-subroutine-for-tearing-down-an-interface.patch;patchdir=.. \ - file://0003-Track-interface-socket-family.patch;patchdir=.. \ - file://0004-Use-list-for-changed-interfaces.patch;patchdir=.. \ - file://0006-Remove-unneeded-function.patch;patchdir=.. \ - file://0008-Mark-deleted-interfaces-as-being-changed.patch;patchdir=.. \ - file://0009-Fix-possible-NULL-dereference.patch;patchdir=.. \ - file://0010-Handle-errors-from-socket-calls.patch;patchdir=.. \ - file://0011-Change-a-dynamic-allocation-to-file-scope-variable.patch;patchdir=.. \ - " -SRC_URI[md5sum] = "ac766013bbcb323e9db4c80805b2552a" -SRC_URI[sha256sum] = "b86f4816b4145915198e7c5bf0bc56dbbfd960e9a4518bb6486baa40cdcca7e6" - -CVE_PRODUCT = "apple:mdnsresponder" - -PARALLEL_MAKE = "" - -S = "${WORKDIR}/mDNSResponder-${PV}/mDNSPosix" - -EXTRA_OEMAKE += "os=linux DEBUG=0 'CC=${CC}' 'LD=${CCLD} ${LDFLAGS}'" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install () { - install -d ${D}${sbindir} - install -m 0755 build/prod/mdnsd ${D}${sbindir} - - install -d ${D}${libdir} - cp build/prod/libdns_sd.so ${D}${libdir}/libdns_sd.so.1 - chmod 0644 ${D}${libdir}/libdns_sd.so.1 - ln -s libdns_sd.so.1 ${D}${libdir}/libdns_sd.so - - install -d ${D}${includedir} - install -m 0644 ../mDNSShared/dns_sd.h ${D}${includedir} - - install -d ${D}${mandir}/man8 - install -m 0644 ../mDNSShared/mDNSResponder.8 ${D}${mandir}/man8/mdnsd.8 - - install -d ${D}${bindir} - install -m 0755 ../Clients/build/dns-sd ${D}${bindir} - - install -d ${D}${libdir} - oe_libinstall -C build/prod -so libnss_mdns-0.2 ${D}${libdir} - ln -s libnss_mdns-0.2.so ${D}${libdir}/libnss_mdns.so.2 - - install -d ${D}${sysconfdir} - install -m 0644 nss_mdns.conf ${D}${sysconfdir} - - install -d ${D}${mandir}/man5 - install -m 0644 nss_mdns.conf.5 ${D}${mandir}/man5 - - install -d ${D}${mandir}/man8 - install -m 0644 libnss_mdns.8 ${D}${mandir}/man8 - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/mdns.service ${D}${systemd_unitdir}/system/ -} - -pkg_postinst_${PN} () { - sed -e '/^hosts:/s/\s*\//' \ - -e 's/\(^hosts:.*\)\(\\)\(.*\)\(\\)\(.*\)/\1\2 mdns\3\4\5/' \ - -i $D/etc/nsswitch.conf -} - -pkg_prerm_${PN} () { - sed -e '/^hosts:/s/\s*\//' \ - -e '/^hosts:/s/\s*mdns//' \ - -i $D/etc/nsswitch.conf -} - -inherit systemd - -SYSTEMD_SERVICE_${PN} = "mdns.service" - -FILES_${PN} += "${systemd_unitdir}/system/mdns.service" -FILES_${PN} += "${libdir}/libdns_sd.so.1 \ - ${bindir}/dns-sd \ - ${libdir}/libnss_mdns-0.2.so \ - ${sysconfdir}/nss_mdns.conf" - -FILES_${PN}-dev += "${libdir}/libdns_sd.so \ - ${includedir}/dns_sd.h " - -FILES_${PN}-man += "${mandir}/man8/mdnsd.8 \ - ${mandir}/man5/nss_mdns.conf.5 \ - ${mandir}/man8/libnss_mdns.8" - -PACKAGES = "${PN} ${PN}-dev ${PN}-man ${PN}-dbg" diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.40.42.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.40.42.bb new file mode 100644 index 000000000..445ed87e4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.40.42.bb @@ -0,0 +1,102 @@ +SUMMARY = "Publishes & browses available services on a link according to the Zeroconf / Bonjour protocol" +DESCRIPTION = "Bonjour, also known as zero-configuration networking, enables automatic discovery of computers, devices, and services on IP networks." +HOMEPAGE = "http://developer.apple.com/networking/bonjour/" +LICENSE = "Apache-2.0 & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=31c50371921e0fb731003bbc665f29bf" + +COMPATIBLE_HOST_libc-musl = 'null' + +RPROVIDES_${PN} += "libdns_sd.so" + +SRC_URI = "https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ + file://mdns.service \ + file://0001-mdns-include-stddef.h-for-NULL.patch;patchdir=.. \ + file://0002-mdns-cross-compilation-fixes-for-bitbake.patch;patchdir=.. \ + file://0001-Create-subroutine-for-cleaning-recent-interfaces.patch;patchdir=.. \ + file://0002-Create-subroutine-for-tearing-down-an-interface.patch;patchdir=.. \ + file://0003-Track-interface-socket-family.patch;patchdir=.. \ + file://0004-Use-list-for-changed-interfaces.patch;patchdir=.. \ + file://0006-Remove-unneeded-function.patch;patchdir=.. \ + file://0008-Mark-deleted-interfaces-as-being-changed.patch;patchdir=.. \ + file://0009-Fix-possible-NULL-dereference.patch;patchdir=.. \ + file://0010-Handle-errors-from-socket-calls.patch;patchdir=.. \ + file://0011-Change-a-dynamic-allocation-to-file-scope-variable.patch;patchdir=.. \ + " +SRC_URI[md5sum] = "dfcfd4d7f29a56ec99e7df1d21db5e7b" +SRC_URI[sha256sum] = "bea29e1616cd56ccb8f88c0fad2bcdc4031f4deb2d899c793e2f27a8384f0b34" + +CVE_PRODUCT = "apple:mdnsresponder" + +PARALLEL_MAKE = "" + +S = "${WORKDIR}/mDNSResponder-${PV}/mDNSPosix" + +EXTRA_OEMAKE += "os=linux DEBUG=0 'CC=${CC}' 'LD=${CCLD} ${LDFLAGS}'" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install () { + install -d ${D}${sbindir} + install -m 0755 build/prod/mdnsd ${D}${sbindir} + + install -d ${D}${libdir} + cp build/prod/libdns_sd.so ${D}${libdir}/libdns_sd.so.1 + chmod 0644 ${D}${libdir}/libdns_sd.so.1 + ln -s libdns_sd.so.1 ${D}${libdir}/libdns_sd.so + + install -d ${D}${includedir} + install -m 0644 ../mDNSShared/dns_sd.h ${D}${includedir} + + install -d ${D}${mandir}/man8 + install -m 0644 ../mDNSShared/mDNSResponder.8 ${D}${mandir}/man8/mdnsd.8 + + install -d ${D}${bindir} + install -m 0755 ../Clients/build/dns-sd ${D}${bindir} + + install -d ${D}${libdir} + oe_libinstall -C build/prod -so libnss_mdns-0.2 ${D}${libdir} + ln -s libnss_mdns-0.2.so ${D}${libdir}/libnss_mdns.so.2 + + install -d ${D}${sysconfdir} + install -m 0644 nss_mdns.conf ${D}${sysconfdir} + + install -d ${D}${mandir}/man5 + install -m 0644 nss_mdns.conf.5 ${D}${mandir}/man5 + + install -d ${D}${mandir}/man8 + install -m 0644 libnss_mdns.8 ${D}${mandir}/man8 + + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/mdns.service ${D}${systemd_unitdir}/system/ +} + +pkg_postinst_${PN} () { + sed -e '/^hosts:/s/\s*\//' \ + -e 's/\(^hosts:.*\)\(\\)\(.*\)\(\\)\(.*\)/\1\2 mdns\3\4\5/' \ + -i $D/etc/nsswitch.conf +} + +pkg_prerm_${PN} () { + sed -e '/^hosts:/s/\s*\//' \ + -e '/^hosts:/s/\s*mdns//' \ + -i $D/etc/nsswitch.conf +} + +inherit systemd + +SYSTEMD_SERVICE_${PN} = "mdns.service" + +FILES_${PN} += "${systemd_unitdir}/system/mdns.service" +FILES_${PN} += "${libdir}/libdns_sd.so.1 \ + ${bindir}/dns-sd \ + ${libdir}/libnss_mdns-0.2.so \ + ${sysconfdir}/nss_mdns.conf" + +FILES_${PN}-dev += "${libdir}/libdns_sd.so \ + ${includedir}/dns_sd.h " + +FILES_${PN}-man += "${mandir}/man8/mdnsd.8 \ + ${mandir}/man5/nss_mdns.conf.5 \ + ${mandir}/man8/libnss_mdns.8" + +PACKAGES = "${PN} ${PN}-dev ${PN}-man ${PN}-dbg" diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb index 5df1f9340..bee83c4d1 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb @@ -40,7 +40,7 @@ CCACHE = "" TARGET_CC_ARCH += "${LDFLAGS}" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} des" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} des smux" PACKAGECONFIG[elfutils] = "--with-elf, --without-elf, elfutils" PACKAGECONFIG[libnl] = "--with-nl, --without-nl, libnl" @@ -49,6 +49,7 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no,\ perl," PACKAGECONFIG[des] = "--enable-des,--disable-des" +PACKAGECONFIG[smux] = "" EXTRA_OECONF = "--enable-shared \ --disable-manuals \ @@ -57,10 +58,11 @@ EXTRA_OECONF = "--enable-shared \ --with-persistent-directory=${localstatedir}/lib/net-snmp \ ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \ --with-openssl=${STAGING_EXECPREFIXDIR} \ + --with-mib-modules='${MIB_MODULES}' \ " -# net-snmp needs to have mib-modules=smux enabled to enable quagga to support snmp -EXTRA_OECONF += "--with-mib-modules=smux" +MIB_MODULES = "" +MIB_MODULES_append = " ${@bb.utils.filter('PACKAGECONFIG', 'smux', d)}" CACHED_CONFIGUREVARS = " \ ac_cv_header_valgrind_valgrind_h=no \ diff --git a/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb b/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb index 12b9124f7..c3e4cbbe6 100644 --- a/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb @@ -16,7 +16,7 @@ PV = "0.5.1.3+git${SRCPV}" SRCREV = "5555aae843f57241d005e330b9cb65602d56db0f" -SRC_URI = "git://git.xiph.org/celt.git;branch=compat-v0.5.1;protocol=https \ +SRC_URI = "git://gitlab.xiph.org/xiph/celt.git;branch=compat-v0.5.1;protocol=https \ file://0001-configure.ac-make-tools-support-optional.patch \ file://0001-tests-Include-entcode.c-into-test-sources-to-provide.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch deleted file mode 100644 index 233ae40ce..000000000 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f61f5f8a328207867b5c523b1c6bef6aaecaab88 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu -Date: Sat, 15 Feb 2020 16:05:58 +0800 -Subject: [PATCH] Bugfix: Modify the dir of install-exec-hook and - install-data-hook - -Error message: -(cd /sbin && ln -sf mount.cifs mount.smb3) - /yocto/work001/fnst/wangmy/build/tmp/hosttools/install -c mount.cifs -'/yocto/work001/fnst/wangmy/build/tmp/work/core2-64-poky-linux/cifs-utils/6.10-r0/image/sbin' -make install-data-hook -ln: failed to create symbolic link 'mount.smb3': Permission denied - -Upstream-Status: Pending - -Signed-off-by: Wang Mingyu ---- - Makefile.am | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index fe9cd34..e9be6b3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -119,11 +119,11 @@ endif - SUBDIRS = contrib - - install-exec-hook: -- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) -+ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) - - install-data-hook: -- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) -+ (test -n "$(man_MANS)" || exit 0; cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) - - uninstall-hook: -- (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) -- (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8) -+ (cd $(DESTDIR)$(ROOTSBINDIR) && rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3) -+ (test -n "$(man_MANS)" || exit 0; cd $(DESTDIR)$(man8dir) && rm -f $(DESTDIR)$(man8dir)/mount.smb3.8) --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb deleted file mode 100644 index de3fbb094..000000000 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem." -HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils" -SECTION = "otherosfs" -LICENSE = "GPLv3 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRCREV = "ded4e81796a18cde73329e838357f084aa05720f" -SRC_URI = "git://git.samba.org/cifs-utils.git" - -S = "${WORKDIR}/git" -DEPENDS += "libtalloc" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" -# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install_append is needed -PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils" -# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install_append is needed -PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 libtalloc keyutils" -PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samba" -PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" -PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils" - -SRC_URI += " \ - file://0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch \ - " - -inherit autotools pkgconfig - -do_install_append() { - # Remove empty /usr/bin and /usr/sbin directories since the mount helper - # is installed to /sbin - rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} -} - -FILES_${PN} += "${base_libdir}/security" -FILES_${PN}-dbg += "${base_libdir}/security/.debug" -RRECOMMENDS_${PN} = "kernel-module-cifs" diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb new file mode 100644 index 000000000..c68b474cc --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem." +HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils" +SECTION = "otherosfs" +LICENSE = "GPLv3 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRCREV = "73008e3292e4d46fde3eab5d5f618886210ec4a1" +SRC_URI = "git://git.samba.org/cifs-utils.git" + +S = "${WORKDIR}/git" +DEPENDS += "libtalloc" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" +# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install_append is needed +PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils" +# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install_append is needed +PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 libtalloc keyutils" +PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samba" +PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" +PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils" + +inherit autotools pkgconfig + +do_install_append() { + # Remove empty /usr/bin and /usr/sbin directories since the mount helper + # is installed to /sbin + rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} +} + +FILES_${PN} += "${base_libdir}/security" +FILES_${PN}-dbg += "${base_libdir}/security/.debug" +RRECOMMENDS_${PN} = "kernel-module-cifs" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service index 2980f7def..ef2f3f7e4 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service @@ -8,7 +8,7 @@ PIDFile=/run/dnsmasq.pid ExecStartPre=/usr/bin/dnsmasq --test ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service ExecStartPost=/usr/bin/dnsmasq-resolvconf-helper start -ExecStopPre=/usr/bin/dnsmasq-resolvconf-helper stop +ExecStop=/usr/bin/dnsmasq-resolvconf-helper stop ExecStop=/bin/kill $MAINPID ExecReload=/bin/kill -HUP $MAINPID diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch index f86235076..f16f687f2 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch @@ -9,58 +9,65 @@ Upstream-Status: pending Signed-off-by: Koen Kooi Signed-off-by: Li Xin + +Signed-off-by: Wang Mingyu --- - configure.ac | 15 +++++---------- - 1 file changed, 5 insertions(+), 10 deletions(-) + m4/glibc.m4 | 6 ++---- + m4/ioloop.m4 | 9 +++------ + 2 files changed, 5 insertions(+), 10 deletions(-) -diff --git a/configure.ac b/configure.ac -index 3b32614..94ec002 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -519,13 +519,10 @@ have_ioloop=no - - if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then - AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[ +diff --git a/m4/glibc.m4 b/m4/glibc.m4 +index 5d722aa..ce088d3 100644 +--- a/m4/glibc.m4 ++++ b/m4/glibc.m4 +@@ -17,7 +17,7 @@ AC_DEFUN([DOVECOT_GLIBC], [ + dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it. + dnl * It may also be broken in AIX. + AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ - AC_TRY_RUN([ + AC_TRY_LINK([ - #include -- -- int main() -- { -- return epoll_create(5) < 1; + #define _XOPEN_SOURCE 600 + #include + #include +@@ -26,7 +26,7 @@ AC_DEFUN([DOVECOT_GLIBC], [ + #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7) + possibly broken posix_fallocate + #endif +- int main() { ++ ], [ + int fd = creat("conftest.temp", 0600); + int ret; + if (fd == -1) { +@@ -35,8 +35,6 @@ AC_DEFUN([DOVECOT_GLIBC], [ + } + ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0; + unlink("conftest.temp"); +- return ret; - } -+ ], [ -+ epoll_create(5) < 1; ], [ - i_cv_epoll_works=yes + i_cv_posix_fallocate_works=yes ], [ -@@ -653,7 +650,7 @@ fi - dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it. - dnl * It may also be broken in AIX. - AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ -- AC_TRY_RUN([ -+ AC_TRY_LINK([ - #define _XOPEN_SOURCE 600 - #include - #include -@@ -662,7 +659,7 @@ AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ - #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7) - possibly broken posix_fallocate - #endif -- int main() { -+ ], [ - int fd = creat("conftest.temp", 0600); - int ret; - if (fd == -1) { -@@ -671,8 +668,6 @@ AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ - } - ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0; - unlink("conftest.temp"); -- return ret; -- } - ], [ - i_cv_posix_fallocate_works=yes - ], [ +diff --git a/m4/ioloop.m4 b/m4/ioloop.m4 +index 0f7dde0..f40fd62 100644 +--- a/m4/ioloop.m4 ++++ b/m4/ioloop.m4 +@@ -4,13 +4,10 @@ AC_DEFUN([DOVECOT_IOLOOP], [ + + if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then + AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[ +- AC_TRY_RUN([ ++ AC_TRY_LINK([ + #include +- +- int main() +- { +- return epoll_create(5) < 1; +- } ++ ], [ ++ epoll_create(5) < 1; + ], [ + i_cv_epoll_works=yes + ], [ -- -1.8.4.2 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch deleted file mode 100644 index 65ae9bf91..000000000 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From be9b3809b86fe593dbb16f0b981b3d315a27b799 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 22 Oct 2017 22:10:41 -0700 -Subject: [PATCH] doveadm: Fix parallel build - -Sometimes dovetail build fails with errors like - -doveadm-util.o: file not recognized: File truncated -collect2: error: ld returned 1 exit status -make[4]: *** [Makefile:812: test-doveadm-util] Error 1 - -This is partial backport from - -https://github.com/dovecot/core/commit/b200bc3875fa06d42c8619865cc306c3297fcacc - -Signed-off-by: Khem Raj ---- - src/doveadm/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am -index c644646..6ae9144 100644 ---- a/src/doveadm/Makefile.am -+++ b/src/doveadm/Makefile.am -@@ -180,8 +180,8 @@ test_libs = \ - ../lib/liblib.la - test_deps = $(noinst_LTLIBRARIES) $(test_libs) - --test_doveadm_util_SOURCES = test-doveadm-util.c --test_doveadm_util_LDADD = doveadm-util.o $(test_libs) $(MODULE_LIBS) -+test_doveadm_util_SOURCES = doveadm-util.c test-doveadm-util.c -+test_doveadm_util_LDADD = $(test_libs) $(MODULE_LIBS) - test_doveadm_util_DEPENDENCIES = $(test_deps) - - check: check-am check-test --- -2.14.2 - diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch new file mode 100644 index 000000000..20ba73a82 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch @@ -0,0 +1,26 @@ +From 8c7d143ff28441c8b74b0f518dd2281239aede3d Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Fri, 15 Jan 2021 11:10:22 +0900 +Subject: [PATCH] not check pandoc + +Signed-off-by: Wang Mingyu +--- + m4/dovecot.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/dovecot.m4 b/m4/dovecot.m4 +index 2b5d895..ece8489 100644 +--- a/m4/dovecot.m4 ++++ b/m4/dovecot.m4 +@@ -447,7 +447,7 @@ AC_DEFUN([DC_PANDOC], [ + dnl Optional tool for making documentation + AC_CHECK_PROGS(PANDOC, [pandoc], [true]) + +- AS_IF([test "$PANDOC" = "true"], [ ++ AS_IF([test "$PANDOC" = "false"], [ + AS_IF([test ! -e README], [ + AC_MSG_ERROR([Cannot produce documentation without pandoc - disable with PANDOC=false ./configure]) + ]) +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb deleted file mode 100644 index bda174023..000000000 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "Dovecot is an open source IMAP and POP3 email server" -HOMEPAGE = "https://www.dovecot.org/" -DESCRIPTION = "Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like systems, written with security primarily in mind. Dovecot is an excellent choice for both small and large installations. It's fast, simple to set up, requires no special administration and it uses very little memory." -SECTION = "mail" -LICENSE = "LGPLv2.1 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=a981379bd0f1c362f8d1d21515e5b30b" - -SRC_URI = "http://dovecot.org/releases/2.2/dovecot-${PV}.tar.gz \ - file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ - file://dovecot.service \ - file://dovecot.socket \ - file://0001-doveadm-Fix-parallel-build.patch \ - " - -SRC_URI[md5sum] = "66c4d71858b214afee5b390ee602dee2" -SRC_URI[sha256sum] = "777c61e264869e9b288b8d6603f4ed3ac3aac9ec573908067353f51269dce2fe" - -DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc" -CFLAGS += "-I${STAGING_INCDIR}/tirpc" -LDFLAGS += "-ltirpc" - -inherit autotools pkgconfig systemd useradd gettext - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)}" - -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," -PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap," -PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," - -# From native build in armv7a-hf/eglibc -CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \ - i_cv_gmtime_max_time_t=32 \ - i_cv_signed_time_t=yes \ - i_cv_mmap_plays_with_write=yes \ - i_cv_fd_passing=yes \ - i_cv_c99_vsnprintf=yes \ - lib_cv___va_copy=yes \ - lib_cv_va_copy=yes \ - lib_cv_va_val_copy=yes \ - " - -# hardcode epoll() to avoid running unsafe tests -# BSD needs kqueue and uclibc poll() -EXTRA_OECONF = " --with-ioloop=epoll \ - --with-systemdsystemunitdir=${systemd_unitdir}/system" - -# Uses hidden symbols -# libssl_iostream_openssl.so: undefined reference to `ssl_iostream_handshake' -LTO = "" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "dovecot.service dovecot.socket" -SYSTEMD_AUTO_ENABLE = "disable" - -do_install_append () { - install -d 755 ${D}/etc/dovecot - touch 644 ${D}/etc/dovecot/dovecot.conf - install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovecot dovecot; \ - -r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovenull dovenull" -GROUPADD_PARAM_${PN} = "-f -r dovecot;-f -r dovenull" - -FILES_${PN} += "${libdir}/dovecot/*plugin.so \ - ${libdir}/dovecot/libfs_compress.so \ - ${libdir}/dovecot/libssl_iostream_openssl.so" -FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" -FILES_${PN}-dev += "${libdir}/dovecot/libdovecot*.so" -FILES_${PN}-dbg += "${libdir}/dovecot/*/.debug" diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.13.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.13.bb new file mode 100644 index 000000000..c78d283d2 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.13.bb @@ -0,0 +1,73 @@ +SUMMARY = "Dovecot is an open source IMAP and POP3 email server" +HOMEPAGE = "https://www.dovecot.org/" +DESCRIPTION = "Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like systems, written with security primarily in mind. Dovecot is an excellent choice for both small and large installations. It's fast, simple to set up, requires no special administration and it uses very little memory." +SECTION = "mail" +LICENSE = "LGPLv2.1 & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=2956560272e5b31d9d64f03111732048" + +SRC_URI = "http://dovecot.org/releases/2.3/dovecot-${PV}.tar.gz \ + file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ + file://dovecot.service \ + file://dovecot.socket \ + file://0001-not-check-pandoc.patch \ + " + +SRC_URI[md5sum] = "f512bf1a4dac9ac994fddfb6bc5068ff" +SRC_URI[sha256sum] = "a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4" + +DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += "-ltirpc" + +inherit autotools pkgconfig systemd useradd gettext + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)}" + +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," +PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap," +PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," + +# From native build in armv7a-hf/eglibc +CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \ + i_cv_gmtime_max_time_t=32 \ + i_cv_signed_time_t=yes \ + i_cv_mmap_plays_with_write=yes \ + i_cv_fd_passing=yes \ + i_cv_c99_vsnprintf=yes \ + lib_cv___va_copy=yes \ + lib_cv_va_copy=yes \ + lib_cv_va_val_copy=yes \ + " + +# hardcode epoll() to avoid running unsafe tests +# BSD needs kqueue and uclibc poll() +EXTRA_OECONF = " --with-ioloop=epoll \ + --with-systemdsystemunitdir=${systemd_unitdir}/system" + +# Uses hidden symbols +# libssl_iostream_openssl.so: undefined reference to `ssl_iostream_handshake' +LTO = "" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "dovecot.service dovecot.socket" +SYSTEMD_AUTO_ENABLE = "disable" + +do_install_append () { + install -d 755 ${D}/etc/dovecot + touch 644 ${D}/etc/dovecot/dovecot.conf + install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "-r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovecot dovecot; \ + -r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovenull dovenull" +GROUPADD_PARAM_${PN} = "-f -r dovecot;-f -r dovenull" + +FILES_${PN} += "${libdir}/dovecot/*plugin.so \ + ${libdir}/dovecot/libfs_compress.so \ + ${libdir}/dovecot/libssl_iostream_openssl.so" +FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" +FILES_${PN}-dev += "${libdir}/dovecot/libdovecot*.so" +FILES_${PN}-dbg += "${libdir}/dovecot/*/.debug" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb new file mode 100644 index 000000000..d28482414 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb @@ -0,0 +1,80 @@ +DESCRIPTION = "wireshark - a popular network protocol analyzer" +HOMEPAGE = "http://www.wireshark.org" +SECTION = "net" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" + +DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native" + +DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " + +SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" + +UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" + +SRC_URI[sha256sum] = "1e9e239f2449f240a7910ed598084ccaf8ea308b2b46b196c5adbec59612226c" + +PE = "1" + +inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg + +PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" + +PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" + +PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" +PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" +PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" +PACKAGECONFIG[libnl] = ",,libnl" +PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" +PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" +PACKAGECONFIG[ssl] = ",,openssl" +PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" +PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua" +PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" +PACKAGECONFIG[geoip] = ",, geoip" +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" +PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" +PACKAGECONFIG[libssh] = ",,libssh2" +PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" + +# these next two options require addional layers +PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ + -DBUILD_mmdbresolve=OFF \ + -DBUILD_randpktdump=OFF \ + -DBUILD_androiddump=OFF \ + -DBUILD_dcerpcidl2wrs=OFF \ + -DM_INCLUDE_DIR=${includedir} \ + -DM_LIBRARY=${libdir} \ + " +CFLAGS_append = " -lm" + +do_install_append_class-native() { + install -d ${D}${bindir} + for f in lemon + do + install -m 0755 ${B}/run/$f ${D}${bindir} + done +} + +do_install_append_class-target() { + for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` + do + chrpath --delete $f + done +} + +PACKAGE_BEFORE_PN += "tshark" + +FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" + +FILES_${PN} += "${datadir}*" + +RDEPENDS_tshark = "wireshark" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.7.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.7.bb deleted file mode 100644 index 65f925ce1..000000000 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.7.bb +++ /dev/null @@ -1,80 +0,0 @@ -DESCRIPTION = "wireshark - a popular network protocol analyzer" -HOMEPAGE = "http://www.wireshark.org" -SECTION = "net" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" - -DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native" - -DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " - -SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" - -UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" - -SRC_URI[sha256sum] = "be832fb86d9c455c5be8b225a755cdc77cb0e92356bdfc1fe4b000d93f7d70da" - -PE = "1" - -inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg - -PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" - -PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" - -PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" -PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" -PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" -PACKAGECONFIG[libnl] = ",,libnl" -PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" -PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" -PACKAGECONFIG[ssl] = ",,openssl" -PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" -PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua" -PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" -PACKAGECONFIG[geoip] = ",, geoip" -PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" -PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" -PACKAGECONFIG[libssh] = ",,libssh2" -PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" - -# these next two options require addional layers -PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ - -DBUILD_mmdbresolve=OFF \ - -DBUILD_randpktdump=OFF \ - -DBUILD_androiddump=OFF \ - -DBUILD_dcerpcidl2wrs=OFF \ - -DM_INCLUDE_DIR=${includedir} \ - -DM_LIBRARY=${libdir} \ - " -CFLAGS_append = " -lm" - -do_install_append_class-native() { - install -d ${D}${bindir} - for f in lemon - do - install -m 0755 ${B}/run/$f ${D}${bindir} - done -} - -do_install_append_class-target() { - for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` - do - chrpath --delete $f - done -} - -PACKAGE_BEFORE_PN += "tshark" - -FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" - -FILES_${PN} += "${datadir}*" - -RDEPENDS_tshark = "wireshark" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-manual-pages.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-manual-pages.patch new file mode 100644 index 000000000..b27e6c9fe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-manual-pages.patch @@ -0,0 +1,100 @@ +From a8d86a2d994a008dab3c3ecad65528c0e5fc2cba Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Fri, 22 Jan 2021 11:22:48 +0800 +Subject: [PATCH] doc: Fix typos in manual pages + +Signed-off-by: He Zhe +--- + doc/bw_mem.8 | 2 +- + doc/lat_fcntl.8 | 2 +- + doc/lat_fifo.8 | 2 +- + doc/lat_http.8 | 6 +++--- + doc/lat_select.8 | 2 +- + doc/lat_sig.8 | 2 +- + 6 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/doc/bw_mem.8 b/doc/bw_mem.8 +index 33df417..9e84d73 100644 +--- a/doc/bw_mem.8 ++++ b/doc/bw_mem.8 +@@ -3,7 +3,7 @@ + .SH NAME + bw_mem \- time memory bandwidth + .SH SYNOPSIS +-.B bw_mem_cp ++.B bw_mem + [ + .I "-P " + ] +diff --git a/doc/lat_fcntl.8 b/doc/lat_fcntl.8 +index cf3c93e..2e501d6 100644 +--- a/doc/lat_fcntl.8 ++++ b/doc/lat_fcntl.8 +@@ -3,7 +3,7 @@ + .SH NAME + lat_fcntl \- fcntl file locking benchmark + .SH SYNOPSIS +-.B lat_ctx ++.B lat_fcntl + [ + .I "-P " + ] +diff --git a/doc/lat_fifo.8 b/doc/lat_fifo.8 +index 65e5a08..90bc900 100644 +--- a/doc/lat_fifo.8 ++++ b/doc/lat_fifo.8 +@@ -3,7 +3,7 @@ + .SH NAME + lat_fifo \- FIFO benchmark + .SH SYNOPSIS +-.B lat_ctx ++.B lat_fifo + [ + .I "-P " + ] +diff --git a/doc/lat_http.8 b/doc/lat_http.8 +index a4bb459..99c5d4a 100644 +--- a/doc/lat_http.8 ++++ b/doc/lat_http.8 +@@ -1,9 +1,9 @@ + .\" $Id$ +-.TH LAT_FCNTL 8 "$Date$" "(c)1994-2000 Carl Staelin and Larry McVoy" "LMBENCH" ++.TH LAT_HTTP 8 "$Date$" "(c)1994-2000 Carl Staelin and Larry McVoy" "LMBENCH" + .SH NAME +-lat_fcntl \- fcntl file locking benchmark ++lat_http \- http GET request latency + .SH SYNOPSIS +-.B lat_ctx ++.B lat_http + [ + .I "-d" + ] +diff --git a/doc/lat_select.8 b/doc/lat_select.8 +index 03f83bf..e13499f 100644 +--- a/doc/lat_select.8 ++++ b/doc/lat_select.8 +@@ -3,7 +3,7 @@ + .SH NAME + lat_select \- select benchmark + .SH SYNOPSIS +-.B lat_ctx ++.B lat_select + [ + .I "-P " + ] +diff --git a/doc/lat_sig.8 b/doc/lat_sig.8 +index 91baf78..19a8838 100644 +--- a/doc/lat_sig.8 ++++ b/doc/lat_sig.8 +@@ -3,7 +3,7 @@ + .SH NAME + lat_sig \- select benchmark + .SH SYNOPSIS +-.B lat_ctx ++.B lat_sig + [ + .I "-P " + ] +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_fifo-Fix-cleanup-sequence.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_fifo-Fix-cleanup-sequence.patch new file mode 100644 index 000000000..42b14cece --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_fifo-Fix-cleanup-sequence.patch @@ -0,0 +1,42 @@ +From 78912c0ac5e090095a2f2bd6226e02cce949e72e Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Fri, 22 Jan 2021 10:03:38 +0000 +Subject: [PATCH] lat_fifo: Fix cleanup sequence + +Files should be unlinked after all users exit. + +Signed-off-by: He Zhe +--- + src/lat_fifo.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/lat_fifo.c b/src/lat_fifo.c +index c625161..85bb9d1 100644 +--- a/src/lat_fifo.c ++++ b/src/lat_fifo.c +@@ -120,16 +120,16 @@ cleanup(iter_t iterations, void * cookie) + + if (iterations) return; + +- unlink(state->filename1); +- unlink(state->filename2); +- close(state->wr); +- close(state->rd); +- + if (state->pid > 0) { +- kill(state->pid, 15); ++ kill(state->pid, SIGKILL); + waitpid(state->pid, NULL, 0); + state->pid = 0; + } ++ ++ unlink(state->filename1); ++ unlink(state->filename2); ++ close(state->wr); ++ close(state->rd); + } + + void +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lmbench-Point-webpage-lm-to-target-directory.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lmbench-Point-webpage-lm-to-target-directory.patch new file mode 100644 index 000000000..4a26b8ea7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lmbench-Point-webpage-lm-to-target-directory.patch @@ -0,0 +1,77 @@ +From 353e8a62bf3cb5f1b9504efa16b8b974e93cac49 Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Fri, 22 Jan 2021 10:58:41 +0800 +Subject: [PATCH] lmbench: Point webpage-lm to target directory + +As webpage-lm.tar has been copied to ${datadir}\lmbench. +Plus improve 'hello' copying in lmbench script. + +Signed-off-by: He Zhe +--- + scripts/lmbench | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/scripts/lmbench b/scripts/lmbench +index 7a52cb1..82e36b6 100755 +--- a/scripts/lmbench ++++ b/scripts/lmbench +@@ -167,7 +167,7 @@ if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_UNIX = XYES ]; then + lat_unix -P $SYNC_MAX + fi + if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_PROC = XYES ]; then +- cp hello /tmp/hello ++ cp `which hello` /tmp/hello + for i in fork exec shell + do lat_proc -P $SYNC_MAX $i + done +@@ -237,14 +237,14 @@ fi + + date >> ${OUTPUT} + echo Local networking >> ${OUTPUT} +-if [ ! -d ../../src/webpage-lm ] +-then (cd ../../src && tar xf webpage-lm.tar) ++if [ ! -d /usr/share/lmbench/webpage-lm ] ++then (cd /usr/share/lmbench && tar xf webpage-lm.tar) + sync + sleep 1 + fi + SERVERS="lat_udp lat_tcp lat_rpc lat_connect bw_tcp" + for server in $SERVERS; do $server -s; done +-DOCROOT=../../src/webpage-lm lmhttp 8008 & ++DOCROOT=/usr/share/lmbench/webpage-lm lmhttp 8008 & + sleep 2; + + if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_UDP = XYES ]; then +@@ -280,15 +280,15 @@ bw_tcp -S localhost + + if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_HTTP = XYES ]; then + # I want a hot cache number +- lat_http localhost 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1 +- lat_http localhost 8008 < ../../src/webpage-lm/URLS ++ lat_http localhost 8008 < /usr/share/lmbench/webpage-lm/URLS > /dev/null 2>&1 ++ lat_http localhost 8008 < /usr/share/lmbench/webpage-lm/URLS + fi + lat_http -S localhost 8008 + + for remote in $REMOTE + do + echo Networking to $remote >> ${OUTPUT} +- $RCP $SERVERS lmhttp ../../src/webpage-lm.tar ${remote}:/tmp ++ $RCP $SERVERS lmhttp /usr/share/lmbench/webpage-lm.tar ${remote}:/tmp + for server in $SERVERS + do $RSH $remote -n /tmp/$server -s & + done +@@ -327,8 +327,8 @@ do + + if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_HTTP = XYES ]; then + # I want a hot cache number +- lat_http $remote 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1 +- lat_http $remote 8008 < ../../src/webpage-lm/URLS ++ lat_http $remote 8008 < /usr/share/lmbench/webpage-lm/URLS > /dev/null 2>&1 ++ lat_http $remote 8008 < /usr/share/lmbench/webpage-lm/URLS + fi + lat_http -S $remote 8008 + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 171ac31ac..21e81ecf2 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -26,6 +26,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://0001-Check-for-musl-define-guard-before-redefining-sockle.patch \ file://0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch \ file://0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch \ + file://0001-lmbench-Point-webpage-lm-to-target-directory.patch \ + file://0001-doc-Fix-typos-in-manual-pages.patch \ + file://0001-lat_fifo-Fix-cleanup-sequence.patch \ " SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" @@ -75,6 +78,7 @@ do_install () { ${D}${bindir}/lmbench-run install -m 0755 ${S}/scripts/lmbench ${D}${bindir} install -m 0755 ${S}/scripts/* ${D}${datadir}/lmbench/scripts + install -m 0644 ${S}/src/webpage-lm.tar ${D}${datadir}/lmbench } pkg_postinst_${PN} () { diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.10.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.10.bb new file mode 100644 index 000000000..2045e2a86 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.10.bb @@ -0,0 +1,53 @@ +SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" +DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +inherit gnomebase gettext systemd vala gobject-introspection bash-completion + +DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" + +SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" +SRC_URI[sha256sum] = "4ea60b375a761e17e7bb095bca894579ed0e8e33b273dc698b5cbe03947f357f" +S = "${WORKDIR}/ModemManager-${PV}" + +PACKAGECONFIG ??= "mbim qmi \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ +" + +PACKAGECONFIG[at] = "--with-at-command-via-dbus" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," +PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" +# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. +PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim" +# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. +PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" + +EXTRA_OECONF = " \ + --with-udev-base-dir=${nonarch_base_libdir}/udev \ +" + +FILES_${PN} += " \ + ${datadir}/icons \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${datadir}/ModemManager \ + ${libdir}/ModemManager \ + ${systemd_unitdir}/system \ +" + +FILES_${PN}-dev += " \ + ${libdir}/ModemManager/*.la \ +" + +FILES_${PN}-staticdev += " \ + ${libdir}/ModemManager/*.a \ +" + +FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" + +SYSTEMD_SERVICE_${PN} = "ModemManager.service" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb deleted file mode 100644 index 609932ef7..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" -DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" -LICENSE = "GPL-2.0 & LGPL-2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -inherit gnomebase gettext systemd vala gobject-introspection bash-completion - -DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" - -SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" -SRC_URI[sha256sum] = "fe1a26ba51b4bda7abd09ad4dadedd87d8b8154809fc9d88e94f75fdfff19295" -S = "${WORKDIR}/ModemManager-${PV}" - -PACKAGECONFIG ??= "mbim qmi \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ -" - -PACKAGECONFIG[at] = "--with-at-command-via-dbus" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," -PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" -# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. -PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim" -# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. -PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" - -EXTRA_OECONF = " \ - --with-udev-base-dir=${nonarch_base_libdir}/udev \ -" - -FILES_${PN} += " \ - ${datadir}/icons \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${datadir}/ModemManager \ - ${libdir}/ModemManager \ - ${systemd_unitdir}/system \ -" - -FILES_${PN}-dev += " \ - ${libdir}/ModemManager/*.la \ -" - -FILES_${PN}-staticdev += " \ - ${libdir}/ModemManager/*.a \ -" - -FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" - -SYSTEMD_SERVICE_${PN} = "ModemManager.service" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb deleted file mode 100644 index 7c9a33e8c..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "High-level C binding for 0MQ" -HOMEPAGE = "http://czmq.zeromq.org/" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" -DEPENDS = "zeromq" - -SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz" - -SRC_URI[md5sum] = "7e09997db6ac3b25e8ed104053040722" -SRC_URI[sha256sum] = "cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb" - -UPSTREAM_CHECK_URI = "https://github.com/zeromq/${BPN}/releases" - -inherit cmake - -PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg" - -FILES_${PN} = "${bindir}/*" -FILES_lib${BPN} = "${libdir}/*.so.*" -FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir} ${datadir}/cmake" -FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" - -RDEPENDS_lib${BPN}-dev = "zeromq-dev" - -PACKAGECONFIG ??= "lz4 uuid curl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4" -PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux" -PACKAGECONFIG[curl] = ",-DCMAKE_DISABLE_FIND_PACKAGE_libcurl=TRUE,curl" -PACKAGECONFIG[systemd] = ",-DCMAKE_DISABLE_FIND_PACKAGE_systemd=TRUE,systemd" - -BBCLASSEXTEND = "nativesdk" - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb new file mode 100644 index 000000000..e742d2a1c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "High-level C binding for 0MQ" +HOMEPAGE = "http://czmq.zeromq.org/" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" +DEPENDS = "zeromq" + +SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz" + +SRC_URI[md5sum] = "471e9ec120fc66a2fe2aae14359e3cfa" +SRC_URI[sha256sum] = "5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377daa6ac39" + +UPSTREAM_CHECK_URI = "https://github.com/zeromq/${BPN}/releases" + +inherit cmake + +PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg" + +FILES_${PN} = "${bindir}/*" +FILES_lib${BPN} = "${libdir}/*.so.*" +FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir} ${datadir}/cmake" +FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" + +RDEPENDS_lib${BPN}-dev = "zeromq-dev" + +PACKAGECONFIG ??= "lz4 uuid curl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4" +PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux" +PACKAGECONFIG[curl] = ",-DCMAKE_DISABLE_FIND_PACKAGE_libcurl=TRUE,curl" +PACKAGECONFIG[systemd] = ",-DCMAKE_DISABLE_FIND_PACKAGE_systemd=TRUE,systemd" + +BBCLASSEXTEND = "nativesdk" + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb deleted file mode 100644 index a10500475..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework" -HOMEPAGE = "http://www.zeromq.org" -LICENSE = "LGPLv3+" -LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1" - -PACKAGECONFIG ??= "libsodium" -PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF, libsodium" - -SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \ - file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \ - file://run-ptest \ -" -SRC_URI[md5sum] = "78acc277d95e10812d71b2b3c3c3c9a9" -SRC_URI[sha256sum] = "9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2" - -UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" - -inherit cmake ptest pkgconfig - -EXTRA_OECMAKE = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DBUILD_TESTS=ON', '-DBUILD_TESTS=OFF', d)} \ - -DCMAKE_SKIP_RPATH=ON \ -" - -do_install_ptest () { - install -d ${D}${PTEST_PATH}/tests - install -m 0755 ${B}/bin/test_* ${D}${PTEST_PATH}/tests -} - -FILES_${PN}-doc += "${datadir}/zmq/*.txt" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb new file mode 100644 index 000000000..4381f2d6d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework" +HOMEPAGE = "http://www.zeromq.org" +LICENSE = "LGPLv3+" +LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1" + +PACKAGECONFIG ??= "libsodium" +PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF, libsodium" + +SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \ + file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \ + file://run-ptest \ +" +SRC_URI[md5sum] = "c897d4005a3f0b8276b00b7921412379" +SRC_URI[sha256sum] = "c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5" + +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" + +inherit cmake ptest pkgconfig + +EXTRA_OECMAKE = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DBUILD_TESTS=ON', '-DBUILD_TESTS=OFF', d)} \ + -DCMAKE_SKIP_RPATH=ON \ +" + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/test_* ${D}${PTEST_PATH}/tests +} + +FILES_${PN}-doc += "${datadir}/zmq/*.txt" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_25.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_25.bb deleted file mode 100644 index 1f62c142f..000000000 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_25.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "dbus broker" -DESCRIPTION = "Drop-in replacement for dbus-daemon." - -SECTION = "base" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" - -SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" -SRC_URI[sha256sum] = "a54fc5192280caf5824b82cb40f295c1195ad73c71bea5bd60218afb9df5bb29" - -UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases" - -inherit meson pkgconfig systemd features_check - -DEPENDS = "expat systemd" -DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" -DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit', '', d)}" - -RDEPENDS_${PN} += "dbus-common" - -REQUIRED_DISTRO_FEATURES = "systemd" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -FILES_${PN} += "${systemd_system_unitdir}" -FILES_${PN} += "${systemd_user_unitdir}" -FILES_${PN} += "${nonarch_libdir}/systemd/catalog" - -EXTRA_OEMESON += " -Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" -EXTRA_OEMESON += " -Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" - diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_26.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_26.bb new file mode 100644 index 000000000..5517883df --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_26.bb @@ -0,0 +1,33 @@ +SUMMARY = "dbus broker" +DESCRIPTION = "Drop-in replacement for dbus-daemon." + +SECTION = "base" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" + +SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" +SRC_URI[sha256sum] = "6a6ab82fc398d4bc31b315f4e1c08f17509e4a1969f1cc77a5706db8923c74e1" + +UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases" + +inherit meson pkgconfig systemd features_check + +DEPENDS = "expat systemd" +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit', '', d)}" + +RDEPENDS_${PN} += "dbus-common" + +REQUIRED_DISTRO_FEATURES = "systemd" + +SYSTEMD_SERVICE_${PN} = "${BPN}.service" + +FILES_${PN} += "${systemd_system_unitdir}" +FILES_${PN} += "${systemd_user_unitdir}" +FILES_${PN} += "${nonarch_libdir}/systemd/catalog" + +EXTRA_OEMESON += " -Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" +EXTRA_OEMESON += " -Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" +EXTRA_OEMESON += " -Dlinux-4-17=true" + diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 2a84d669a..94830e297 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -197,6 +197,7 @@ RDEPENDS_packagegroup-meta-oe-crypto ="\ RDEPENDS_packagegroup-meta-oe-crypto_remove_riscv32 = "botan" RDEPENDS_packagegroup-meta-oe-dbs ="\ + influxdb \ leveldb \ libdbi \ mariadb \ @@ -843,6 +844,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ pps-tools \ raptor2 \ rdfind \ + re2 \ sdparm \ serial-forward \ read-edid \ diff --git a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.2.bb b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.2.bb deleted file mode 100644 index 4d5dbafb3..000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Userspace utilities for fs-verity" -DESCRIPTION = "fs-verity is a Linux kernel feature that does transparent \ -on-demand integrity/authenticity verification of the contents of read-only \ -files, using a hidden Merkle tree (hash tree) associated with the file. The \ -mechanism is similar to dm-verity, but implemented at the file level rather \ -than at the block device level." -HOMEPAGE = "https://www.kernel.org/doc/html/latest/filesystems/fsverity.html" -SECTION = "console" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bc974d217b525ea216a336adb73e1220" - -SRCREV = "406187bb3a885e083b448b2c2aa42c22957ae629" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git" - -S = "${WORKDIR}/git" - -DEPENDS = "openssl" - -EXTRA_OEMAKE += "PREFIX=${prefix} USE_SHARED_LIB=1" - -do_install() { - oe_runmake install DESTDIR=${D} -} - -PACKAGES =+ "libfsverity" -FILES_libfsverity = "${libdir}/libfsverity*${SOLIBS}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb new file mode 100644 index 000000000..9b1ba4f2e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb @@ -0,0 +1,31 @@ +SUMMARY = "Userspace utilities for fs-verity" +DESCRIPTION = "fs-verity is a Linux kernel feature that does transparent \ +on-demand integrity/authenticity verification of the contents of read-only \ +files, using a hidden Merkle tree (hash tree) associated with the file. The \ +mechanism is similar to dm-verity, but implemented at the file level rather \ +than at the block device level." +HOMEPAGE = "https://www.kernel.org/doc/html/latest/filesystems/fsverity.html" +SECTION = "console" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bc974d217b525ea216a336adb73e1220" + +SRCREV = "a92b1a54b003879322c044adf0ae3ea3e95e7348" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git" + +S = "${WORKDIR}/git" + +DEPENDS = "openssl" + +EXTRA_OEMAKE_append = "PREFIX=${prefix} USE_SHARED_LIB=1" +# We want to statically link the binary to libfsverity on native Windows +EXTRA_OEMAKE_remove_mingw32_class-nativesdk = "USE_SHARED_LIB=1" +EXTRA_OEMAKE_remove_mingw32_class-native = "USE_SHARED_LIB=1" + +do_install() { + oe_runmake install DESTDIR=${D} +} + +PACKAGES =+ "libfsverity" +FILES_libfsverity = "${libdir}/libfsverity*${SOLIBS}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch new file mode 100644 index 000000000..3cb2090d1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch @@ -0,0 +1,20 @@ +From f3713628fac72e45223013dcf8e37ac65d17d886 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 11 Jan 2021 15:16:57 -0800 +Subject: [PATCH] patch term module for mips ispeed/ospeed termios absense + +Upstream-Status: OE-Specific [needed on mips] + +Signed-off-by: Khem Raj +--- + go.mod | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/go.mod ++++ b/go.mod +@@ -54,3 +54,5 @@ require ( + gonum.org/v1/gonum v0.6.0 // indirect + google.golang.org/grpc v1.26.0 + ) ++ ++replace github.com/pkg/term => github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627 diff --git a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/influxdb b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/influxdb new file mode 100755 index 000000000..ffb29c3ae --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/influxdb @@ -0,0 +1,235 @@ +#!/bin/bash +### BEGIN INIT INFO +# Provides: influxd +# Required-Start: $all +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start the InfluxDB process +### END INIT INFO +set -x +# If you modify this, please make sure to also edit influxdb.service + +# Command-line options that can be set in /etc/default/influxdb. These will override +# any config file values. +DEFAULT=/etc/default/influxdb + +# Daemon options +INFLUXD_OPTS= + +# Process name ( For display ) +NAME=influxdb + +# User and group +USER=influxdb +GROUP=influxdb + +# Check for sudo or root privileges before continuing +if [ "$UID" != "0" ]; then + echo "You must be root to run this script" + exit 1 +fi + +# Daemon name, where is the actual executable If the daemon is not +# there, then exit. +DAEMON=/usr/bin/influxd +if [ ! -x $DAEMON ]; then + echo "Executable $DAEMON does not exist!" + exit 5 +fi + +# Configuration file +CONFIG=/etc/influxdb/influxdb.conf + +# PID file for the daemon +PIDFILE=/var/run/influxdb/influxd.pid +PIDDIR=`dirname $PIDFILE` +if [ ! -d "$PIDDIR" ]; then + mkdir -p $PIDDIR + chown $USER:$GROUP $PIDDIR +fi + +# Max open files +OPEN_FILE_LIMIT=65536 + +if [ -r /lib/lsb/init-functions ]; then + source /lib/lsb/init-functions +fi + +# Logging +if [ -z "$STDOUT" ]; then + STDOUT=/var/log/influxdb/influxd.log +fi + +if [ ! -f "$STDOUT" ]; then + mkdir -p $(dirname $STDOUT) +fi + +if [ -z "$STDERR" ]; then + STDERR=/var/log/influxdb/influxd.log +fi + +if [ ! -f "$STDERR" ]; then + mkdir -p $(dirname $STDERR) +fi + +# Override init script variables with DEFAULT values +if [ -r $DEFAULT ]; then + source $DEFAULT +fi + +function log_failure_msg() { + echo "$@" "[ FAILED ]" +} + +function log_success_msg() { + echo "$@" "[ OK ]" +} + +function start() { + # Check if config file exist + if [ ! -r $CONFIG ]; then + log_failure_msg "config file $CONFIG doesn't exist (or you don't have permission to view)" + exit 4 + fi + + # Check that the PID file exists, and check the actual status of process + if [ -f $PIDFILE ]; then + PID="$(cat $PIDFILE)" + if kill -0 "$PID" &>/dev/null; then + # Process is already up + log_success_msg "$NAME process is already running" + return 0 + fi + else + su -s /bin/sh -c "touch $PIDFILE" $USER &>/dev/null + if [ $? -ne 0 ]; then + log_failure_msg "$PIDFILE not writable, check permissions" + exit 5 + fi + fi + + # Bump the file limits, before launching the daemon. These will + # carry over to launched processes. + ulimit -n $OPEN_FILE_LIMIT + if [ $? -ne 0 ]; then + log_failure_msg "Unable to set ulimit to $OPEN_FILE_LIMIT" + exit 1 + fi + + # Launch process + echo "Starting $NAME..." + if command -v start-stop-daemon &>/dev/null; then + start-stop-daemon \ + --background \ + --chuid $USER:$GROUP \ + --start \ + --quiet \ + --pidfile $PIDFILE \ + --exec $DAEMON \ + -- \ + -config $CONFIG \ + $INFLUXD_OPTS >>$STDOUT 2>>$STDERR + else + local CMD="$DAEMON -config $CONFIG $INFLUXD_OPTS >>$STDOUT 2>>$STDERR &" + su -s /bin/sh -c "$CMD" $USER + fi + + # Sleep to verify process is still up + sleep 1 + echo $(pidof influxd) > $PIDFILE + if [ -f $PIDFILE ]; then + # PIDFILE exists + PID="$(cat $PIDFILE)" + if kill -0 "$PID" &>/dev/null; then + # PID up, service running + log_success_msg "$NAME process was started" + return 0 + fi + fi + log_failure_msg "$NAME process was unable to start" + exit 1 +} + +function stop() { + # Stop the daemon. + if [ -f $PIDFILE ]; then + local PID="$(cat $PIDFILE)" + if kill -0 $PID &>/dev/null; then + echo "Stopping $NAME..." + # Process still up, send SIGTERM and remove PIDFILE + kill -s TERM $PID &>/dev/null && rm -f "$PIDFILE" &>/dev/null + n=0 + while true; do + # Enter loop to ensure process is stopped + kill -0 $PID &>/dev/null + if [ "$?" != "0" ]; then + # Process stopped, break from loop + log_success_msg "$NAME process was stopped" + return 0 + fi + + # Process still up after signal, sleep and wait + sleep 1 + n=$(expr $n + 1) + if [ $n -eq 30 ]; then + # After 30 seconds, send SIGKILL + echo "Timeout exceeded, sending SIGKILL..." + kill -s KILL $PID &>/dev/null + elif [ $? -eq 40 ]; then + # After 40 seconds, error out + log_failure_msg "could not stop $NAME process" + exit 1 + fi + done + fi + fi + log_success_msg "$NAME process already stopped" +} + +function restart() { + # Restart the daemon. + stop + start +} + +function status() { + # Check the status of the process. + if [ -f $PIDFILE ]; then + PID="$(cat $PIDFILE)" + if kill -0 $PID &>/dev/null; then + log_success_msg "$NAME process is running" + exit 0 + fi + fi + log_failure_msg "$NAME process is not running" + exit 1 +} + +case $1 in + start) + start + ;; + + stop) + stop + ;; + + restart) + restart + ;; + + status) + status + ;; + + version) + $DAEMON version + ;; + + *) + # For invalid arguments, print the usage message. + echo "Usage: $0 {start|stop|restart|status|version}" + exit 2 + ;; +esac diff --git a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/influxdb.conf b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/influxdb.conf new file mode 100644 index 000000000..21c0926f2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb/influxdb.conf @@ -0,0 +1,586 @@ +### Welcome to the InfluxDB configuration file. + +# The values in this file override the default values used by the system if +# a config option is not specified. The commented out lines are the configuration +# field and the default value used. Uncommenting a line and changing the value +# will change the value used at runtime when the process is restarted. + +# Once every 24 hours InfluxDB will report usage data to usage.influxdata.com +# The data includes a random ID, os, arch, version, the number of series and other +# usage data. No data from user databases is ever transmitted. +# Change this option to true to disable reporting. +# reporting-disabled = false + +# Bind address to use for the RPC service for backup and restore. +# bind-address = "127.0.0.1:8088" + +### +### [meta] +### +### Controls the parameters for the Raft consensus group that stores metadata +### about the InfluxDB cluster. +### + +[meta] + # Where the metadata/raft database is stored + dir = "/var/lib/influxdb/meta" + + # Automatically create a default retention policy when creating a database. + # retention-autocreate = true + + # If log messages are printed for the meta service + # logging-enabled = true + +### +### [data] +### +### Controls where the actual shard data for InfluxDB lives and how it is +### flushed from the WAL. "dir" may need to be changed to a suitable place +### for your system, but the WAL settings are an advanced configuration. The +### defaults should work for most systems. +### + +[data] + # The directory where the TSM storage engine stores TSM files. + dir = "/var/lib/influxdb/data" + + # The directory where the TSM storage engine stores WAL files. + wal-dir = "/var/lib/influxdb/wal" + + # The amount of time that a write will wait before fsyncing. A duration + # greater than 0 can be used to batch up multiple fsync calls. This is useful for slower + # disks or when WAL write contention is seen. A value of 0s fsyncs every write to the WAL. + # Values in the range of 0-100ms are recommended for non-SSD disks. + # wal-fsync-delay = "0s" + + + # The type of shard index to use for new shards. The default is an in-memory index that is + # recreated at startup. A value of "tsi1" will use a disk based index that supports higher + # cardinality datasets. + # index-version = "inmem" + + # Trace logging provides more verbose output around the tsm engine. Turning + # this on can provide more useful output for debugging tsm engine issues. + # trace-logging-enabled = false + + # Whether queries should be logged before execution. Very useful for troubleshooting, but will + # log any sensitive data contained within a query. + # query-log-enabled = true + + # Validates incoming writes to ensure keys only have valid unicode characters. + # This setting will incur a small overhead because every key must be checked. + # validate-keys = false + + # Settings for the TSM engine + + # CacheMaxMemorySize is the maximum size a shard's cache can + # reach before it starts rejecting writes. + # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k). + # Values without a size suffix are in bytes. + # cache-max-memory-size = "1g" + + # CacheSnapshotMemorySize is the size at which the engine will + # snapshot the cache and write it to a TSM file, freeing up memory + # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k). + # Values without a size suffix are in bytes. + # cache-snapshot-memory-size = "25m" + + # CacheSnapshotWriteColdDuration is the length of time at + # which the engine will snapshot the cache and write it to + # a new TSM file if the shard hasn't received writes or deletes + # cache-snapshot-write-cold-duration = "10m" + + # CompactFullWriteColdDuration is the duration at which the engine + # will compact all TSM files in a shard if it hasn't received a + # write or delete + # compact-full-write-cold-duration = "4h" + + # The maximum number of concurrent full and level compactions that can run at one time. A + # value of 0 results in 50% of runtime.GOMAXPROCS(0) used at runtime. Any number greater + # than 0 limits compactions to that value. This setting does not apply + # to cache snapshotting. + # max-concurrent-compactions = 0 + + # CompactThroughput is the rate limit in bytes per second that we + # will allow TSM compactions to write to disk. Note that short bursts are allowed + # to happen at a possibly larger value, set by CompactThroughputBurst + # compact-throughput = "48m" + + # CompactThroughputBurst is the rate limit in bytes per second that we + # will allow TSM compactions to write to disk. + # compact-throughput-burst = "48m" + + # If true, then the mmap advise value MADV_WILLNEED will be provided to the kernel with respect to + # TSM files. This setting has been found to be problematic on some kernels, and defaults to off. + # It might help users who have slow disks in some cases. + # tsm-use-madv-willneed = false + + # Settings for the inmem index + + # The maximum series allowed per database before writes are dropped. This limit can prevent + # high cardinality issues at the database level. This limit can be disabled by setting it to + # 0. + # max-series-per-database = 1000000 + + # The maximum number of tag values per tag that are allowed before writes are dropped. This limit + # can prevent high cardinality tag values from being written to a measurement. This limit can be + # disabled by setting it to 0. + # max-values-per-tag = 100000 + + # Settings for the tsi1 index + + # The threshold, in bytes, when an index write-ahead log file will compact + # into an index file. Lower sizes will cause log files to be compacted more + # quickly and result in lower heap usage at the expense of write throughput. + # Higher sizes will be compacted less frequently, store more series in-memory, + # and provide higher write throughput. + # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k). + # Values without a size suffix are in bytes. + # max-index-log-file-size = "1m" + + # The size of the internal cache used in the TSI index to store previously + # calculated series results. Cached results will be returned quickly from the cache rather + # than needing to be recalculated when a subsequent query with a matching tag key/value + # predicate is executed. Setting this value to 0 will disable the cache, which may + # lead to query performance issues. + # This value should only be increased if it is known that the set of regularly used + # tag key/value predicates across all measurements for a database is larger than 100. An + # increase in cache size may lead to an increase in heap usage. + series-id-set-cache-size = 100 + +### +### [coordinator] +### +### Controls the clustering service configuration. +### + +[coordinator] + # The default time a write request will wait until a "timeout" error is returned to the caller. + # write-timeout = "10s" + + # The maximum number of concurrent queries allowed to be executing at one time. If a query is + # executed and exceeds this limit, an error is returned to the caller. This limit can be disabled + # by setting it to 0. + # max-concurrent-queries = 0 + + # The maximum time a query will is allowed to execute before being killed by the system. This limit + # can help prevent run away queries. Setting the value to 0 disables the limit. + # query-timeout = "0s" + + # The time threshold when a query will be logged as a slow query. This limit can be set to help + # discover slow or resource intensive queries. Setting the value to 0 disables the slow query logging. + # log-queries-after = "0s" + + # The maximum number of points a SELECT can process. A value of 0 will make + # the maximum point count unlimited. This will only be checked every second so queries will not + # be aborted immediately when hitting the limit. + # max-select-point = 0 + + # The maximum number of series a SELECT can run. A value of 0 will make the maximum series + # count unlimited. + # max-select-series = 0 + + # The maximum number of group by time bucket a SELECT can create. A value of zero will max the maximum + # number of buckets unlimited. + # max-select-buckets = 0 + +### +### [retention] +### +### Controls the enforcement of retention policies for evicting old data. +### + +[retention] + # Determines whether retention policy enforcement enabled. + # enabled = true + + # The interval of time when retention policy enforcement checks run. + # check-interval = "30m" + +### +### [shard-precreation] +### +### Controls the precreation of shards, so they are available before data arrives. +### Only shards that, after creation, will have both a start- and end-time in the +### future, will ever be created. Shards are never precreated that would be wholly +### or partially in the past. + +[shard-precreation] + # Determines whether shard pre-creation service is enabled. + # enabled = true + + # The interval of time when the check to pre-create new shards runs. + # check-interval = "10m" + + # The default period ahead of the endtime of a shard group that its successor + # group is created. + # advance-period = "30m" + +### +### Controls the system self-monitoring, statistics and diagnostics. +### +### The internal database for monitoring data is created automatically if +### if it does not already exist. The target retention within this database +### is called 'monitor' and is also created with a retention period of 7 days +### and a replication factor of 1, if it does not exist. In all cases the +### this retention policy is configured as the default for the database. + +[monitor] + # Whether to record statistics internally. + # store-enabled = true + + # The destination database for recorded statistics + # store-database = "_internal" + + # The interval at which to record statistics + # store-interval = "10s" + +### +### [http] +### +### Controls how the HTTP endpoints are configured. These are the primary +### mechanism for getting data into and out of InfluxDB. +### + +[http] + # Determines whether HTTP endpoint is enabled. + # enabled = true + + # Determines whether the Flux query endpoint is enabled. + # flux-enabled = false + + # Determines whether the Flux query logging is enabled. + # flux-log-enabled = false + + # The bind address used by the HTTP service. + # bind-address = ":8086" + + # Determines whether user authentication is enabled over HTTP/HTTPS. + # auth-enabled = false + + # The default realm sent back when issuing a basic auth challenge. + # realm = "InfluxDB" + + # Determines whether HTTP request logging is enabled. + # log-enabled = true + + # Determines whether the HTTP write request logs should be suppressed when the log is enabled. + # suppress-write-log = false + + # When HTTP request logging is enabled, this option specifies the path where + # log entries should be written. If unspecified, the default is to write to stderr, which + # intermingles HTTP logs with internal InfluxDB logging. + # + # If influxd is unable to access the specified path, it will log an error and fall back to writing + # the request log to stderr. + # access-log-path = "" + + # Filters which requests should be logged. Each filter is of the pattern NNN, NNX, or NXX where N is + # a number and X is a wildcard for any number. To filter all 5xx responses, use the string 5xx. + # If multiple filters are used, then only one has to match. The default is to have no filters which + # will cause every request to be printed. + # access-log-status-filters = [] + + # Determines whether detailed write logging is enabled. + # write-tracing = false + + # Determines whether the pprof endpoint is enabled. This endpoint is used for + # troubleshooting and monitoring. + # pprof-enabled = true + + # Enables authentication on pprof endpoints. Users will need admin permissions + # to access the pprof endpoints when this setting is enabled. This setting has + # no effect if either auth-enabled or pprof-enabled are set to false. + # pprof-auth-enabled = false + + # Enables a pprof endpoint that binds to localhost:6060 immediately on startup. + # This is only needed to debug startup issues. + # debug-pprof-enabled = false + + # Enables authentication on the /ping, /metrics, and deprecated /status + # endpoints. This setting has no effect if auth-enabled is set to false. + # ping-auth-enabled = false + + # Determines whether HTTPS is enabled. + # https-enabled = false + + # The SSL certificate to use when HTTPS is enabled. + # https-certificate = "/etc/ssl/influxdb.pem" + + # Use a separate private key location. + # https-private-key = "" + + # The JWT auth shared secret to validate requests using JSON web tokens. + # shared-secret = "" + + # The default chunk size for result sets that should be chunked. + # max-row-limit = 0 + + # The maximum number of HTTP connections that may be open at once. New connections that + # would exceed this limit are dropped. Setting this value to 0 disables the limit. + # max-connection-limit = 0 + + # Enable http service over unix domain socket + # unix-socket-enabled = false + + # The path of the unix domain socket. + # bind-socket = "/var/run/influxdb.sock" + + # The maximum size of a client request body, in bytes. Setting this value to 0 disables the limit. + # max-body-size = 25000000 + + # The maximum number of writes processed concurrently. + # Setting this to 0 disables the limit. + # max-concurrent-write-limit = 0 + + # The maximum number of writes queued for processing. + # Setting this to 0 disables the limit. + # max-enqueued-write-limit = 0 + + # The maximum duration for a write to wait in the queue to be processed. + # Setting this to 0 or setting max-concurrent-write-limit to 0 disables the limit. + # enqueued-write-timeout = 0 + +### +### [logging] +### +### Controls how the logger emits logs to the output. +### + +[logging] + # Determines which log encoder to use for logs. Available options + # are auto, logfmt, and json. auto will use a more a more user-friendly + # output format if the output terminal is a TTY, but the format is not as + # easily machine-readable. When the output is a non-TTY, auto will use + # logfmt. + # format = "auto" + + # Determines which level of logs will be emitted. The available levels + # are error, warn, info, and debug. Logs that are equal to or above the + # specified level will be emitted. + # level = "info" + + # Suppresses the logo output that is printed when the program is started. + # The logo is always suppressed if STDOUT is not a TTY. + # suppress-logo = false + +### +### [subscriber] +### +### Controls the subscriptions, which can be used to fork a copy of all data +### received by the InfluxDB host. +### + +[subscriber] + # Determines whether the subscriber service is enabled. + # enabled = true + + # The default timeout for HTTP writes to subscribers. + # http-timeout = "30s" + + # Allows insecure HTTPS connections to subscribers. This is useful when testing with self- + # signed certificates. + # insecure-skip-verify = false + + # The path to the PEM encoded CA certs file. If the empty string, the default system certs will be used + # ca-certs = "" + + # The number of writer goroutines processing the write channel. + # write-concurrency = 40 + + # The number of in-flight writes buffered in the write channel. + # write-buffer-size = 1000 + + +### +### [[graphite]] +### +### Controls one or many listeners for Graphite data. +### + +[[graphite]] + # Determines whether the graphite endpoint is enabled. + # enabled = false + # database = "graphite" + # retention-policy = "" + # bind-address = ":2003" + # protocol = "tcp" + # consistency-level = "one" + + # These next lines control how batching works. You should have this enabled + # otherwise you could get dropped metrics or poor performance. Batching + # will buffer points in memory if you have many coming in. + + # Flush if this many points get buffered + # batch-size = 5000 + + # number of batches that may be pending in memory + # batch-pending = 10 + + # Flush at least this often even if we haven't hit buffer limit + # batch-timeout = "1s" + + # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max. + # udp-read-buffer = 0 + + ### This string joins multiple matching 'measurement' values providing more control over the final measurement name. + # separator = "." + + ### Default tags that will be added to all metrics. These can be overridden at the template level + ### or by tags extracted from metric + # tags = ["region=us-east", "zone=1c"] + + ### Each template line requires a template pattern. It can have an optional + ### filter before the template and separated by spaces. It can also have optional extra + ### tags following the template. Multiple tags should be separated by commas and no spaces + ### similar to the line protocol format. There can be only one default template. + # templates = [ + # "*.app env.service.resource.measurement", + # # Default template + # "server.*", + # ] + +### +### [collectd] +### +### Controls one or many listeners for collectd data. +### + +[[collectd]] + # enabled = false + # bind-address = ":25826" + # database = "collectd" + # retention-policy = "" + # + # The collectd service supports either scanning a directory for multiple types + # db files, or specifying a single db file. + # typesdb = "/usr/local/share/collectd" + # + # security-level = "none" + # auth-file = "/etc/collectd/auth_file" + + # These next lines control how batching works. You should have this enabled + # otherwise you could get dropped metrics or poor performance. Batching + # will buffer points in memory if you have many coming in. + + # Flush if this many points get buffered + # batch-size = 5000 + + # Number of batches that may be pending in memory + # batch-pending = 10 + + # Flush at least this often even if we haven't hit buffer limit + # batch-timeout = "10s" + + # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max. + # read-buffer = 0 + + # Multi-value plugins can be handled two ways. + # "split" will parse and store the multi-value plugin data into separate measurements + # "join" will parse and store the multi-value plugin as a single multi-value measurement. + # "split" is the default behavior for backward compatibility with previous versions of influxdb. + # parse-multivalue-plugin = "split" +### +### [opentsdb] +### +### Controls one or many listeners for OpenTSDB data. +### + +[[opentsdb]] + # enabled = false + # bind-address = ":4242" + # database = "opentsdb" + # retention-policy = "" + # consistency-level = "one" + # tls-enabled = false + # certificate= "/etc/ssl/influxdb.pem" + + # Log an error for every malformed point. + # log-point-errors = true + + # These next lines control how batching works. You should have this enabled + # otherwise you could get dropped metrics or poor performance. Only points + # metrics received over the telnet protocol undergo batching. + + # Flush if this many points get buffered + # batch-size = 1000 + + # Number of batches that may be pending in memory + # batch-pending = 5 + + # Flush at least this often even if we haven't hit buffer limit + # batch-timeout = "1s" + +### +### [[udp]] +### +### Controls the listeners for InfluxDB line protocol data via UDP. +### + +[[udp]] + # enabled = false + # bind-address = ":8089" + # database = "udp" + # retention-policy = "" + + # InfluxDB precision for timestamps on received points ("" or "n", "u", "ms", "s", "m", "h") + # precision = "" + + # These next lines control how batching works. You should have this enabled + # otherwise you could get dropped metrics or poor performance. Batching + # will buffer points in memory if you have many coming in. + + # Flush if this many points get buffered + # batch-size = 5000 + + # Number of batches that may be pending in memory + # batch-pending = 10 + + # Will flush at least this often even if we haven't hit buffer limit + # batch-timeout = "1s" + + # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max. + # read-buffer = 0 + +### +### [continuous_queries] +### +### Controls how continuous queries are run within InfluxDB. +### + +[continuous_queries] + # Determines whether the continuous query service is enabled. + # enabled = true + + # Controls whether queries are logged when executed by the CQ service. + # log-enabled = true + + # Controls whether queries are logged to the self-monitoring data store. + # query-stats-enabled = false + + # interval for how often continuous queries will be checked if they need to run + # run-interval = "1s" + +### +### [tls] +### +### Global configuration settings for TLS in InfluxDB. +### + +[tls] + # Determines the available set of cipher suites. See https://golang.org/pkg/crypto/tls/#pkg-constants + # for a list of available ciphers, which depends on the version of Go (use the query + # SHOW DIAGNOSTICS to see the version of Go used to build InfluxDB). If not specified, uses + # the default settings from Go's crypto/tls package. + # ciphers = [ + # "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305", + # "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", + # ] + + # Minimum version of the tls protocol that will be negotiated. If not specified, uses the + # default settings from Go's crypto/tls package. + # min-version = "tls1.2" + + # Maximum version of the tls protocol that will be negotiated. If not specified, uses the + # default settings from Go's crypto/tls package. + # max-version = "tls1.3" diff --git a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb new file mode 100644 index 000000000..06f794764 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb @@ -0,0 +1,65 @@ +DESCRIPTION = "InfluxDB is a time series database designed to handle high write and query loads." +HOMEPAGE = "https://www.influxdata.com/products/influxdb-overview/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=ba8146ad9cc2a128209983265136e06a" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +RDEPENDS_${PN} = "bash" +RDEPENDS_${PN}-dev = "bash" + +GO_IMPORT = "github.com/influxdata/influxdb" + +GO_INSTALL = "\ + ${GO_IMPORT}/cmd/influx \ + ${GO_IMPORT}/cmd/influxd \ +" + +SRC_URI = "\ + git://${GO_IMPORT};protocol=https;branch=1.7;destsuffix=${BPN}-${PV}/src/${GO_IMPORT} \ + file://influxdb \ + file://influxdb.conf \ +" + +SRC_URI_append_mipsarch = " file://0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch;patchdir=src/${GO_IMPORT}" + +SRCREV = "c958f436b2e538a88a7815aad721c7774a0b8f63" + +inherit go-mod systemd update-rc.d useradd + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" + +do_install_prepend() { + rm ${B}/src/${GO_IMPORT}/build.py + rm ${B}/src/${GO_IMPORT}/build.sh + rm ${B}/src/${GO_IMPORT}/Dockerfile* +} + +do_install_append() { + install -d ${D}${sysconfdir}/influxdb + install -m 0644 ${WORKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb + chown -R root.influxdb ${D}${sysconfdir}/influxdb + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb + + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ] ; then + install -d ${D}${sysconfdir}/logrotate.d + install -m 0644 ${S}/src/${GO_IMPORT}/scripts/logrotate ${D}${sysconfdir}/logrotate.d/influxdb + fi + + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ] ; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${S}/src/${GO_IMPORT}/scripts/influxdb.service ${D}${systemd_system_unitdir}/influxdb.service + fi + + # TODO chown +} + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME = "influxdb" +INITSCRIPT_PARAMS = "defaults" + +SYSTEMD_SERVICE_${PN} = "influxdb.service" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb deleted file mode 100644 index 73b2a0980..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb +++ /dev/null @@ -1,20 +0,0 @@ -require mariadb.inc -inherit native - -PROVIDES += "mysql5-native" -DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native" - -RDEPENDS_${PN} = "" -PACKAGES = "" -EXTRA_OEMAKE = "" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ - install -m 0755 sql/gen_lex_token ${D}${bindir}/ - install -m 0755 extra/comp_err ${D}${bindir}/ - install -m 0755 scripts/comp_sql ${D}${bindir}/ -} - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.8.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.8.bb new file mode 100644 index 000000000..73b2a0980 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.8.bb @@ -0,0 +1,20 @@ +require mariadb.inc +inherit native + +PROVIDES += "mysql5-native" +DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native" + +RDEPENDS_${PN} = "" +PACKAGES = "" +EXTRA_OEMAKE = "" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + + install -d ${D}${bindir} + install -m 0755 sql/gen_lex_hash ${D}${bindir}/ + install -m 0755 sql/gen_lex_token ${D}${bindir}/ + install -m 0755 extra/comp_err ${D}${bindir}/ + install -m 0755 scripts/comp_sql ${D}${bindir}/ +} + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index e3ce29761..27eede6c3 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -20,8 +20,9 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://fix-arm-atomic.patch \ file://0001-Fix-library-LZ4-lookup.patch \ file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ + file://0001-stacktrace-t.c-make-the-test-conditional.patch \ " -SRC_URI[sha256sum] = "ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4" +SRC_URI[sha256sum] = "eb4824f6f2c532cd3fc6a6bce7bf78ea7c6b949f8bdd07656b2c84344e757be8" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -62,6 +63,7 @@ PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" PACKAGECONFIG[krb5] = ", ,krb5" PACKAGECONFIG[setupdb] = ", ,,${PN}-setupdb" +PACKAGECONFIG[zstd] = "-DWITH_ROCKSDB_ZSTD=ON,-DWITH_ROCKSDB_ZSTD=OFF,zstd" # MariaDB doesn't link properly with gold # https://mariadb.atlassian.net/browse/MDEV-5982 diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-stacktrace-t.c-make-the-test-conditional.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-stacktrace-t.c-make-the-test-conditional.patch new file mode 100644 index 000000000..d8f672d74 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-stacktrace-t.c-make-the-test-conditional.patch @@ -0,0 +1,38 @@ +From 966cbeb309f867ff4ac8e7f4462be4780e421700 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 25 Jan 2021 19:01:06 -0800 +Subject: [PATCH] stacktrace-t.c: make the test conditional + +Fixes: +/prj/tmp/work/cortexa57-poky-linux-musl/mariadb/10.5.8-r0/recipe-sysroot-native/usr/bin/aarch64-poky-linux-musl/../../libexec/aarch64-poky-linux-musl/gcc/aarch64-poky-linux-musl/10.2.0/ld.bfd: /usr/src/debug/mariadb/10.5.8-r0/mariadb-10.5.8/unittest/mysys/stacktrace-t.c:36: undefined reference to `my_safe_print_str' + +Upstream-Status: Submitted [https://jira.mariadb.org/browse/MDEV-24131] + +Signed-off-by: Mingli Yu +--- + unittest/mysys/stacktrace-t.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c +index 8fa0db15b36..d8408f80d76 100644 +--- a/unittest/mysys/stacktrace-t.c ++++ b/unittest/mysys/stacktrace-t.c +@@ -29,6 +29,7 @@ void test_my_safe_print_str() + memcpy(b_stack, "LEGAL", 6); + memcpy(b_bss, "LEGAL", 6); + ++#ifdef HAVE_STACKTRACE + #ifndef __SANITIZE_ADDRESS__ + fprintf(stderr, "\n===== stack =====\n"); + my_safe_print_str(b_stack, 65535); +@@ -48,6 +49,7 @@ void test_my_safe_print_str() + fprintf(stderr, "\n===== (const char*) 1 =====\n"); + my_safe_print_str((const char*)1, 5); + #endif /*__SANITIZE_ADDRESS__*/ ++#endif /*HAVE_STACKTRACE*/ + + free(b_heap); + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch index 36217f9aa..32c9818ab 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch @@ -17,10 +17,10 @@ Signed-off-by: Mingli Yu 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/configure.cmake b/configure.cmake -index a355214..6ee595f 100644 +index bb3ad43..2ff4f19 100644 --- a/configure.cmake +++ b/configure.cmake -@@ -865,7 +865,25 @@ int main() +@@ -861,7 +861,25 @@ int main() long long int *ptr= &var; return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); }" @@ -48,11 +48,11 @@ index a355214..6ee595f 100644 IF(WITH_VALGRIND) SET(HAVE_valgrind 1) diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt -index 3d8a20e..42f1441 100644 +index 6a3a1ef..e306ae7 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt -@@ -129,6 +129,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} - ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO}) +@@ -140,6 +140,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} + ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO}) DTRACE_INSTRUMENT(mysys) +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) @@ -63,10 +63,10 @@ index 3d8a20e..42f1441 100644 TARGET_LINK_LIBRARIES(mysys bfd) ENDIF(HAVE_BFD_H) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt -index 616017b..53575f6 100644 +index 4978d01..883a930 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt -@@ -219,6 +219,10 @@ ELSE() +@@ -220,6 +220,10 @@ ELSE() SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) ENDIF() diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb deleted file mode 100644 index e6743fe97..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb +++ /dev/null @@ -1,27 +0,0 @@ -require mariadb.inc - -EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" - -DEPENDS += "mariadb-native bison-native libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" - -PROVIDES += "mysql5 libmysqlclient" - -RPROVIDES_${PN} += "mysql5" -RREPLACES_${PN} += "mysql5" -RCONFLICTS_${PN} += "mysql5" - -RPROVIDES_${PN}-dbg += "mysql5-dbg" -RREPLACES_${PN}-dbg += "mysql5-dbg" -RCONFLICTS_${PN}-dbg += "mysql5-dbg" - -RPROVIDES_${PN}-leftovers += "mysql5-leftovers" -RREPLACES_${PN}-leftovers += "mysql5-leftovers" -RCONFLICTS_${PN}-leftovers += "mysql5-leftovers" - -RPROVIDES_${PN}-client += "mysql5-client" -RREPLACES_${PN}-client += "mysql5-client" -RCONFLICTS_${PN}-client += "mysql5-client" - -RPROVIDES_${PN}-server += "mysql5-server" -RREPLACES_${PN}-server += "mysql5-server" -RCONFLICTS_${PN}-server += "mysql5-server" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.8.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.8.bb new file mode 100644 index 000000000..e6743fe97 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.8.bb @@ -0,0 +1,27 @@ +require mariadb.inc + +EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" + +DEPENDS += "mariadb-native bison-native libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" + +PROVIDES += "mysql5 libmysqlclient" + +RPROVIDES_${PN} += "mysql5" +RREPLACES_${PN} += "mysql5" +RCONFLICTS_${PN} += "mysql5" + +RPROVIDES_${PN}-dbg += "mysql5-dbg" +RREPLACES_${PN}-dbg += "mysql5-dbg" +RCONFLICTS_${PN}-dbg += "mysql5-dbg" + +RPROVIDES_${PN}-leftovers += "mysql5-leftovers" +RREPLACES_${PN}-leftovers += "mysql5-leftovers" +RCONFLICTS_${PN}-leftovers += "mysql5-leftovers" + +RPROVIDES_${PN}-client += "mysql5-client" +RREPLACES_${PN}-client += "mysql5-client" +RCONFLICTS_${PN}-client += "mysql5-client" + +RPROVIDES_${PN}-server += "mysql5-server" +RREPLACES_${PN}-server += "mysql5-server" +RCONFLICTS_${PN}-server += "mysql5-server" diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Add-RISCV-support-to-GetProgramCounter.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Add-RISCV-support-to-GetProgramCounter.patch deleted file mode 100644 index 95ec070f6..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Add-RISCV-support-to-GetProgramCounter.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 983eeae0792946fe5c090f95164c892ec6db5cc4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 16 Feb 2020 16:22:53 -0800 -Subject: [PATCH] Add RISCV support to GetProgramCounter() - -Identify PC register from signal context - -Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/621] -Signed-off-by: Khem Raj ---- - absl/debugging/internal/examine_stack.cc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc -index 4739fbc..fb77450 100644 ---- a/absl/debugging/internal/examine_stack.cc -+++ b/absl/debugging/internal/examine_stack.cc -@@ -53,6 +53,8 @@ void* GetProgramCounter(void* vuc) { - return reinterpret_cast(context->uc_mcontext.gp_regs[32]); - #elif defined(__powerpc__) - return reinterpret_cast(context->uc_mcontext.regs->nip); -+#elif defined(__riscv) -+ return reinterpret_cast(context->uc_mcontext.__gregs[REG_PC]); - #elif defined(__s390__) && !defined(__s390x__) - return reinterpret_cast(context->uc_mcontext.psw.addr & 0x7fffffff); - #elif defined(__s390__) && defined(__s390x__) --- -2.25.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Fix-build-on-riscv32.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Fix-build-on-riscv32.patch deleted file mode 100644 index e7c9b43c2..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 04e28fdda03b545a0f7b446a784ec2fa7249cbb8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 29 Apr 2020 15:37:40 -0700 -Subject: [PATCH] Fix build on riscv32 - -Define __NR_mmap in terms of __NR_mmap2 and __NR_futex interms of -__NR_futex_time64 for rv32, since there calls dont exist for rv32 - -Also recognise rv32 as a new 32bit platform - -Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/675] -Signed-off-by: Khem Raj ---- - absl/base/internal/direct_mmap.h | 5 +++++ - absl/base/internal/spinlock_linux.inc | 4 ++++ - absl/synchronization/internal/waiter.cc | 4 ++++ - 3 files changed, 13 insertions(+) - -diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h -index 5618867..90cfeca 100644 ---- a/absl/base/internal/direct_mmap.h -+++ b/absl/base/internal/direct_mmap.h -@@ -26,6 +26,10 @@ - - #ifdef __linux__ - -+#if !defined(__NR_mmap) && defined(__riscv) && __riscv_xlen == 32 -+# define __NR_mmap __NR_mmap2 -+#endif -+ - #include - #ifdef __BIONIC__ - #include -@@ -72,6 +76,7 @@ inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, - #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ - (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \ - (defined(__PPC__) && !defined(__PPC64__)) || \ -+ (defined(__riscv) && __riscv_xlen == 32) || \ - (defined(__s390__) && !defined(__s390x__)) - // On these architectures, implement mmap with mmap2. - static int pagesize = 0; -diff --git a/absl/base/internal/spinlock_linux.inc b/absl/base/internal/spinlock_linux.inc -index 323edd6..3dca444 100644 ---- a/absl/base/internal/spinlock_linux.inc -+++ b/absl/base/internal/spinlock_linux.inc -@@ -14,6 +14,10 @@ - // - // This file is a Linux-specific part of spinlock_wait.cc - -+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 -+# define __NR_futex __NR_futex_time64 -+#endif -+ - #include - #include - #include -diff --git a/absl/synchronization/internal/waiter.cc b/absl/synchronization/internal/waiter.cc -index 2949f5a..7411042 100644 ---- a/absl/synchronization/internal/waiter.cc -+++ b/absl/synchronization/internal/waiter.cc -@@ -24,6 +24,10 @@ - #include - #endif - -+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 -+# define __NR_futex __NR_futex_time64 -+#endif -+ - #ifdef __linux__ - #include - #include --- -2.26.2 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Remove-maes-option-from-cross-compilation.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Remove-maes-option-from-cross-compilation.patch deleted file mode 100644 index 4c41cd890..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Remove-maes-option-from-cross-compilation.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 70926666f7c5c35add363e3bcade6eaabace7206 Mon Sep 17 00:00:00 2001 -From: Sinan Kaya -Date: Mon, 3 Feb 2020 03:25:57 +0000 -Subject: [PATCH] Remove maes option from cross-compilation - ---- - absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- - absl/copts/GENERATED_copts.bzl | 4 ---- - absl/copts/copts.py | 4 ---- - 3 files changed, 12 deletions(-) - -diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake -index 01bd40b..af99694 100644 ---- a/absl/copts/GENERATED_AbseilCopts.cmake -+++ b/absl/copts/GENERATED_AbseilCopts.cmake -@@ -230,7 +230,3 @@ list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS - "/Ob2" - ) - --list(APPEND ABSL_RANDOM_HWAES_X64_FLAGS -- "-maes" -- "-msse4.1" --) -diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl -index 82f332f..9a548d1 100644 ---- a/absl/copts/GENERATED_copts.bzl -+++ b/absl/copts/GENERATED_copts.bzl -@@ -231,7 +231,3 @@ ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [ - "/Ob2", - ] - --ABSL_RANDOM_HWAES_X64_FLAGS = [ -- "-maes", -- "-msse4.1", --] -diff --git a/absl/copts/copts.py b/absl/copts/copts.py -index 068abce..c2f70fb 100644 ---- a/absl/copts/copts.py -+++ b/absl/copts/copts.py -@@ -203,10 +203,6 @@ COPT_VARS = { - # to improve performance of some random bit generators. - "ABSL_RANDOM_HWAES_ARM64_FLAGS": ["-march=armv8-a+crypto"], - "ABSL_RANDOM_HWAES_ARM32_FLAGS": ["-mfpu=neon"], -- "ABSL_RANDOM_HWAES_X64_FLAGS": [ -- "-maes", -- "-msse4.1", -- ], - "ABSL_RANDOM_HWAES_MSVC_X64_FLAGS": [ - "/O2", # Maximize speed - "/Ob2", # Aggressive inlining --- -2.23.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch index 6bb59d933..2bafcc6b1 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From 14229e8c6f42a96e4d725124193ceefa54e5e1a4 Mon Sep 17 00:00:00 2001 +From 8f21fdfb83b0fa844a9f1f03a86a9ca46642d85e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 9 Apr 2020 13:06:27 -0700 -Subject: [PATCH] absl: always use +Subject: [PATCH 1/2] absl: always use Fixes mips/musl build, since sgidefs.h is not present on all C libraries but on linux asm/sgidefs.h is there and contains same definitions, using @@ -15,7 +15,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h -index 2e5e422..c515325 100644 +index 16accf096604..ba7936cc934e 100644 --- a/absl/base/internal/direct_mmap.h +++ b/absl/base/internal/direct_mmap.h @@ -41,13 +41,9 @@ @@ -34,5 +34,5 @@ index 2e5e422..c515325 100644 // SYS_mmap and SYS_munmap are not defined in Android. -- -2.26.0 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Add-forgotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Add-forgotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch deleted file mode 100644 index fab4a738e..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Add-forgotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9384735383a0b8688e3f05ed23a53f18863eae20 Mon Sep 17 00:00:00 2001 -From: Sinan Kaya -Date: Tue, 11 Feb 2020 11:36:00 -0500 -Subject: [PATCH] Add forgotten ABSL_HAVE_VDSO_SUPPORT conditional - -Signed-off-by: Sinan Kaya ---- - absl/debugging/internal/stacktrace_x86-inl.inc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/absl/debugging/internal/stacktrace_x86-inl.inc b/absl/debugging/internal/stacktrace_x86-inl.inc -index ff0fd31..28607c3 100644 ---- a/absl/debugging/internal/stacktrace_x86-inl.inc -+++ b/absl/debugging/internal/stacktrace_x86-inl.inc -@@ -171,6 +171,7 @@ static void **NextStackFrame(void **old_fp, const void *uc) { - static const unsigned char *kernel_rt_sigreturn_address = nullptr; - static const unsigned char *kernel_vsyscall_address = nullptr; - if (num_push_instructions == -1) { -+#ifdef ABSL_HAVE_VDSO_SUPPORT - absl::debugging_internal::VDSOSupport vdso; - if (vdso.IsPresent()) { - absl::debugging_internal::VDSOSupport::SymbolInfo -@@ -199,6 +200,9 @@ static void **NextStackFrame(void **old_fp, const void *uc) { - } else { - num_push_instructions = 0; - } -+#else -+ num_push_instructions = 0; -+#endif - } - if (num_push_instructions != 0 && kernel_rt_sigreturn_address != nullptr && - old_fp[1] == kernel_rt_sigreturn_address) { --- -2.20.1.windows.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch new file mode 100644 index 000000000..da9dbd936 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch @@ -0,0 +1,37 @@ +From a9e15a4855c82eb948dedeecd83d5e17c3c8f767 Mon Sep 17 00:00:00 2001 +From: Sinan Kaya +Date: Mon, 3 Feb 2020 03:25:57 +0000 +Subject: [PATCH 2/2] Remove maes option from cross-compilation + +--- + absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- + absl/copts/GENERATED_copts.bzl | 4 ---- + 2 files changed, 8 deletions(-) + +diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake +index 97bd283eb739..ce29ac031b9c 100644 +--- a/absl/copts/GENERATED_AbseilCopts.cmake ++++ b/absl/copts/GENERATED_AbseilCopts.cmake +@@ -210,7 +210,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS + list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS + ) + +-list(APPEND ABSL_RANDOM_HWAES_X64_FLAGS +- "-maes" +- "-msse4.1" +-) +diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl +index bcdd61ef8211..3e8eddd4bb08 100644 +--- a/absl/copts/GENERATED_copts.bzl ++++ b/absl/copts/GENERATED_copts.bzl +@@ -211,7 +211,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [ + ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [ + ] + +-ABSL_RANDOM_HWAES_X64_FLAGS = [ +- "-maes", +- "-msse4.1", +-] +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Add-fPIC-option.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Add-fPIC-option.patch deleted file mode 100644 index bb78813a7..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Add-fPIC-option.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d7160d647c8f8847f3ea8d7b0eb222936962c1af Mon Sep 17 00:00:00 2001 -From: Sinan Kaya -Date: Tue, 11 Feb 2020 11:58:02 -0500 -Subject: [PATCH] Add fPIC option - -Signed-off-by: Sinan Kaya ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 74a3a4c..4f837b3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -79,6 +79,9 @@ option(ABSL_USE_GOOGLETEST_HEAD - - option(ABSL_RUN_TESTS "If ON, Abseil tests will be run." OFF) - -+# link fails on arm64 and x86-64 without this -+add_compile_options(-fPIC) -+ - if(${ABSL_RUN_TESTS}) - # enable CTest. This will set BUILD_TESTING to ON unless otherwise specified - # on the command line --- -2.20.1.windows.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index 8efa31e95..cc7bf01d7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -7,16 +7,12 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" -PV = "20190808+git${SRCPV}" -SRCREV = "aa844899c937bde5d2b24f276b59997e5b668bde" -BRANCH = "lts_2019_08_08" -SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ - file://0001-Remove-maes-option-from-cross-compilation.patch \ - file://0002-Add-forgotten-ABSL_HAVE_VDSO_SUPPORT-conditional.patch \ - file://0003-Add-fPIC-option.patch \ - file://0001-Add-RISCV-support-to-GetProgramCounter.patch \ - file://0001-absl-always-use-asm-sgidefs.h.patch \ - file://0001-Fix-build-on-riscv32.patch \ +PV = "20200923+git${SRCPV}" +SRCREV = "6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c" +BRANCH = "lts_2020_09_23" +SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ + file://0001-absl-always-use-asm-sgidefs.h.patch \ + file://0002-Remove-maes-option-from-cross-compilation.patch \ " S = "${WORKDIR}/git" @@ -28,9 +24,16 @@ ASNEEDED_class-nativesdk = "" inherit cmake +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ + -DBUILD_TESTING=OFF \ + " + BBCLASSEXTEND = "native nativesdk" ALLOW_EMPTY_${PN} = "1" +FILES_${PN} = "${libdir}/libabsl_*.so ${libdir}/cmake" +FILES_${PN}-dev = "${includedir}" + python () { arch = d.getVar("TARGET_ARCH") @@ -55,4 +58,3 @@ python () { raise bb.parse.SkipRecipe("%s-%s Needs support for corei7 on x86_64" % (pkgn, pkgv)) } - diff --git a/meta-openembedded/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb b/meta-openembedded/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb index a54a7331d..604135839 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb @@ -19,7 +19,7 @@ S = "${WORKDIR}/${BPN}" SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711" SRC_URI[sha256sum] = "f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e" -inherit native texinfo +inherit texinfo native DEPENDS += "m4-native gnu-config-native" RDEPENDS_${PN} = "m4-native gnu-config-native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb index fb4be0f16..bbc2a4a1d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb @@ -17,6 +17,8 @@ SRCREV = "6df40a2471737b27271bdd9b900ab5f3aec746c7" SRC_URI = "git://github.com/google/flatbuffers.git" +CVE_CHECK_WHITELIST += "CVE-2020-35864" + CXXFLAGS += "-fPIC" BUILD_CXXFLAGS += "-fPIC" diff --git a/meta-openembedded/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch b/meta-openembedded/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch new file mode 100644 index 000000000..9957be82f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch @@ -0,0 +1,23 @@ +From 799eb6a3af8a3dd81e2429bf11a72a57e541f908 Mon Sep 17 00:00:00 2001 +From: "Eric S. Raymond" +Date: Sun, 17 Mar 2019 12:37:21 -0400 +Subject: [PATCH] Address SF bug #119: MemorySanitizer: FPE on unknown address + +--- + dgif_lib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Upstream-status: Backport [https://sourceforge.net/p/giflib/code/ci/799eb6a3af8a3dd81e2429bf11a72a57e541f908/] +CVE: CVE-2019-15133 + +--- a/lib/dgif_lib.c 2021-01-13 19:28:18.923493586 +0100 ++++ b/lib/dgif_lib.c 2021-01-13 19:28:55.245863085 +0100 +@@ -1099,7 +1099,7 @@ DGifSlurp(GifFileType *GifFile) + + sp = &GifFile->SavedImages[GifFile->ImageCount - 1]; + /* Allocate memory for the image */ +- if (sp->ImageDesc.Width < 0 && sp->ImageDesc.Height < 0 && ++ if (sp->ImageDesc.Width <= 0 && sp->ImageDesc.Height <= 0 && + sp->ImageDesc.Width > (INT_MAX / sp->ImageDesc.Height)) { + return GIF_ERROR; + } diff --git a/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb b/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb index 21fa352cd..1871bab46 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb @@ -3,7 +3,12 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a" -SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2" +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2 \ + file://CVE-2019-15133.patch \ +" + +CVE_PRODUCT = "giflib_project:giflib" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb deleted file mode 100644 index 60c33d658..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb +++ /dev/null @@ -1,70 +0,0 @@ -DESCRIPTION = "Lua is a powerful light-weight programming language designed \ -for extending applications." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=318;endline=352;md5=60aa5cfdbd40086501778d9b6ebf29ee" -HOMEPAGE = "http://www.lua.org/" - -SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ - file://lua.pc.in \ - file://0001-Allow-building-lua-without-readline-on-Linux.patch \ - file://CVE-2020-15888.patch \ - file://CVE-2020-15945.patch \ - file://0001-Fixed-bug-barriers-cannot-be-active-during-sweep.patch \ - " - -# if no test suite matches PV release of Lua exactly, download the suite for the closest Lua release. -PV_testsuites = "5.3.4" - -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', \ - 'http://www.lua.org/tests/lua-${PV_testsuites}-tests.tar.gz;name=tarballtest \ - file://run-ptest \ - ', '', d)}" - -SRC_URI[tarballsrc.md5sum] = "4f4b4f323fd3514a68e0ab3da8ce3455" -SRC_URI[tarballsrc.sha256sum] = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac" -SRC_URI[tarballtest.md5sum] = "b14fe3748c1cb2d74e3acd1943629ba3" -SRC_URI[tarballtest.sha256sum] = "b80771238271c72565e5a1183292ef31bd7166414cd0d43a8eb79845fa7f599f" - -inherit pkgconfig binconfig ptest - -PACKAGECONFIG ??= "readline" -PACKAGECONFIG[readline] = ",,readline" - -UCLIBC_PATCHES += "file://uclibc-pthread.patch" -SRC_URI_append_libc-uclibc = " ${UCLIBC_PATCHES}" - -TARGET_CC_ARCH += " -fPIC ${LDFLAGS}" -EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}'" - -do_configure_prepend() { - sed -i -e s:/usr/local:${prefix}:g src/luaconf.h - sed -i -e s:lib/lua/:${baselib}/lua/:g src/luaconf.h -} - -do_compile () { - oe_runmake ${@bb.utils.contains('PACKAGECONFIG', 'readline', 'linux', 'linux-no-readline', d)} -} - -do_install () { - oe_runmake \ - 'INSTALL_TOP=${D}${prefix}' \ - 'INSTALL_BIN=${D}${bindir}' \ - 'INSTALL_INC=${D}${includedir}/' \ - 'INSTALL_MAN=${D}${mandir}/man1' \ - 'INSTALL_SHARE=${D}${datadir}/lua' \ - 'INSTALL_LIB=${D}${libdir}' \ - 'INSTALL_CMOD=${D}${libdir}/lua/5.3' \ - install - install -d ${D}${libdir}/pkgconfig - - sed -e s/@VERSION@/${PV}/ ${WORKDIR}/lua.pc.in > ${WORKDIR}/lua.pc - install -m 0644 ${WORKDIR}/lua.pc ${D}${libdir}/pkgconfig/ - rmdir ${D}${datadir}/lua/5.3 - rmdir ${D}${datadir}/lua -} - -do_install_ptest () { - cp -R --no-dereference --preserve=mode,links -v ${WORKDIR}/lua-${PV_testsuites}-tests ${D}${PTEST_PATH}/test -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.6.bb b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.6.bb new file mode 100644 index 000000000..5e8f54588 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.6.bb @@ -0,0 +1,70 @@ +DESCRIPTION = "Lua is a powerful light-weight programming language designed \ +for extending applications." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=318;endline=352;md5=f43d8ee6bc4df18ef8b276439cc4a153" +HOMEPAGE = "http://www.lua.org/" + +SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ + file://lua.pc.in \ + file://0001-Allow-building-lua-without-readline-on-Linux.patch \ + file://CVE-2020-15888.patch \ + file://CVE-2020-15945.patch \ + file://0001-Fixed-bug-barriers-cannot-be-active-during-sweep.patch \ + " + +# if no test suite matches PV release of Lua exactly, download the suite for the closest Lua release. +PV_testsuites = "5.3.4" + +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', \ + 'http://www.lua.org/tests/lua-${PV_testsuites}-tests.tar.gz;name=tarballtest \ + file://run-ptest \ + ', '', d)}" + +SRC_URI[tarballsrc.md5sum] = "83f23dbd5230140a3770d5f54076948d" +SRC_URI[tarballsrc.sha256sum] = "fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60" +SRC_URI[tarballtest.md5sum] = "b14fe3748c1cb2d74e3acd1943629ba3" +SRC_URI[tarballtest.sha256sum] = "b80771238271c72565e5a1183292ef31bd7166414cd0d43a8eb79845fa7f599f" + +inherit pkgconfig binconfig ptest + +PACKAGECONFIG ??= "readline" +PACKAGECONFIG[readline] = ",,readline" + +UCLIBC_PATCHES += "file://uclibc-pthread.patch" +SRC_URI_append_libc-uclibc = " ${UCLIBC_PATCHES}" + +TARGET_CC_ARCH += " -fPIC ${LDFLAGS}" +EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}'" + +do_configure_prepend() { + sed -i -e s:/usr/local:${prefix}:g src/luaconf.h + sed -i -e s:lib/lua/:${baselib}/lua/:g src/luaconf.h +} + +do_compile () { + oe_runmake ${@bb.utils.contains('PACKAGECONFIG', 'readline', 'linux', 'linux-no-readline', d)} +} + +do_install () { + oe_runmake \ + 'INSTALL_TOP=${D}${prefix}' \ + 'INSTALL_BIN=${D}${bindir}' \ + 'INSTALL_INC=${D}${includedir}/' \ + 'INSTALL_MAN=${D}${mandir}/man1' \ + 'INSTALL_SHARE=${D}${datadir}/lua' \ + 'INSTALL_LIB=${D}${libdir}' \ + 'INSTALL_CMOD=${D}${libdir}/lua/5.3' \ + install + install -d ${D}${libdir}/pkgconfig + + sed -e s/@VERSION@/${PV}/ ${WORKDIR}/lua.pc.in > ${WORKDIR}/lua.pc + install -m 0644 ${WORKDIR}/lua.pc ${D}${libdir}/pkgconfig/ + rmdir ${D}${datadir}/lua/5.3 + rmdir ${D}${datadir}/lua +} + +do_install_ptest () { + cp -R --no-dereference --preserve=mode,links -v ${WORKDIR}/lua-${PV_testsuites}-tests ${D}${PTEST_PATH}/test +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-m4-pthread-update.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-m4-pthread-update.patch new file mode 100644 index 000000000..7e4aa103a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-m4-pthread-update.patch @@ -0,0 +1,731 @@ +From 8cfb4284b4e8b2893bd30e9c764d45f288e71efb Mon Sep 17 00:00:00 2001 +From: Adam Cozzette +Date: Fri, 20 Nov 2020 16:36:56 -0800 +Subject: [PATCH] Updated ax_pthread.m4 to its most recent upstream version + +This should fix #8059. + +Upstream-Status: Backport [471317f03adc09a0436670c31d58264b3bef6561] +Signed-off-by: Adrian Herrera +Expected version: v4.0.0+ +--- + m4/ax_pthread.m4 | 614 ++++++++++++++++++++++++----------------------- + 1 file changed, 318 insertions(+), 296 deletions(-) + +diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4 +index d218d1af73..1598d077ff 100644 +--- a/m4/ax_pthread.m4 ++++ b/m4/ax_pthread.m4 +@@ -1,5 +1,5 @@ + # =========================================================================== +-# http://www.gnu.org/software/autoconf-archive/ax_pthread.html ++# https://www.gnu.org/software/autoconf-archive/ax_pthread.html + # =========================================================================== + # + # SYNOPSIS +@@ -55,6 +55,7 @@ + # + # Copyright (c) 2008 Steven G. Johnson + # Copyright (c) 2011 Daniel Richard G. ++# Copyright (c) 2019 Marc Stevens + # + # This program is free software: you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by the +@@ -67,7 +68,7 @@ + # Public License for more details. + # + # You should have received a copy of the GNU General Public License along +-# with this program. If not, see . ++# with this program. If not, see . + # + # As a special exception, the respective Autoconf Macro's copyright owner + # gives unlimited permission to copy, distribute and modify the configure +@@ -82,7 +83,7 @@ + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + +-#serial 22 ++#serial 27 + + AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) + AC_DEFUN([AX_PTHREAD], [ +@@ -100,22 +101,22 @@ ax_pthread_ok=no + # etcetera environment variables, and if threads linking works using + # them: + if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then +- ax_pthread_save_CC="$CC" +- ax_pthread_save_CFLAGS="$CFLAGS" +- ax_pthread_save_LIBS="$LIBS" +- AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"]) +- CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +- LIBS="$PTHREAD_LIBS $LIBS" +- AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS]) +- AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes]) +- AC_MSG_RESULT([$ax_pthread_ok]) +- if test "x$ax_pthread_ok" = "xno"; then +- PTHREAD_LIBS="" +- PTHREAD_CFLAGS="" +- fi +- CC="$ax_pthread_save_CC" +- CFLAGS="$ax_pthread_save_CFLAGS" +- LIBS="$ax_pthread_save_LIBS" ++ ax_pthread_save_CC="$CC" ++ ax_pthread_save_CFLAGS="$CFLAGS" ++ ax_pthread_save_LIBS="$LIBS" ++ AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"]) ++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++ LIBS="$PTHREAD_LIBS $LIBS" ++ AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS]) ++ AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes]) ++ AC_MSG_RESULT([$ax_pthread_ok]) ++ if test "x$ax_pthread_ok" = "xno"; then ++ PTHREAD_LIBS="" ++ PTHREAD_CFLAGS="" ++ fi ++ CC="$ax_pthread_save_CC" ++ CFLAGS="$ax_pthread_save_CFLAGS" ++ LIBS="$ax_pthread_save_LIBS" + fi + + # We must check for the threads library under a number of different +@@ -123,10 +124,12 @@ fi + # (e.g. DEC) have both -lpthread and -lpthreads, where one of the + # libraries is broken (non-POSIX). + +-# Create a list of thread flags to try. Items starting with a "-" are +-# C compiler flags, and other items are library names, except for "none" +-# which indicates that we try without any flags at all, and "pthread-config" +-# which is a program returning the flags for the Pth emulation library. ++# Create a list of thread flags to try. Items with a "," contain both ++# C compiler flags (before ",") and linker flags (after ","). Other items ++# starting with a "-" are C compiler flags, and remaining items are ++# library names, except for "none" which indicates that we try without ++# any flags at all, and "pthread-config" which is a program returning ++# the flags for the Pth emulation library. + + ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + +@@ -152,319 +155,338 @@ ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread -- + + case $host_os in + +- freebsd*) ++ freebsd*) + +- # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +- # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) ++ # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) ++ # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) + +- ax_pthread_flags="-kthread lthread $ax_pthread_flags" +- ;; ++ ax_pthread_flags="-kthread lthread $ax_pthread_flags" ++ ;; + +- hpux*) ++ hpux*) + +- # From the cc(1) man page: "[-mt] Sets various -D flags to enable +- # multi-threading and also sets -lpthread." ++ # From the cc(1) man page: "[-mt] Sets various -D flags to enable ++ # multi-threading and also sets -lpthread." + +- ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags" +- ;; ++ ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags" ++ ;; + +- openedition*) ++ openedition*) + +- # IBM z/OS requires a feature-test macro to be defined in order to +- # enable POSIX threads at all, so give the user a hint if this is +- # not set. (We don't define these ourselves, as they can affect +- # other portions of the system API in unpredictable ways.) ++ # IBM z/OS requires a feature-test macro to be defined in order to ++ # enable POSIX threads at all, so give the user a hint if this is ++ # not set. (We don't define these ourselves, as they can affect ++ # other portions of the system API in unpredictable ways.) + +- AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING], +- [ +-# if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS) +- AX_PTHREAD_ZOS_MISSING +-# endif +- ], +- [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])]) +- ;; ++ AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING], ++ [ ++# if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS) ++ AX_PTHREAD_ZOS_MISSING ++# endif ++ ], ++ [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])]) ++ ;; + +- solaris*) ++ solaris*) + +- # On Solaris (at least, for some versions), libc contains stubbed +- # (non-functional) versions of the pthreads routines, so link-based +- # tests will erroneously succeed. (N.B.: The stubs are missing +- # pthread_cleanup_push, or rather a function called by this macro, +- # so we could check for that, but who knows whether they'll stub +- # that too in a future libc.) So we'll check first for the +- # standard Solaris way of linking pthreads (-mt -lpthread). ++ # On Solaris (at least, for some versions), libc contains stubbed ++ # (non-functional) versions of the pthreads routines, so link-based ++ # tests will erroneously succeed. (N.B.: The stubs are missing ++ # pthread_cleanup_push, or rather a function called by this macro, ++ # so we could check for that, but who knows whether they'll stub ++ # that too in a future libc.) So we'll check first for the ++ # standard Solaris way of linking pthreads (-mt -lpthread). + +- ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags" +- ;; ++ ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags" ++ ;; + esac + ++# Are we compiling with Clang? ++ ++AC_CACHE_CHECK([whether $CC is Clang], ++ [ax_cv_PTHREAD_CLANG], ++ [ax_cv_PTHREAD_CLANG=no ++ # Note that Autoconf sets GCC=yes for Clang as well as GCC ++ if test "x$GCC" = "xyes"; then ++ AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG], ++ [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ ++# if defined(__clang__) && defined(__llvm__) ++ AX_PTHREAD_CC_IS_CLANG ++# endif ++ ], ++ [ax_cv_PTHREAD_CLANG=yes]) ++ fi ++ ]) ++ax_pthread_clang="$ax_cv_PTHREAD_CLANG" ++ ++ + # GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC) + ++# Note that for GCC and Clang -pthread generally implies -lpthread, ++# except when -nostdlib is passed. ++# This is problematic using libtool to build C++ shared libraries with pthread: ++# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460 ++# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333 ++# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555 ++# To solve this, first try -pthread together with -lpthread for GCC ++ + AS_IF([test "x$GCC" = "xyes"], +- [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"]) ++ [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"]) ++ ++# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first ++ ++AS_IF([test "x$ax_pthread_clang" = "xyes"], ++ [ax_pthread_flags="-pthread,-lpthread -pthread"]) ++ + + # The presence of a feature test macro requesting re-entrant function + # definitions is, on some systems, a strong hint that pthreads support is + # correctly enabled + + case $host_os in +- darwin* | hpux* | linux* | osf* | solaris*) +- ax_pthread_check_macro="_REENTRANT" +- ;; ++ darwin* | hpux* | linux* | osf* | solaris*) ++ ax_pthread_check_macro="_REENTRANT" ++ ;; + +- aix* | freebsd*) +- ax_pthread_check_macro="_THREAD_SAFE" +- ;; ++ aix*) ++ ax_pthread_check_macro="_THREAD_SAFE" ++ ;; + +- *) +- ax_pthread_check_macro="--" +- ;; ++ *) ++ ax_pthread_check_macro="--" ++ ;; + esac + AS_IF([test "x$ax_pthread_check_macro" = "x--"], + [ax_pthread_check_cond=0], + [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"]) + +-# Are we compiling with Clang? + +-AC_CACHE_CHECK([whether $CC is Clang], +- [ax_cv_PTHREAD_CLANG], +- [ax_cv_PTHREAD_CLANG=no +- # Note that Autoconf sets GCC=yes for Clang as well as GCC +- if test "x$GCC" = "xyes"; then +- AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG], +- [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ +-# if defined(__clang__) && defined(__llvm__) +- AX_PTHREAD_CC_IS_CLANG +-# endif +- ], +- [ax_cv_PTHREAD_CLANG=yes]) +- fi +- ]) +-ax_pthread_clang="$ax_cv_PTHREAD_CLANG" ++if test "x$ax_pthread_ok" = "xno"; then ++for ax_pthread_try_flag in $ax_pthread_flags; do ++ ++ case $ax_pthread_try_flag in ++ none) ++ AC_MSG_CHECKING([whether pthreads work without any flags]) ++ ;; ++ ++ *,*) ++ PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"` ++ PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"` ++ AC_MSG_CHECKING([whether pthreads work with "$PTHREAD_CFLAGS" and "$PTHREAD_LIBS"]) ++ ;; ++ ++ -*) ++ AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag]) ++ PTHREAD_CFLAGS="$ax_pthread_try_flag" ++ ;; ++ ++ pthread-config) ++ AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) ++ AS_IF([test "x$ax_pthread_config" = "xno"], [continue]) ++ PTHREAD_CFLAGS="`pthread-config --cflags`" ++ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" ++ ;; ++ ++ *) ++ AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag]) ++ PTHREAD_LIBS="-l$ax_pthread_try_flag" ++ ;; ++ esac ++ ++ ax_pthread_save_CFLAGS="$CFLAGS" ++ ax_pthread_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++ LIBS="$PTHREAD_LIBS $LIBS" ++ ++ # Check for various functions. We must include pthread.h, ++ # since some functions may be macros. (On the Sequent, we ++ # need a special flag -Kthread to make this header compile.) ++ # We check for pthread_join because it is in -lpthread on IRIX ++ # while pthread_create is in libc. We check for pthread_attr_init ++ # due to DEC craziness with -lpthreads. We check for ++ # pthread_cleanup_push because it is one of the few pthread ++ # functions on Solaris that doesn't have a non-functional libc stub. ++ # We try pthread_create on general principles. ++ ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ++# if $ax_pthread_check_cond ++# error "$ax_pthread_check_macro must be defined" ++# endif ++ static void *some_global = NULL; ++ static void routine(void *a) ++ { ++ /* To avoid any unused-parameter or ++ unused-but-set-parameter warning. */ ++ some_global = a; ++ } ++ static void *start_routine(void *a) { return a; }], ++ [pthread_t th; pthread_attr_t attr; ++ pthread_create(&th, 0, start_routine, 0); ++ pthread_join(th, 0); ++ pthread_attr_init(&attr); ++ pthread_cleanup_push(routine, 0); ++ pthread_cleanup_pop(0) /* ; */])], ++ [ax_pthread_ok=yes], ++ []) ++ ++ CFLAGS="$ax_pthread_save_CFLAGS" ++ LIBS="$ax_pthread_save_LIBS" ++ ++ AC_MSG_RESULT([$ax_pthread_ok]) ++ AS_IF([test "x$ax_pthread_ok" = "xyes"], [break]) ++ ++ PTHREAD_LIBS="" ++ PTHREAD_CFLAGS="" ++done ++fi + +-ax_pthread_clang_warning=no + + # Clang needs special handling, because older versions handle the -pthread + # option in a rather... idiosyncratic way + + if test "x$ax_pthread_clang" = "xyes"; then + +- # Clang takes -pthread; it has never supported any other flag +- +- # (Note 1: This will need to be revisited if a system that Clang +- # supports has POSIX threads in a separate library. This tends not +- # to be the way of modern systems, but it's conceivable.) +- +- # (Note 2: On some systems, notably Darwin, -pthread is not needed +- # to get POSIX threads support; the API is always present and +- # active. We could reasonably leave PTHREAD_CFLAGS empty. But +- # -pthread does define _REENTRANT, and while the Darwin headers +- # ignore this macro, third-party headers might not.) +- +- PTHREAD_CFLAGS="-pthread" +- PTHREAD_LIBS= +- +- ax_pthread_ok=yes +- +- # However, older versions of Clang make a point of warning the user +- # that, in an invocation where only linking and no compilation is +- # taking place, the -pthread option has no effect ("argument unused +- # during compilation"). They expect -pthread to be passed in only +- # when source code is being compiled. +- # +- # Problem is, this is at odds with the way Automake and most other +- # C build frameworks function, which is that the same flags used in +- # compilation (CFLAGS) are also used in linking. Many systems +- # supported by AX_PTHREAD require exactly this for POSIX threads +- # support, and in fact it is often not straightforward to specify a +- # flag that is used only in the compilation phase and not in +- # linking. Such a scenario is extremely rare in practice. +- # +- # Even though use of the -pthread flag in linking would only print +- # a warning, this can be a nuisance for well-run software projects +- # that build with -Werror. So if the active version of Clang has +- # this misfeature, we search for an option to squash it. +- +- AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread], +- [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG], +- [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown +- # Create an alternate version of $ac_link that compiles and +- # links in two steps (.c -> .o, .o -> exe) instead of one +- # (.c -> exe), because the warning occurs only in the second +- # step +- ax_pthread_save_ac_link="$ac_link" +- ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' +- ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"` +- ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" +- ax_pthread_save_CFLAGS="$CFLAGS" +- for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do +- AS_IF([test "x$ax_pthread_try" = "xunknown"], [break]) +- CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" +- ac_link="$ax_pthread_save_ac_link" +- AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], +- [ac_link="$ax_pthread_2step_ac_link" +- AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], +- [break]) +- ]) +- done +- ac_link="$ax_pthread_save_ac_link" +- CFLAGS="$ax_pthread_save_CFLAGS" +- AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no]) +- ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" +- ]) +- +- case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in +- no | unknown) ;; +- *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;; +- esac ++ # Clang takes -pthread; it has never supported any other flag ++ ++ # (Note 1: This will need to be revisited if a system that Clang ++ # supports has POSIX threads in a separate library. This tends not ++ # to be the way of modern systems, but it's conceivable.) ++ ++ # (Note 2: On some systems, notably Darwin, -pthread is not needed ++ # to get POSIX threads support; the API is always present and ++ # active. We could reasonably leave PTHREAD_CFLAGS empty. But ++ # -pthread does define _REENTRANT, and while the Darwin headers ++ # ignore this macro, third-party headers might not.) ++ ++ # However, older versions of Clang make a point of warning the user ++ # that, in an invocation where only linking and no compilation is ++ # taking place, the -pthread option has no effect ("argument unused ++ # during compilation"). They expect -pthread to be passed in only ++ # when source code is being compiled. ++ # ++ # Problem is, this is at odds with the way Automake and most other ++ # C build frameworks function, which is that the same flags used in ++ # compilation (CFLAGS) are also used in linking. Many systems ++ # supported by AX_PTHREAD require exactly this for POSIX threads ++ # support, and in fact it is often not straightforward to specify a ++ # flag that is used only in the compilation phase and not in ++ # linking. Such a scenario is extremely rare in practice. ++ # ++ # Even though use of the -pthread flag in linking would only print ++ # a warning, this can be a nuisance for well-run software projects ++ # that build with -Werror. So if the active version of Clang has ++ # this misfeature, we search for an option to squash it. ++ ++ AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread], ++ [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG], ++ [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown ++ # Create an alternate version of $ac_link that compiles and ++ # links in two steps (.c -> .o, .o -> exe) instead of one ++ # (.c -> exe), because the warning occurs only in the second ++ # step ++ ax_pthread_save_ac_link="$ac_link" ++ ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' ++ ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"` ++ ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" ++ ax_pthread_save_CFLAGS="$CFLAGS" ++ for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do ++ AS_IF([test "x$ax_pthread_try" = "xunknown"], [break]) ++ CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" ++ ac_link="$ax_pthread_save_ac_link" ++ AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], ++ [ac_link="$ax_pthread_2step_ac_link" ++ AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], ++ [break]) ++ ]) ++ done ++ ac_link="$ax_pthread_save_ac_link" ++ CFLAGS="$ax_pthread_save_CFLAGS" ++ AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no]) ++ ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" ++ ]) ++ ++ case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in ++ no | unknown) ;; ++ *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;; ++ esac + + fi # $ax_pthread_clang = yes + +-if test "x$ax_pthread_ok" = "xno"; then +-for ax_pthread_try_flag in $ax_pthread_flags; do + +- case $ax_pthread_try_flag in +- none) +- AC_MSG_CHECKING([whether pthreads work without any flags]) +- ;; +- +- -mt,pthread) +- AC_MSG_CHECKING([whether pthreads work with -mt -lpthread]) +- PTHREAD_CFLAGS="-mt" +- PTHREAD_LIBS="-lpthread" +- ;; +- +- -*) +- AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag]) +- PTHREAD_CFLAGS="$ax_pthread_try_flag" +- ;; +- +- pthread-config) +- AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) +- AS_IF([test "x$ax_pthread_config" = "xno"], [continue]) +- PTHREAD_CFLAGS="`pthread-config --cflags`" +- PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" +- ;; +- +- *) +- AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag]) +- PTHREAD_LIBS="-l$ax_pthread_try_flag" +- ;; +- esac +- +- ax_pthread_save_CFLAGS="$CFLAGS" +- ax_pthread_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +- LIBS="$PTHREAD_LIBS $LIBS" +- +- # Check for various functions. We must include pthread.h, +- # since some functions may be macros. (On the Sequent, we +- # need a special flag -Kthread to make this header compile.) +- # We check for pthread_join because it is in -lpthread on IRIX +- # while pthread_create is in libc. We check for pthread_attr_init +- # due to DEC craziness with -lpthreads. We check for +- # pthread_cleanup_push because it is one of the few pthread +- # functions on Solaris that doesn't have a non-functional libc stub. +- # We try pthread_create on general principles. +- +- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include +-# if $ax_pthread_check_cond +-# error "$ax_pthread_check_macro must be defined" +-# endif +- static void routine(void *a) { a = 0; } +- static void *start_routine(void *a) { return a; }], +- [pthread_t th; pthread_attr_t attr; +- pthread_create(&th, 0, start_routine, 0); +- pthread_join(th, 0); +- pthread_attr_init(&attr); +- pthread_cleanup_push(routine, 0); +- pthread_cleanup_pop(0) /* ; */])], +- [ax_pthread_ok=yes], +- []) +- +- CFLAGS="$ax_pthread_save_CFLAGS" +- LIBS="$ax_pthread_save_LIBS" +- +- AC_MSG_RESULT([$ax_pthread_ok]) +- AS_IF([test "x$ax_pthread_ok" = "xyes"], [break]) +- +- PTHREAD_LIBS="" +- PTHREAD_CFLAGS="" +-done +-fi + + # Various other checks: + if test "x$ax_pthread_ok" = "xyes"; then +- ax_pthread_save_CFLAGS="$CFLAGS" +- ax_pthread_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +- LIBS="$PTHREAD_LIBS $LIBS" +- +- # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. +- AC_CACHE_CHECK([for joinable pthread attribute], +- [ax_cv_PTHREAD_JOINABLE_ATTR], +- [ax_cv_PTHREAD_JOINABLE_ATTR=unknown +- for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do +- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], +- [int attr = $ax_pthread_attr; return attr /* ; */])], +- [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break], +- []) +- done +- ]) +- AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \ +- test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \ +- test "x$ax_pthread_joinable_attr_defined" != "xyes"], +- [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], +- [$ax_cv_PTHREAD_JOINABLE_ATTR], +- [Define to necessary symbol if this constant +- uses a non-standard name on your system.]) +- ax_pthread_joinable_attr_defined=yes +- ]) +- +- AC_CACHE_CHECK([whether more special flags are required for pthreads], +- [ax_cv_PTHREAD_SPECIAL_FLAGS], +- [ax_cv_PTHREAD_SPECIAL_FLAGS=no +- case $host_os in +- solaris*) +- ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS" +- ;; +- esac +- ]) +- AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \ +- test "x$ax_pthread_special_flags_added" != "xyes"], +- [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS" +- ax_pthread_special_flags_added=yes]) +- +- AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], +- [ax_cv_PTHREAD_PRIO_INHERIT], +- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], +- [[int i = PTHREAD_PRIO_INHERIT;]])], +- [ax_cv_PTHREAD_PRIO_INHERIT=yes], +- [ax_cv_PTHREAD_PRIO_INHERIT=no]) +- ]) +- AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \ +- test "x$ax_pthread_prio_inherit_defined" != "xyes"], +- [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.]) +- ax_pthread_prio_inherit_defined=yes +- ]) +- +- CFLAGS="$ax_pthread_save_CFLAGS" +- LIBS="$ax_pthread_save_LIBS" +- +- # More AIX lossage: compile with *_r variant +- if test "x$GCC" != "xyes"; then +- case $host_os in +- aix*) +- AS_CASE(["x/$CC"], +- [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], +- [#handle absolute path differently from PATH based program lookup +- AS_CASE(["x$CC"], +- [x/*], +- [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], +- [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) +- ;; +- esac +- fi ++ ax_pthread_save_CFLAGS="$CFLAGS" ++ ax_pthread_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++ LIBS="$PTHREAD_LIBS $LIBS" ++ ++ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. ++ AC_CACHE_CHECK([for joinable pthread attribute], ++ [ax_cv_PTHREAD_JOINABLE_ATTR], ++ [ax_cv_PTHREAD_JOINABLE_ATTR=unknown ++ for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], ++ [int attr = $ax_pthread_attr; return attr /* ; */])], ++ [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break], ++ []) ++ done ++ ]) ++ AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \ ++ test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \ ++ test "x$ax_pthread_joinable_attr_defined" != "xyes"], ++ [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], ++ [$ax_cv_PTHREAD_JOINABLE_ATTR], ++ [Define to necessary symbol if this constant ++ uses a non-standard name on your system.]) ++ ax_pthread_joinable_attr_defined=yes ++ ]) ++ ++ AC_CACHE_CHECK([whether more special flags are required for pthreads], ++ [ax_cv_PTHREAD_SPECIAL_FLAGS], ++ [ax_cv_PTHREAD_SPECIAL_FLAGS=no ++ case $host_os in ++ solaris*) ++ ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS" ++ ;; ++ esac ++ ]) ++ AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \ ++ test "x$ax_pthread_special_flags_added" != "xyes"], ++ [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS" ++ ax_pthread_special_flags_added=yes]) ++ ++ AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], ++ [ax_cv_PTHREAD_PRIO_INHERIT], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], ++ [[int i = PTHREAD_PRIO_INHERIT; ++ return i;]])], ++ [ax_cv_PTHREAD_PRIO_INHERIT=yes], ++ [ax_cv_PTHREAD_PRIO_INHERIT=no]) ++ ]) ++ AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \ ++ test "x$ax_pthread_prio_inherit_defined" != "xyes"], ++ [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.]) ++ ax_pthread_prio_inherit_defined=yes ++ ]) ++ ++ CFLAGS="$ax_pthread_save_CFLAGS" ++ LIBS="$ax_pthread_save_LIBS" ++ ++ # More AIX lossage: compile with *_r variant ++ if test "x$GCC" != "xyes"; then ++ case $host_os in ++ aix*) ++ AS_CASE(["x/$CC"], ++ [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], ++ [#handle absolute path differently from PATH based program lookup ++ AS_CASE(["x$CC"], ++ [x/*], ++ [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], ++ [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) ++ ;; ++ esac ++ fi + fi + + test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" +@@ -475,11 +497,11 @@ AC_SUBST([PTHREAD_CC]) + + # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: + if test "x$ax_pthread_ok" = "xyes"; then +- ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) +- : ++ ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) ++ : + else +- ax_pthread_ok=no +- $2 ++ ax_pthread_ok=no ++ $2 + fi + AC_LANG_POP + ])dnl AX_PTHREAD diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.14.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.14.0.bb index 31e3bcc5b..00f1e99d3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.14.0.bb @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ file://0001-protobuf-fix-configure-error.patch \ file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ + file://0001-fix-m4-pthread-update.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index e3ed9c6a1..5b5c8b257 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb @@ -4,10 +4,9 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" -SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \ - file://0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch" +SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1" -SRCREV = "6a905f9311f82d306da77bd963ec5aa5da07da9c" +SRCREV = "0ccdbf364c577803e2a751f5aededce935314313" PV = "1.1.0+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb index 320755b84..ae8df5055 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb @@ -19,24 +19,17 @@ PACKAGES += "python3-sip3" BBCLASSEXTEND = "native" -do_configure_prepend_class-target() { - echo "py_platform = linux" > sip.cfg - echo "py_inc_dir = %(sysroot)/${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg - echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg - echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg - echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg - echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg - ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}" -} +CONFIGURE_SYSROOT = "${STAGING_DIR_HOST}" +CONFIGURE_SYSROOT_class-native = "${STAGING_DIR_NATIVE}" -do_configure_prepend_class-native() { +do_configure_prepend() { echo "py_platform = linux" > sip.cfg - echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg + echo "py_inc_dir = ${STAGING_INCDIR}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg - ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot=${STAGING_DIR_NATIVE} + ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${CONFIGURE_SYSROOT} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}" } do_install() { diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20201126.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20201126.bb deleted file mode 100644 index 5097788ed..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20201126.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "display dialog boxes from shell scripts" -DESCRIPTION = "Dialog lets you to present a variety of questions \ -or display messages using dialog boxes from a shell \ -script (or any scripting language)." -HOMEPAGE = "http://invisible-island.net/dialog/" -SECTION = "console/utils" -DEPENDS = "ncurses" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ - " -SRC_URI[md5sum] = "14bf3b33de348838ff30aff0aa9d1c2e" -SRC_URI[sha256sum] = "c9233a6c8ea33a59e2378e5146ae2bd13b519744cfdb647af7420adac5ad3866" - -# hardcoded here for use in dialog-static recipe -S = "${WORKDIR}/dialog-${PV}" - -inherit autotools-brokensep pkgconfig - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" - -PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" - -EXTRA_OECONF = "--with-ncurses \ - --disable-rpath-hack" - -do_configure() { - gnu-configize --force - sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure - sed -i 's,cf_have_ncuconfig=unknown,cf_have_ncuconfig=yes,g' -i configure - oe_runconf -} diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20210117.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20210117.bb new file mode 100644 index 000000000..4f49fb906 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20210117.bb @@ -0,0 +1,33 @@ +SUMMARY = "display dialog boxes from shell scripts" +DESCRIPTION = "Dialog lets you to present a variety of questions \ +or display messages using dialog boxes from a shell \ +script (or any scripting language)." +HOMEPAGE = "http://invisible-island.net/dialog/" +SECTION = "console/utils" +DEPENDS = "ncurses" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ + " +SRC_URI[md5sum] = "c27db8bb67f71ee32ab1b54a3b3cebc3" +SRC_URI[sha256sum] = "3c1ed08f44bcf6f159f2aa6fde765db94e8997b3eefb49d8b4c86691693c43e1" + +# hardcoded here for use in dialog-static recipe +S = "${WORKDIR}/dialog-${PV}" + +inherit autotools-brokensep pkgconfig + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" + +PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" + +EXTRA_OECONF = "--with-ncurses \ + --disable-rpath-hack" + +do_configure() { + gnu-configize --force + sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure + sed -i 's,cf_have_ncuconfig=unknown,cf_have_ncuconfig=yes,g' -i configure + oe_runconf +} diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch deleted file mode 100644 index 7d8f22ec7..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b8f9919f000e642fc8970d0a42c1bdadf5a9d720 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Mon, 10 Aug 2020 08:30:34 +0200 -Subject: [PATCH] sd-daemon.c: Fix build with newer glibc and musl libc - -Reported by Khem Raj on meta-oe list - -TOPDIR/build/tmp/work/armv7vet2hf-neon-yoe-linux-musleabi/dlt-daemon/2.18.5-r0/recipe-sysroot/usr/include/sys/fcntl.h:1:2: error: redirecting incorrect #include to [-Werror,-W#warnings] - ^ -1 error generated. - -Signed-off-by: Gianfranco Costamagna -Signed-off-by: Gianfranco Costamagna ---- - systemd/3rdparty/sd-daemon.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systemd/3rdparty/sd-daemon.c b/systemd/3rdparty/sd-daemon.c -index 88936d2..de3f985 100644 ---- a/systemd/3rdparty/sd-daemon.c -+++ b/systemd/3rdparty/sd-daemon.c -@@ -35,7 +35,7 @@ - #ifdef __BIONIC__ - #include - #else --#include -+#include - #endif - #include - #include diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch deleted file mode 100644 index 43057489c..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 57fd61ea5c58a4f9fcd7140b53ac6cd6e971ef47 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Fri, 31 Jul 2020 15:16:02 +0200 -Subject: [PATCH] dlt_offline: fix build failures with gcc-10 - -see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140 - -/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_client.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here -/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here -/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here -/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here -/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here -/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here -/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here -/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_offline_logstorage.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here ---- - src/daemon/dlt_daemon_offline_logstorage.c | 1 + - src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++-- - src/offlinelogstorage/dlt_offline_logstorage_behavior.c | 1 + - tests/gtest_dlt_daemon_offline_log.cpp | 1 + - 4 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/daemon/dlt_daemon_offline_logstorage.c b/src/daemon/dlt_daemon_offline_logstorage.c -index 0b3c14f..db9637e 100644 ---- a/src/daemon/dlt_daemon_offline_logstorage.c -+++ b/src/daemon/dlt_daemon_offline_logstorage.c -@@ -56,6 +56,7 @@ DLT_STATIC DltReturnValue dlt_logstorage_split_ecuid(char *key, - return DLT_RETURN_OK; - } - -+unsigned int g_logstorage_cache_max; - /** - * dlt_logstorage_split_ctid - * -diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h -index b58da70..c9bc93b 100644 ---- a/src/offlinelogstorage/dlt_offline_logstorage.h -+++ b/src/offlinelogstorage/dlt_offline_logstorage.h -@@ -114,9 +114,9 @@ - #define DLT_OFFLINE_LOGSTORAGE_IS_STRATEGY_SET(S, s) ((S)&(s)) - - /* logstorage max cache */ --unsigned int g_logstorage_cache_max; -+extern unsigned int g_logstorage_cache_max; - /* current logstorage cache size */ --unsigned int g_logstorage_cache_size; -+extern unsigned int g_logstorage_cache_size; - - typedef struct - { -diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c -index afbf8c4..edef482 100644 ---- a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c -+++ b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c -@@ -32,6 +32,7 @@ - #include "dlt_offline_logstorage_behavior.h" - #include "dlt_offline_logstorage_behavior_internal.h" - -+unsigned int g_logstorage_cache_size; - /** - * dlt_logstorage_log_file_name - * -diff --git a/tests/gtest_dlt_daemon_offline_log.cpp b/tests/gtest_dlt_daemon_offline_log.cpp -index b8965de..0bd4d5e 100644 ---- a/tests/gtest_dlt_daemon_offline_log.cpp -+++ b/tests/gtest_dlt_daemon_offline_log.cpp -@@ -29,6 +29,7 @@ extern "C" - #include - } - -+unsigned int g_logstorage_cache_max; - /* Begin Method: dlt_logstorage::t_dlt_logstorage_list_add*/ - TEST(t_dlt_logstorage_list_add, normal) - { diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch deleted file mode 100644 index 75065eb05..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-status: Backport -CVE: CVE-2020-29394 -From 7f5cd5404a03fa330e192084f6bdafb2dc9bdcb7 Mon Sep 17 00:00:00 2001 -From: GwanYeong Kim -Date: Sat, 28 Nov 2020 12:24:46 +0900 -Subject: [PATCH] dlt_common: Fix buffer overflow in dlt_filter_load - -A buffer overflow in the dlt_filter_load function in dlt_common.c in dlt-daemon allows arbitrary code execution via an unsafe usage of fscanf, because it does not limit the number of characters to be read in a format argument. - -Fixed: #274 - -Signed-off-by: GwanYeong Kim ---- - src/shared/dlt_common.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c -index 254f4ce4..d15b1cec 100644 ---- a/src/shared/dlt_common.c -+++ b/src/shared/dlt_common.c -@@ -404,7 +404,7 @@ DltReturnValue dlt_filter_load(DltFilter *filter, const char *filename, int verb - while (!feof(handle)) { - str1[0] = 0; - -- if (fscanf(handle, "%s", str1) != 1) -+ if (fscanf(handle, "%254s", str1) != 1) - break; - - if (str1[0] == 0) -@@ -419,7 +419,7 @@ DltReturnValue dlt_filter_load(DltFilter *filter, const char *filename, int verb - - str1[0] = 0; - -- if (fscanf(handle, "%s", str1) != 1) -+ if (fscanf(handle, "%254s", str1) != 1) - break; - - if (str1[0] == 0) diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb deleted file mode 100644 index 5066e76d3..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "Diagnostic Log and Trace" -DESCRIPTION = "This component provides a standardised log and trace interface, \ -based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \ -This component can be used by GENIVI components and other applications as \ -logging facility providing: \ -- the DLT shared library \ -- the DLT daemon, including startup scripts \ -- the DLT daemon adaptors- the DLT client console utilities \ -- the DLT test applications" -HOMEPAGE = "https://www.genivi.org/" -SECTION = "console/utils" -LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" - -DEPENDS = "zlib gzip-native" - -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ - file://0002-Don-t-execute-processes-as-a-specific-user.patch \ - file://0004-Modify-systemd-config-directory.patch \ - file://241.patch \ - file://245.patch \ - file://275.patch \ -" -SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-console ', '', d)} \ - udp-connection dlt-system dlt-filetransfer " -# dlt-dbus - -# General options -PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd" - -# Linux options -PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" -PACKAGECONFIG[systemd-watchdog] = "-DWITH_SYSTEMD_WATCHDOG=ON,-DWITH_SYSTEMD_WATCHDOG=OFF,systemd,libsystemd" -PACKAGECONFIG[systemd-journal] = "-DWITH_SYSTEMD_JOURNAL=ON,-DWITH_SYSTEMD_JOURNAL=OFF,systemd,libsystemd" -PACKAGECONFIG[dlt-dbus] = "-DWITH_DLT_DBUS=ON,-DWITH_DLT_DBUS=OFF,dbus,dbus-lib" -PACKAGECONFIG[udp-connection] = "-DWITH_UDP_CONNECTION=ON,-DWITH_UDP_CONNECTION=OFF" - -# Command line options -PACKAGECONFIG[dlt-system] = "-DWITH_DLT_SYSTEM=ON,-DWITH_DLT_SYSTEM=OFF" -PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt-daemon-systemd" -PACKAGECONFIG[dlt-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF" -PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd" - -inherit autotools gettext cmake systemd - -EXTRA_OECMAKE += "-DSYSTEMD_UNITDIR=${systemd_system_unitdir}" - -PACKAGES += "${PN}-systemd" -SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" -SYSTEMD_SERVICE_${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-system', 'dlt-system.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-dbus', 'dlt-dbus.service', '', d)}" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" -SYSTEMD_SERVICE_${PN}-systemd = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor', 'dlt-adaptor-udp.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples', 'dlt-example-user.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples dlt-console', 'dlt-receive.service', '', d)} \ -" -SYSTEMD_AUTO_ENABLE_${PN}-systemd = "disable" - -FILES_${PN}-doc += "${datadir}/dlt-filetransfer" - -do_install_append() { - rm -f ${D}${bindir}/dlt-test-* -} diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb new file mode 100644 index 000000000..b3cfb4709 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb @@ -0,0 +1,66 @@ +SUMMARY = "Diagnostic Log and Trace" +DESCRIPTION = "This component provides a standardised log and trace interface, \ +based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \ +This component can be used by GENIVI components and other applications as \ +logging facility providing: \ +- the DLT shared library \ +- the DLT daemon, including startup scripts \ +- the DLT daemon adaptors- the DLT client console utilities \ +- the DLT test applications" +HOMEPAGE = "https://www.genivi.org/" +SECTION = "console/utils" +LICENSE = "MPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" + +DEPENDS = "zlib gzip-native" + +SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ + file://0002-Don-t-execute-processes-as-a-specific-user.patch \ + file://0004-Modify-systemd-config-directory.patch \ +" +SRCREV = "22715aeceaa81ace2c832312529bde3a42d0814f" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-console ', '', d)} \ + udp-connection dlt-system dlt-filetransfer " +# dlt-dbus + +# General options +PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd" + +# Linux options +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[systemd-watchdog] = "-DWITH_SYSTEMD_WATCHDOG=ON,-DWITH_SYSTEMD_WATCHDOG=OFF,systemd,libsystemd" +PACKAGECONFIG[systemd-journal] = "-DWITH_SYSTEMD_JOURNAL=ON,-DWITH_SYSTEMD_JOURNAL=OFF,systemd,libsystemd" +PACKAGECONFIG[dlt-dbus] = "-DWITH_DLT_DBUS=ON,-DWITH_DLT_DBUS=OFF,dbus,dbus-lib" +PACKAGECONFIG[udp-connection] = "-DWITH_UDP_CONNECTION=ON,-DWITH_UDP_CONNECTION=OFF" + +# Command line options +PACKAGECONFIG[dlt-system] = "-DWITH_DLT_SYSTEM=ON,-DWITH_DLT_SYSTEM=OFF" +PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt-daemon-systemd" +PACKAGECONFIG[dlt-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF" +PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd" + +inherit autotools gettext cmake systemd + +EXTRA_OECMAKE += "-DSYSTEMD_UNITDIR=${systemd_system_unitdir}" + +PACKAGES += "${PN}-systemd" +SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" +SYSTEMD_SERVICE_${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-system', 'dlt-system.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-dbus', 'dlt-dbus.service', '', d)}" +SYSTEMD_AUTO_ENABLE_${PN} = "enable" +SYSTEMD_SERVICE_${PN}-systemd = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor', 'dlt-adaptor-udp.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples', 'dlt-example-user.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples dlt-console', 'dlt-receive.service', '', d)} \ +" +SYSTEMD_AUTO_ENABLE_${PN}-systemd = "disable" + +FILES_${PN}-doc += "${datadir}/dlt-filetransfer" + +do_install_append() { + rm -f ${D}${bindir}/dlt-test-* +} diff --git a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb index 148e85ce1..70ea82eb9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb @@ -13,3 +13,7 @@ inherit autotools-brokensep pkgconfig SRC_URI[md5sum] = "6bd98ee3a6e6b9126c82c916d7a9e690" SRC_URI[sha256sum] = "7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a16fad9" + +PACKAGE_BEFORE_PN = "${PN}++" +FILES_${PN}++ = "${libdir}/${BPN}++*${SOLIBS}" + diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init index 0643dbca2..ccc3aafe3 100755 --- a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init @@ -14,7 +14,7 @@ fi ZRAM_SIZE_PERCENT=100 ZRAM_ALGORITHM=lz4 -[ -f /etc/default/zram ] && ./etc/default/zram || true +[ -f /etc/default/zram ] && . /etc/default/zram || true memtotal=$(grep MemTotal /proc/meminfo | awk ' { print $2 } ') memzram=$(($memtotal*${ZRAM_SIZE_PERCENT}/100)) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch deleted file mode 100644 index dd1b7ccfd..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 83068f9b71aea16d1ad036fdcc326de1027b5585 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Nov 2020 22:13:29 -0800 -Subject: [PATCH] Use SYS_futex instead of __NR_futex - -SYS_futex is expected from system C library. -in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) -rv32 is using 64bit time_t from get go unlike other 32bit architectures -in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 -this aliases it to NR_futex so that SYS_futex is then defined for rv32 - -Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/670] -Signed-off-by: Khem Raj ---- - linux/JackLinuxFutex.cpp | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/linux/JackLinuxFutex.cpp b/linux/JackLinuxFutex.cpp -index deff006b..aef99cd2 100644 ---- a/linux/JackLinuxFutex.cpp -+++ b/linux/JackLinuxFutex.cpp -@@ -29,6 +29,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #include - #include - -+#if !defined(SYS_futex) && defined(SYS_futex_time64) -+#define SYS_futex SYS_futex_time64 -+#endif -+ - namespace Jack - { - -@@ -67,7 +71,7 @@ bool JackLinuxFutex::Signal() - if (! fFutex->internal) return true; - } - -- ::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0); -+ ::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0); - return true; - } - -@@ -94,7 +98,7 @@ bool JackLinuxFutex::Wait() - if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0)) - return true; - -- if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK) -+ if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK) - return false; - } - } -@@ -122,7 +126,7 @@ bool JackLinuxFutex::TimedWait(long usec) - if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0)) - return true; - -- if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK) -+ if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK) - return false; - } - } --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.16.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.16.bb deleted file mode 100644 index c13d6261c..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.16.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = "jackdmp is a C++ version of the JACK low-latency audio \ -server for multi-processor machines. It is a new implementation of the \ -JACK server core features that aims in removing some limitations of \ -the JACK1 design. The activation system has been changed for a data \ -flow model and lock-free programming techniques for graph access have \ -been used to have a more dynamic and robust system." -SECTION = "libs/multimedia" - -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://common/jack/control.h;beginline=2;endline=21;md5=e6df0bf30cde8b3b825451459488195d \ - file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \ -" - -DEPENDS = "libsamplerate0 libsndfile1 readline" - -SRC_URI = "git://github.com/jackaudio/jack2.git \ - file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ - file://0001-Use-SYS_futex-instead-of-__NR_futex.patch \ - " -SRCREV = "5b78c2ef158c2d9ffe09818a7dd80209ed251c5f" - -S = "${WORKDIR}/git" - -inherit waf pkgconfig - -PACKAGECONFIG ??= "alsa" -PACKAGECONFIG[alsa] = "--alsa=yes,--alsa=no,alsa-lib" -# --dbus only stops building jackd -> add --classic -PACKAGECONFIG[dbus] = "--dbus --classic,,dbus" -PACKAGECONFIG[opus] = "--opus=yes,--opus=no,libopus" - -# portaudio is for windows builds only -EXTRA_OECONF = "--portaudio=no" - -do_install_append() { - if ! ${@bb.utils.contains('PACKAGECONFIG', 'dbus', True, False, d)}; then - rm -f ${D}${bindir}/jack_control - fi -} - -PACKAGES =+ "libjack jack-server jack-utils" - -RDEPENDS_jack-dev_remove = "${PN} (= ${EXTENDPKGV})" - -FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" -FILES_jack-server = " \ - ${datadir}/dbus-1/services \ - ${bindir}/jackdbus \ - ${bindir}/jackd \ -" -FILES_jack-utils = "${bindir}/*" - -FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb new file mode 100644 index 000000000..d5288c7b7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "jackdmp is a C++ version of the JACK low-latency audio \ +server for multi-processor machines. It is a new implementation of the \ +JACK server core features that aims in removing some limitations of \ +the JACK1 design. The activation system has been changed for a data \ +flow model and lock-free programming techniques for graph access have \ +been used to have a more dynamic and robust system." +SECTION = "libs/multimedia" + +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://common/jack/control.h;beginline=2;endline=21;md5=e6df0bf30cde8b3b825451459488195d \ + file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \ +" + +DEPENDS = "libsamplerate0 libsndfile1 readline" + +SRC_URI = "git://github.com/jackaudio/jack2.git \ + file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ + " +SRCREV = "9e23888b8def6527774889cf4ef6348fb78c7154" + +S = "${WORKDIR}/git" + +inherit waf pkgconfig + +PACKAGECONFIG ??= "alsa" +PACKAGECONFIG[alsa] = "--alsa=yes,--alsa=no,alsa-lib" +# --dbus only stops building jackd -> add --classic +PACKAGECONFIG[dbus] = "--dbus --classic,,dbus" +PACKAGECONFIG[opus] = "--opus=yes,--opus=no,libopus" + +# portaudio is for windows builds only +EXTRA_OECONF = "--portaudio=no" + +do_install_append() { + if ! ${@bb.utils.contains('PACKAGECONFIG', 'dbus', True, False, d)}; then + rm -f ${D}${bindir}/jack_control + fi +} + +PACKAGES =+ "libjack jack-server jack-utils" + +RDEPENDS_jack-dev_remove = "${PN} (= ${EXTENDPKGV})" + +FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" +FILES_jack-server = " \ + ${datadir}/dbus-1/services \ + ${bindir}/jackdbus \ + ${bindir}/jackd \ +" +FILES_jack-utils = "${bindir}/*" + +FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*" diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb deleted file mode 100644 index a49d13692..000000000 --- a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "C-Periphery lib used to access GPIO, LED, PWM, SPI, I2C, MMIO, Serial" -DESCRIPTION = "A C library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux" - -HOMEPAGE = "https://github.com/vsergeev/c-periphery" - -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" - -SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" -SRCREV = "8c9f87227b99ac74509b01602dc21d814fe91516" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb new file mode 100644 index 000000000..effab9de9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "C-Periphery lib used to access GPIO, LED, PWM, SPI, I2C, MMIO, Serial" +DESCRIPTION = "A C library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux" + +HOMEPAGE = "https://github.com/vsergeev/c-periphery" + +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" + +SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" +SRCREV = "23bfa4ab481edbad82a69ee385fc58ce03b63084" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb index 4305e3b40..4641b0181 100644 --- a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb @@ -1,6 +1,6 @@ require dfu-util_${PV}.bb -inherit native deploy +inherit deploy native DEPENDS = "libusb1-native" diff --git a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch index fc0d86e33..93d6d5857 100644 --- a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch +++ b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch @@ -1,3 +1,8 @@ +From 14100c6fc2cce7260ca5ace81094aee0ae40dd07 Mon Sep 17 00:00:00 2001 +From: Paul Barker +Date: Sun, 5 Nov 2017 22:07:30 +0000 +Subject: [PATCH] htop: Update to v2.0.2 + We need to use pkg-config to find the ncurses library instead of the ncurses*-config applications. @@ -7,11 +12,15 @@ Signed-off-by: Robert Joslyn Upstream-status: Inappropriate (`ncurses*-config` can be used outside of OpenEmbedded) +--- + configure.ac | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + diff --git a/configure.ac b/configure.ac -index 559dc4d..77aea22 100644 +index 115d894..0e0a1eb 100644 --- a/configure.ac +++ b/configure.ac -@@ -185,10 +185,10 @@ m4_define([HTOP_CHECK_LIB], +@@ -205,10 +205,10 @@ AS_VAR_POPDEF([CACHEVAR])dnl AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") if test "x$enable_unicode" = xyes; then @@ -26,9 +35,9 @@ index 559dc4d..77aea22 100644 HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], -@@ -201,8 +201,8 @@ if test "x$enable_unicode" = xyes; then - [AC_CHECK_HEADERS([ncurses/curses.h],[:], - [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) +@@ -225,8 +225,8 @@ if test "x$enable_unicode" = xyes; then + # (at this point we already link against a working ncurses library with wide character support) + AC_SEARCH_LIBS([keypad], [tinfow tinfo]) else - HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", - HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.1.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.1.bb deleted file mode 100644 index d677e36c0..000000000 --- a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Interactive process viewer" -HOMEPAGE = "https://htop.dev" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891" - -DEPENDS = "ncurses" - -SRC_URI = "git://github.com/htop-dev/htop.git \ - file://0001-Use-pkg-config.patch \ - " -SRCREV = "dace850fa6e27b5626115b366059258cfe4d60c9" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "cgroup \ - taskstats \ - unicode \ - linux-affinity \ - delayacct" -PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz" -PACKAGECONFIG[cgroup] = "--enable-cgroup,--disable-cgroup" -PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver" -PACKAGECONFIG[taskstats] = "--enable-taskstats,--disable-taskstats" -PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode" -PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinity" -PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc" -PACKAGECONFIG[setuid] = "--enable-setuid,--disable-setuid" -PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb new file mode 100644 index 000000000..8e9b95d91 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb @@ -0,0 +1,33 @@ +SUMMARY = "Interactive process viewer" +HOMEPAGE = "https://htop.dev" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891" + +DEPENDS = "ncurses" + +SRC_URI = "git://github.com/htop-dev/htop.git \ + file://0001-Use-pkg-config.patch \ + " +SRCREV = "ce6d60e7def146c13d0b8bca4642e7401a0a8995" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= " \ + unicode \ + linux-affinity \ + delayacct \ +" +PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz" +PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver" +PACKAGECONFIG[ancient-vserver] = "--enable-ancient-vserver,--disable-ancient-vserver" +PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode" +PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc" +PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinity" +PACKAGECONFIG[setuid] = "--enable-setuid,--disable-setuid" +PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" +PACKAGECONFIG[sensors] = "--with-sensors,--without-sensors,lmsensors,lmsensors-libsensors" + +FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/htop.svg" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb index 0ac08bd51..59c6093b1 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.342" -SRCREV = "bdcc84fca6eb97bef9a8a8b04f71cbed8f32a986" +PV = "0.343" +SRCREV = "cce4969f24c213ae3ab45ee90a485b342ab74014" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb deleted file mode 100644 index 86553b5a8..000000000 --- a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based on IMAP queries" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ccca8573ead8e965c130b6b2946a36ab" - -SRC_URI = "https://codeload.github.com/lefcha/${BPN}/tar.gz/v${PV};downloadfilename=${BP}.tar.gz \ - file://ldflags.patch \ -" -SRC_URI[sha256sum] = "90af9bc9875e03fb5a09a3233287b74dd817867cb18ec9ff52fead615755563e" - -DEPENDS= "openssl lua libpcre" - -EXTRA_OEMAKE_append = " PREFIX=${prefix}" - -do_install(){ - oe_runmake DESTDIR=${D} install - - # No need for manuals at this point, MANDIR is hardcoded to depend on prefix - rm -rf ${D}${prefix}/man -} - -ASNEEDED = "" diff --git a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.5.bb b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.5.bb new file mode 100644 index 000000000..0d21a6bfe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.5.bb @@ -0,0 +1,21 @@ +SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based on IMAP queries" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=db3b99f230f9758fd77e4a0654e2266d" + +SRC_URI = "https://codeload.github.com/lefcha/${BPN}/tar.gz/v${PV};downloadfilename=${BP}.tar.gz \ + file://ldflags.patch \ +" +SRC_URI[sha256sum] = "ab19f840712e6951e51c29e44c43b3b2fa42e93693f98f8969cc763a4fad56bf" + +DEPENDS= "openssl lua libpcre2" + +EXTRA_OEMAKE_append = " PREFIX=${prefix}" + +do_install(){ + oe_runmake DESTDIR=${D} install + + # No need for manuals at this point, MANDIR is hardcoded to depend on prefix + rm -rf ${D}${prefix}/man +} + +ASNEEDED = "" diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb index 24677386f..66c48da3b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb @@ -6,8 +6,7 @@ SECTION = "net" DEPENDS = "file" -SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ -" +SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz" SRC_URI[md5sum] = "2a286193af88ab2ae3149748d4b46187" SRC_URI[sha256sum] = "0ae825f8e0d7f41201fd44a0df1cf454c1cb0bc50fe9d59c26552260264c2ff8" @@ -28,3 +27,5 @@ PACKAGECONFIG[https] = "--enable-https,--disable-https,libgcrypt gnutls," do_compile_append() { sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index 98cc63eb3..212b1e797 100644 --- a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -16,7 +16,7 @@ RDEPENDS_${PN} += "wget" inherit autotools -EXTRA_OECONF = "ac_cv_path_SH=${base_bindir}/sh ac_cv_path_WGET=${bindir}/wget" +EXTRA_OECONF = "ac_cv_path_SH=${base_bindir}/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk" do_install_append () { install -d ${D}${sysconfdir} diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch new file mode 100644 index 000000000..83c29a651 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch @@ -0,0 +1,36 @@ +From 139177715a2d66ccd3e099be5d9d4dc86db30055 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Tue, 12 Jan 2021 03:05:38 +0000 +Subject: [PATCH] test: avoid the pfa test hang + +Per [1], the pfa test needs to install page-types and the pfa test +will hang forever if there is no page-types installed. + +Improve the test script to avoid the pfa test hang. + +[1] https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/tree/tests/pfa/PFA_test_howto?id=7b776a8c005b60572f49797e81287540f99fff1f + +Upstream-Status: Submitted [https://github.com/andikleen/mcelog/pull/87] + +Signed-off-by: Mingli Yu +--- + tests/test | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/test b/tests/test +index 9623f4a..7c552a9 100755 +--- a/tests/test ++++ b/tests/test +@@ -45,6 +45,9 @@ for conf in `ls *.conf` + do + log=`echo $conf | sed "s/conf/log/g"` + ./inject $conf ++ if [ "$1" = "pfa" ] ; then ++ which page-types > /dev/null 2>&1 || continue ++ fi + $D ../../mcelog --foreground --daemon --debug-numerrors --config $conf --logfile $log >> result + + # let triggers finish +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb index bdb080f41..f3e018d4a 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb @@ -6,6 +6,7 @@ HOMEPAGE = "http://mcelog.org/" SECTION = "System Environment/Base" SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ + file://0001-test-avoid-the-pfa-test-hang.patch \ file://run-ptest \ " diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.1.bb b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.1.bb deleted file mode 100644 index 0a1442fc7..000000000 --- a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.1.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \ -processes, programs, files, directories and filesystems on a UNIX system. \ -Monit conducts automatic maintenance and repair and can execute meaningful \ -causal actions in error situations." - -HOMEPAGE = "http://mmonit.com/monit/" - -LICENSE = "AGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ - file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" - -SRC_URI = " \ - https://mmonit.com/monit/dist/monit-${PV}.tar.gz \ - file://monit \ - file://monitrc \ -" - -SRC_URI[md5sum] = "200068f37847e3402f6a9b061c2d327e" -SRC_URI[sha256sum] = "f57408d16185687513a3c4eb3f2bb72eef76331ac16210e9652e846e5c84ed51" - -DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" - -inherit autotools-brokensep systemd update-rc.d - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" - -EXTRA_OECONF = "\ - libmonit_cv_setjmp_available=no \ - libmonit_cv_vsnprintf_c99_conformant=no \ - --with-ssl-lib-dir=${STAGING_LIBDIR} \ - --with-ssl-incl-dir=${STAGING_INCDIR} \ -" - -SYSTEMD_SERVICE_${PN} = "monit.service" -SYSTEMD_AUTO_ENABLE = "enable" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "monit" -INITSCRIPT_PARAMS_${PN} = "defaults 89" - -do_install_append() { - - # Configuration file - install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc - - # SystemD - install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service - sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service - - # SysV - install -Dm 0755 ${WORKDIR}/monit ${D}${sysconfdir}/init.d/monit -} diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb new file mode 100644 index 000000000..b5e16d0f9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \ +processes, programs, files, directories and filesystems on a UNIX system. \ +Monit conducts automatic maintenance and repair and can execute meaningful \ +causal actions in error situations." + +HOMEPAGE = "http://mmonit.com/monit/" + +LICENSE = "AGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ + file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" + +SRC_URI = " \ + https://mmonit.com/monit/dist/monit-${PV}.tar.gz \ + file://monit \ + file://monitrc \ +" + +SRC_URI[md5sum] = "13a0804dae18ef08198c3ace72f9dd60" +SRC_URI[sha256sum] = "d8809c78d5dc1ed7a7ba32a5a55c5114855132cc4da4805f8d3aaf8cf46eaa4c" + +DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" + +inherit autotools-brokensep systemd update-rc.d + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" + +EXTRA_OECONF = "\ + libmonit_cv_setjmp_available=no \ + libmonit_cv_vsnprintf_c99_conformant=no \ + --with-ssl-lib-dir=${STAGING_LIBDIR} \ + --with-ssl-incl-dir=${STAGING_INCDIR} \ +" + +SYSTEMD_SERVICE_${PN} = "monit.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME_${PN} = "monit" +INITSCRIPT_PARAMS_${PN} = "defaults 89" + +do_install_append() { + + # Configuration file + install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc + + # SystemD + install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service + sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service + + # SysV + install -Dm 0755 ${WORKDIR}/monit ${D}${sysconfdir}/init.d/monit +} diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.1.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.1.bb new file mode 100644 index 000000000..dc147efea --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.1.bb @@ -0,0 +1,271 @@ +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://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[sha256sum] = "2051c20b61112df24bad533ac37f6c66c1bc0d6ea70bb9d9cad102d20324279d" + +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" + +# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a +# which caused -march conflicts in gcc +TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" + +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} +} + +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 NSS_ENABLE_WERROR=0 + + 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}" \ + autobuild +} + +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 ${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} () { + 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 + echo "shlibsign -i $FN failed" + fi + done +} + +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" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb deleted file mode 100644 index 112f67629..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb +++ /dev/null @@ -1,271 +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://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[sha256sum] = "84abd5575ab874c53ae511bd461e5d0868d1a1b384ee40753154cdd1d590fe3d" - -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" - -# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a -# which caused -march conflicts in gcc -TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" - -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} -} - -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 NSS_ENABLE_WERROR=0 - - 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}" \ - autobuild -} - -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 ${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} () { - 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 - echo "shlibsign -i $FN failed" - fi - done -} - -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" diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.56.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.56.bb deleted file mode 100644 index 4c0f179cb..000000000 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.56.bb +++ /dev/null @@ -1,254 +0,0 @@ -SUMMARY = "OpenLDAP Directory Service" -DESCRIPTION = "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol." -HOMEPAGE = "http://www.OpenLDAP.org/license.html" -# The OpenLDAP Public License - see the HOMEPAGE - defines -# the license. www.openldap.org claims this is Open Source -# (see http://www.openldap.org), the license appears to be -# basically BSD. opensource.org does not record this license -# at present (so it is apparently not OSI certified). -LICENSE = "OpenLDAP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=5391b559d23a2237bdb21e7a62dae7c3 \ - file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ - " -SECTION = "libs" - -LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" - -SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \ - file://openldap-m4-pthread.patch \ - file://openldap-2.4.28-gnutls-gcrypt.patch \ - file://use-urandom.patch \ - file://initscript \ - file://slapd.service \ - file://thread_stub.patch \ - file://openldap-CVE-2015-3276.patch \ - file://remove-user-host-pwd-from-version.patch \ -" - -SRC_URI[md5sum] = "82a7dcf7aeaf95fdad16017c0ed9983a" -SRC_URI[sha256sum] = "25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0" - -DEPENDS = "util-linux groff-native" - -# The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when -# installing .so and executables, this fails in cross compilation -# environments -SRC_URI += "file://install-strip.patch" - -inherit autotools-brokensep update-rc.d systemd - -# CV SETTINGS -# Required to work round AC_FUNC_MEMCMP which gets the wrong answer -# when cross compiling (should be in site?) -EXTRA_OECONF += "ac_cv_func_memcmp_working=yes" - -# CONFIG DEFINITIONS -# The following is necessary because it cannot be determined for a -# cross compile automagically. Select should yield fine on all OE -# systems... -EXTRA_OECONF += "--with-yielding-select=yes" -# Shared libraries are nice... -EXTRA_OECONF += "--enable-dynamic" - -PACKAGECONFIG ??= "gnutls modules \ - mdb ldap meta monitor null passwd shell proxycache dnssrv \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ -" -#--with-tls with TLS/SSL support auto|openssl|gnutls [auto] -PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls libgcrypt" -PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl" - -PACKAGECONFIG[sasl] = "--with-cyrus-sasl,--without-cyrus-sasl,cyrus-sasl" -PACKAGECONFIG[modules] = "lt_cv_dlopen_self=yes --enable-modules,--disable-modules,libtool" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" - -# SLAPD options -# -# UNIX crypt(3) passwd support: -EXTRA_OECONF += "--enable-crypt" - -# SLAPD BACKEND -# -# The backend must be set by the configuration. This controls the -# required database. -# -# Backends="bdb dnssrv hdb ldap mdb meta monitor ndb null passwd perl relay shell sock sql" -# -# Note that multiple backends can be built. The ldbm backend requires a -# build-time choice of database API. The bdb backend forces this to be -# DB4. To use the gdbm (or other) API the Berkely database module must -# be removed from the build. -md = "${libexecdir}/openldap" -# -#--enable-bdb enable Berkeley DB backend no|yes|mod yes -# The Berkely DB is the standard choice. This version of OpenLDAP requires -# the version 4 implementation or better. -PACKAGECONFIG[bdb] = "--enable-bdb=yes,--enable-bdb=no,db" - -#--enable-dnssrv enable dnssrv backend no|yes|mod no -PACKAGECONFIG[dnssrv] = "--enable-dnssrv=mod,--enable-dnssrv=no" - -#--enable-hdb enable Hierarchical DB backend no|yes|mod no -PACKAGECONFIG[hdb] = "--enable-hdb=yes,--enable-hdb=no,db" - -#--enable-ldap enable ldap backend no|yes|mod no -PACKAGECONFIG[ldap] = "--enable-ldap=mod,--enable-ldap=no," - -#--enable-mdb enable mdb database backend no|yes|mod [yes] -PACKAGECONFIG[mdb] = "--enable-mdb=yes,--enable-mdb=no," - -#--enable-meta enable metadirectory backend no|yes|mod no -PACKAGECONFIG[meta] = "--enable-meta=mod,--enable-meta=no," - -#--enable-monitor enable monitor backend no|yes|mod yes -PACKAGECONFIG[monitor] = "--enable-monitor=mod,--enable-monitor=no," - -#--enable-ndb enable MySQL NDB Cluster backend no|yes|mod [no] -PACKAGECONFIG[ndb] = "--enable-ndb=mod,--enable-ndb=no," - -#--enable-null enable null backend no|yes|mod no -PACKAGECONFIG[null] = "--enable-null=mod,--enable-null=no," - -#--enable-passwd enable passwd backend no|yes|mod no -PACKAGECONFIG[passwd] = "--enable-passwd=mod,--enable-passwd=no," - -#--enable-perl enable perl backend no|yes|mod no -# This requires a loadable perl dynamic library, if enabled without -# doing something appropriate (building perl?) the build will pick -# up the build machine perl - not good (inherit perlnative?) -PACKAGECONFIG[perl] = "--enable-perl=mod,--enable-perl=no,perl" - -#--enable-relay enable relay backend no|yes|mod [yes] -PACKAGECONFIG[relay] = "--enable-relay=mod,--enable-relay=no," - -#--enable-shell enable shell backend no|yes|mod no -# configure: WARNING: Use of --without-threads is recommended with back-shell -PACKAGECONFIG[shell] = "--enable-shell=mod --without-threads,--enable-shell=no," - -#--enable-sock enable sock backend no|yes|mod [no] -PACKAGECONFIG[sock] = "--enable-sock=mod,--enable-sock=no," - -#--enable-sql enable sql backend no|yes|mod no -# sql requires some sql backend which provides sql.h, sqlite* provides -# sqlite.h (which may be compatible but hasn't been tried.) -PACKAGECONFIG[sql] = "--enable-sql=mod,--enable-sql=no,sqlite3" - -#--enable-dyngroup Dynamic Group overlay no|yes|mod no -# This is a demo, Proxy Cache defines init_module which conflicts with the -# same symbol in dyngroup -PACKAGECONFIG[dyngroup] = "--enable-dyngroup=mod,--enable-dyngroup=no," - -#--enable-proxycache Proxy Cache overlay no|yes|mod no -PACKAGECONFIG[proxycache] = "--enable-proxycache=mod,--enable-proxycache=no," -FILES_${PN}-overlay-proxycache = "${md}/pcache-*.so.*" -PACKAGES += "${PN}-overlay-proxycache" - -# Append URANDOM_DEVICE='/dev/urandom' to CPPFLAGS: -# This allows tls to obtain random bits from /dev/urandom, by default -# it was disabled for cross-compiling. -CPPFLAGS_append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\' -fPIC" - -LDFLAGS_append = " -pthread" - -do_configure() { - cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build - rm -f ${S}/libtool - aclocal - libtoolize --force --copy - gnu-configize - autoconf - oe_runconf -} - -LEAD_SONAME = "libldap-${LDAP_VER}.so.*" - -# The executables go in a separate package. This allows the -# installation of the libraries with no daemon support. -# Each module also has its own package - see above. -PACKAGES += "${PN}-slapd ${PN}-slurpd ${PN}-bin" - -# Package contents - shift most standard contents to -bin -FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/${BPN}/data" -FILES_${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \ - ${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \ - ${sysconfdir}/openldap/DB_CONFIG.example ${systemd_unitdir}/system/*" -FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp" -FILES_${PN}-bin = "${bindir}" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" -FILES_${PN}-dbg += "${libexecdir}/openldap/.debug" - -do_install_append() { - install -d ${D}${sysconfdir}/init.d - cat ${WORKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap - chmod 755 ${D}${sysconfdir}/init.d/openldap - # This is duplicated in /etc/openldap and is for slapd - rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example - - # Installing slapd under ${sbin} is more FHS and LSB compliance - mv ${D}${libexecdir}/slapd ${D}/${sbindir}/slapd - rmdir --ignore-fail-on-non-empty ${D}${libexecdir} - SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema" - cd ${D}/${sbindir}/ - rm -f ${SLAPTOOLS} - for i in ${SLAPTOOLS}; do ln -sf slapd $i; done - - rmdir "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/slapd.service ${D}${systemd_unitdir}/system/ - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/*.service - - # Uses mdm as the database - # and localstatedir as data directory ... - sed -e 's/# modulepath/modulepath/' \ - -e 's/# moduleload\s*back_bdb.*/moduleload back_mdb/' \ - -e 's/database\s*bdb/database mdb/' \ - -e 's%^directory\s*.*%directory ${localstatedir}/${BPN}/data/%' \ - -i ${D}${sysconfdir}/openldap/slapd.conf - - mkdir -p ${D}${localstatedir}/${BPN}/data - - -} - -INITSCRIPT_PACKAGES = "${PN}-slapd" -INITSCRIPT_NAME_${PN}-slapd = "openldap" -INITSCRIPT_PARAMS_${PN}-slapd = "defaults" -SYSTEMD_SERVICE_${PN}-slapd = "hostapd.service" -SYSTEMD_AUTO_ENABLE_${PN}-slapd ?= "disable" - - -PACKAGES_DYNAMIC += "^${PN}-backends.* ^${PN}-backend-.*" - -# The modules require their .so to be dynamicaly loaded -INSANE_SKIP_${PN}-backend-dnssrv += "dev-so" -INSANE_SKIP_${PN}-backend-ldap += "dev-so" -INSANE_SKIP_${PN}-backend-meta += "dev-so" -INSANE_SKIP_${PN}-backend-mdb += "dev-so" -INSANE_SKIP_${PN}-backend-monitor += "dev-so" -INSANE_SKIP_${PN}-backend-null += "dev-so" -INSANE_SKIP_${PN}-backend-passwd += "dev-so" -INSANE_SKIP_${PN}-backend-shell += "dev-so" - - -python populate_packages_prepend () { - backend_dir = d.expand('${libexecdir}/openldap') - do_split_packages(d, backend_dir, 'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True) - do_split_packages(d, backend_dir, 'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True) - - metapkg = "${PN}-backends" - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - d.setVar('FILES_' + metapkg, "") - metapkg_rdepends = [] - packages = d.getVar('PACKAGES').split() - for pkg in packages[1:]: - if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"): - metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) - d.setVar('DESCRIPTION_' + metapkg, 'OpenLDAP backends meta package') - packages.append(metapkg) - d.setVar('PACKAGES', ' '.join(packages)) -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.57.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.57.bb new file mode 100644 index 000000000..a282523a3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.57.bb @@ -0,0 +1,254 @@ +SUMMARY = "OpenLDAP Directory Service" +DESCRIPTION = "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol." +HOMEPAGE = "http://www.OpenLDAP.org/license.html" +# The OpenLDAP Public License - see the HOMEPAGE - defines +# the license. www.openldap.org claims this is Open Source +# (see http://www.openldap.org), the license appears to be +# basically BSD. opensource.org does not record this license +# at present (so it is apparently not OSI certified). +LICENSE = "OpenLDAP" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b6dea6c170362fc46381fe3690c722cb \ + file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ + " +SECTION = "libs" + +LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" + +SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \ + file://openldap-m4-pthread.patch \ + file://openldap-2.4.28-gnutls-gcrypt.patch \ + file://use-urandom.patch \ + file://initscript \ + file://slapd.service \ + file://thread_stub.patch \ + file://openldap-CVE-2015-3276.patch \ + file://remove-user-host-pwd-from-version.patch \ +" + +SRC_URI[md5sum] = "e3349456c3a66e5e6155be7ddc3f042c" +SRC_URI[sha256sum] = "c7ba47e1e6ecb5b436f3d43281df57abeffa99262141aec822628bc220f6b45a" + +DEPENDS = "util-linux groff-native" + +# The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when +# installing .so and executables, this fails in cross compilation +# environments +SRC_URI += "file://install-strip.patch" + +inherit autotools-brokensep update-rc.d systemd + +# CV SETTINGS +# Required to work round AC_FUNC_MEMCMP which gets the wrong answer +# when cross compiling (should be in site?) +EXTRA_OECONF += "ac_cv_func_memcmp_working=yes" + +# CONFIG DEFINITIONS +# The following is necessary because it cannot be determined for a +# cross compile automagically. Select should yield fine on all OE +# systems... +EXTRA_OECONF += "--with-yielding-select=yes" +# Shared libraries are nice... +EXTRA_OECONF += "--enable-dynamic" + +PACKAGECONFIG ??= "gnutls modules \ + mdb ldap meta monitor null passwd shell proxycache dnssrv \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ +" +#--with-tls with TLS/SSL support auto|openssl|gnutls [auto] +PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls libgcrypt" +PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl" + +PACKAGECONFIG[sasl] = "--with-cyrus-sasl,--without-cyrus-sasl,cyrus-sasl" +PACKAGECONFIG[modules] = "lt_cv_dlopen_self=yes --enable-modules,--disable-modules,libtool" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" + +# SLAPD options +# +# UNIX crypt(3) passwd support: +EXTRA_OECONF += "--enable-crypt" + +# SLAPD BACKEND +# +# The backend must be set by the configuration. This controls the +# required database. +# +# Backends="bdb dnssrv hdb ldap mdb meta monitor ndb null passwd perl relay shell sock sql" +# +# Note that multiple backends can be built. The ldbm backend requires a +# build-time choice of database API. The bdb backend forces this to be +# DB4. To use the gdbm (or other) API the Berkely database module must +# be removed from the build. +md = "${libexecdir}/openldap" +# +#--enable-bdb enable Berkeley DB backend no|yes|mod yes +# The Berkely DB is the standard choice. This version of OpenLDAP requires +# the version 4 implementation or better. +PACKAGECONFIG[bdb] = "--enable-bdb=yes,--enable-bdb=no,db" + +#--enable-dnssrv enable dnssrv backend no|yes|mod no +PACKAGECONFIG[dnssrv] = "--enable-dnssrv=mod,--enable-dnssrv=no" + +#--enable-hdb enable Hierarchical DB backend no|yes|mod no +PACKAGECONFIG[hdb] = "--enable-hdb=yes,--enable-hdb=no,db" + +#--enable-ldap enable ldap backend no|yes|mod no +PACKAGECONFIG[ldap] = "--enable-ldap=mod,--enable-ldap=no," + +#--enable-mdb enable mdb database backend no|yes|mod [yes] +PACKAGECONFIG[mdb] = "--enable-mdb=yes,--enable-mdb=no," + +#--enable-meta enable metadirectory backend no|yes|mod no +PACKAGECONFIG[meta] = "--enable-meta=mod,--enable-meta=no," + +#--enable-monitor enable monitor backend no|yes|mod yes +PACKAGECONFIG[monitor] = "--enable-monitor=mod,--enable-monitor=no," + +#--enable-ndb enable MySQL NDB Cluster backend no|yes|mod [no] +PACKAGECONFIG[ndb] = "--enable-ndb=mod,--enable-ndb=no," + +#--enable-null enable null backend no|yes|mod no +PACKAGECONFIG[null] = "--enable-null=mod,--enable-null=no," + +#--enable-passwd enable passwd backend no|yes|mod no +PACKAGECONFIG[passwd] = "--enable-passwd=mod,--enable-passwd=no," + +#--enable-perl enable perl backend no|yes|mod no +# This requires a loadable perl dynamic library, if enabled without +# doing something appropriate (building perl?) the build will pick +# up the build machine perl - not good (inherit perlnative?) +PACKAGECONFIG[perl] = "--enable-perl=mod,--enable-perl=no,perl" + +#--enable-relay enable relay backend no|yes|mod [yes] +PACKAGECONFIG[relay] = "--enable-relay=mod,--enable-relay=no," + +#--enable-shell enable shell backend no|yes|mod no +# configure: WARNING: Use of --without-threads is recommended with back-shell +PACKAGECONFIG[shell] = "--enable-shell=mod --without-threads,--enable-shell=no," + +#--enable-sock enable sock backend no|yes|mod [no] +PACKAGECONFIG[sock] = "--enable-sock=mod,--enable-sock=no," + +#--enable-sql enable sql backend no|yes|mod no +# sql requires some sql backend which provides sql.h, sqlite* provides +# sqlite.h (which may be compatible but hasn't been tried.) +PACKAGECONFIG[sql] = "--enable-sql=mod,--enable-sql=no,sqlite3" + +#--enable-dyngroup Dynamic Group overlay no|yes|mod no +# This is a demo, Proxy Cache defines init_module which conflicts with the +# same symbol in dyngroup +PACKAGECONFIG[dyngroup] = "--enable-dyngroup=mod,--enable-dyngroup=no," + +#--enable-proxycache Proxy Cache overlay no|yes|mod no +PACKAGECONFIG[proxycache] = "--enable-proxycache=mod,--enable-proxycache=no," +FILES_${PN}-overlay-proxycache = "${md}/pcache-*.so.*" +PACKAGES += "${PN}-overlay-proxycache" + +# Append URANDOM_DEVICE='/dev/urandom' to CPPFLAGS: +# This allows tls to obtain random bits from /dev/urandom, by default +# it was disabled for cross-compiling. +CPPFLAGS_append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\' -fPIC" + +LDFLAGS_append = " -pthread" + +do_configure() { + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build + rm -f ${S}/libtool + aclocal + libtoolize --force --copy + gnu-configize + autoconf + oe_runconf +} + +LEAD_SONAME = "libldap-${LDAP_VER}.so.*" + +# The executables go in a separate package. This allows the +# installation of the libraries with no daemon support. +# Each module also has its own package - see above. +PACKAGES += "${PN}-slapd ${PN}-slurpd ${PN}-bin" + +# Package contents - shift most standard contents to -bin +FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/${BPN}/data" +FILES_${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \ + ${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \ + ${sysconfdir}/openldap/DB_CONFIG.example ${systemd_unitdir}/system/*" +FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp" +FILES_${PN}-bin = "${bindir}" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" +FILES_${PN}-dbg += "${libexecdir}/openldap/.debug" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + cat ${WORKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap + chmod 755 ${D}${sysconfdir}/init.d/openldap + # This is duplicated in /etc/openldap and is for slapd + rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example + + # Installing slapd under ${sbin} is more FHS and LSB compliance + mv ${D}${libexecdir}/slapd ${D}/${sbindir}/slapd + rmdir --ignore-fail-on-non-empty ${D}${libexecdir} + SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema" + cd ${D}/${sbindir}/ + rm -f ${SLAPTOOLS} + for i in ${SLAPTOOLS}; do ln -sf slapd $i; done + + rmdir "${D}${localstatedir}/run" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" + + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/slapd.service ${D}${systemd_unitdir}/system/ + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/*.service + + # Uses mdm as the database + # and localstatedir as data directory ... + sed -e 's/# modulepath/modulepath/' \ + -e 's/# moduleload\s*back_bdb.*/moduleload back_mdb/' \ + -e 's/database\s*bdb/database mdb/' \ + -e 's%^directory\s*.*%directory ${localstatedir}/${BPN}/data/%' \ + -i ${D}${sysconfdir}/openldap/slapd.conf + + mkdir -p ${D}${localstatedir}/${BPN}/data + + +} + +INITSCRIPT_PACKAGES = "${PN}-slapd" +INITSCRIPT_NAME_${PN}-slapd = "openldap" +INITSCRIPT_PARAMS_${PN}-slapd = "defaults" +SYSTEMD_SERVICE_${PN}-slapd = "hostapd.service" +SYSTEMD_AUTO_ENABLE_${PN}-slapd ?= "disable" + + +PACKAGES_DYNAMIC += "^${PN}-backends.* ^${PN}-backend-.*" + +# The modules require their .so to be dynamicaly loaded +INSANE_SKIP_${PN}-backend-dnssrv += "dev-so" +INSANE_SKIP_${PN}-backend-ldap += "dev-so" +INSANE_SKIP_${PN}-backend-meta += "dev-so" +INSANE_SKIP_${PN}-backend-mdb += "dev-so" +INSANE_SKIP_${PN}-backend-monitor += "dev-so" +INSANE_SKIP_${PN}-backend-null += "dev-so" +INSANE_SKIP_${PN}-backend-passwd += "dev-so" +INSANE_SKIP_${PN}-backend-shell += "dev-so" + + +python populate_packages_prepend () { + backend_dir = d.expand('${libexecdir}/openldap') + do_split_packages(d, backend_dir, 'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True) + do_split_packages(d, backend_dir, 'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True) + + metapkg = "${PN}-backends" + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + d.setVar('FILES_' + metapkg, "") + metapkg_rdepends = [] + packages = d.getVar('PACKAGES').split() + for pkg in packages[1:]: + if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"): + metapkg_rdepends.append(pkg) + d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('DESCRIPTION_' + metapkg, 'OpenLDAP backends meta package') + packages.append(metapkg) + d.setVar('PACKAGES', ' '.join(packages)) +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.1.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.1.bb deleted file mode 100644 index 2fbf60c14..000000000 --- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.1.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "Smart card library and applications" -DESCRIPTION = "OpenSC is a tool for accessing smart card devices. Basic\ -functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO\ -7816-4 compatible smart card. Encryption and decryption using private\ -keys on the smart card is possible with PKCS\ -such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten\ -eID cards have also been confirmed to work." - -HOMEPAGE = "http://www.opensc-project.org/opensc/" -SECTION = "System Environment/Libraries" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" - -#v0.21.0 -SRCREV = "30180986a08cf71fe4af4b50251a8bb5b1ab95af" -SRC_URI = "git://github.com/OpenSC/OpenSC \ - " -DEPENDS = "virtual/libiconv openssl" - -S = "${WORKDIR}/git" -inherit autotools pkgconfig bash-completion - -EXTRA_OECONF = " \ - --disable-static \ - --disable-ctapi \ - --disable-doc \ -" -EXTRA_OEMAKE = "DESTDIR=${D}" - -PACKAGECONFIG ??= "pcsc" - -PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct" -PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite,pcsc-lite pcsc-lite-lib" - -RDEPENDS_${PN} = "readline" - -FILES_${PN} += "\ - ${libdir}/opensc-pkcs11.so \ - ${libdir}/onepin-opensc-pkcs11.so \ - ${libdir}/pkcs11-spy.so \ -" -FILES_${PN}-dev += "\ - ${libdir}/pkcs11/opensc-pkcs11.so \ - ${libdir}/pkcs11/onepin-opensc-pkcs11.so \ - ${libdir}/pkcs11/pkcs11-spy.so \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.21.0.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.21.0.bb new file mode 100644 index 000000000..2fbf60c14 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.21.0.bb @@ -0,0 +1,48 @@ +SUMMARY = "Smart card library and applications" +DESCRIPTION = "OpenSC is a tool for accessing smart card devices. Basic\ +functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO\ +7816-4 compatible smart card. Encryption and decryption using private\ +keys on the smart card is possible with PKCS\ +such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten\ +eID cards have also been confirmed to work." + +HOMEPAGE = "http://www.opensc-project.org/opensc/" +SECTION = "System Environment/Libraries" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" + +#v0.21.0 +SRCREV = "30180986a08cf71fe4af4b50251a8bb5b1ab95af" +SRC_URI = "git://github.com/OpenSC/OpenSC \ + " +DEPENDS = "virtual/libiconv openssl" + +S = "${WORKDIR}/git" +inherit autotools pkgconfig bash-completion + +EXTRA_OECONF = " \ + --disable-static \ + --disable-ctapi \ + --disable-doc \ +" +EXTRA_OEMAKE = "DESTDIR=${D}" + +PACKAGECONFIG ??= "pcsc" + +PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct" +PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite,pcsc-lite pcsc-lite-lib" + +RDEPENDS_${PN} = "readline" + +FILES_${PN} += "\ + ${libdir}/opensc-pkcs11.so \ + ${libdir}/onepin-opensc-pkcs11.so \ + ${libdir}/pkcs11-spy.so \ +" +FILES_${PN}-dev += "\ + ${libdir}/pkcs11/opensc-pkcs11.so \ + ${libdir}/pkcs11/onepin-opensc-pkcs11.so \ + ${libdir}/pkcs11/pkcs11-spy.so \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb deleted file mode 100644 index 87a57523f..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE = "https://poppler.freedesktop.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-Do-not-overwrite-all-our-build-flags.patch \ - file://basename-include.patch \ - " -SRC_URI[sha256sum] = "d0aa2586c0a4296c775f0d2045f28bb95a694113fc995f95350faa12930f7b35" - -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" - -inherit cmake pkgconfig gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" -PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" -PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" -PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" -PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON,-DENABLE_SPLASH=OFF,boost" - -# surprise - did not expect this to work :) -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -EXTRA_OECMAKE += " \ - -DENABLE_CMS=lcms2 \ - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ - -DBUILD_GTK_TESTS=OFF \ - -DENABLE_ZLIB=ON \ - -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ -" - -do_configure_append() { - # poppler macro uses pkg-config to check for g-ir runtimes. Something - # makes them point to /usr/bin. Align them to sysroot - that's where the - # gir-wrappers are: - sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja -} - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES_libpoppler = "${libdir}/libpoppler.so.*" -FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.01.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.01.0.bb new file mode 100644 index 000000000..4d4c310a4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.01.0.bb @@ -0,0 +1,51 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://basename-include.patch \ + " +SRC_URI[sha256sum] = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" +PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" +PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" +PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" +PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON,-DENABLE_SPLASH=OFF,boost" + +# surprise - did not expect this to work :) +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +EXTRA_OECMAKE += " \ + -DENABLE_CMS=lcms2 \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DENABLE_ZLIB=ON \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ +" + +do_configure_append() { + # poppler macro uses pkg-config to check for g-ir runtimes. Something + # makes them point to /usr/bin. Align them to sysroot - that's where the + # gir-wrappers are: + sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja +} + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES_libpoppler = "${libdir}/libpoppler.so.*" +FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb b/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb new file mode 100644 index 000000000..7f6fcdb01 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "A regular expression library" +HOMEPAGE = "https://github.com/google/re2/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" + +SRCREV = "166dbbeb3b0ab7e733b278e8f42a84f6882b8a25" + +SRC_URI = "git://github.com/google/re2.git;branch=master" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += " \ + -DBUILD_SHARED_LIBS=ON \ + -DRE2_BUILD_TESTING=OFF \ +" + +# Don't include so files in dev package +FILES_${PN} = "${libdir}" +FILES_${PN}-dev = "${includedir} ${libdir}/cmake" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.10.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.10.bb new file mode 100644 index 000000000..ef36fddcb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.10.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+" +HOMEPAGE = "https://remmina.org" +SECTION = "Support" +LICENSE = "GPLv2 & openssl" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" +DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret libxkbfile" + + +DEPENDS_append_libc-musl = " libexecinfo" +LDFLAGS_append_libc-musl = " -lexecinfo" + +SRCREV = "9d1dbdf2d648644e0de9590c6291d7e7b72a1473" +SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https \ +" + +PV .= "+git${SRCPV}" + +S = "${WORKDIR}/git" + +inherit cmake features_check mime-xdg +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" + +do_install_append(){ + # We dont need the extra stuff form other desktop environments + rm -rf ${D}/${datadir}/xsessions + rm -rf ${D}/${datadir}/metainfo + rm -rf ${D}/${datadir}/gnome-session +} + +PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" + +RDEPENDS_${PN} = "bash" + +FILES_${PN}_append = " ${datadir}/icons/hicolor/*" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.8.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.8.bb deleted file mode 100644 index 336357088..000000000 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.8.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+" -HOMEPAGE = "https://remmina.org" -SECTION = "Support" -LICENSE = "GPLv2 & openssl" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" -DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret libxkbfile" - - -DEPENDS_append_libc-musl = " libexecinfo" -LDFLAGS_append_libc-musl = " -lexecinfo" - -SRCREV = "7ebc497062de66881b71bbe7f54dabfda0129ac2" -SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https \ -" - -S = "${WORKDIR}/git" - -inherit cmake features_check mime-xdg -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" - -do_install_append(){ - # We dont need the extra stuff form other desktop environments - rm -rf ${D}/${datadir}/xsessions - rm -rf ${D}/${datadir}/metainfo - rm -rf ${D}/${datadir}/gnome-session -} - -PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" - -RDEPENDS_${PN} = "bash" - -FILES_${PN}_append = " ${datadir}/icons/hicolor/*" diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.35.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.35.bb deleted file mode 100644 index c6159c42b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.35.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Satyr is a collection of low-level algorithms for program \ -failure processing, analysis, and reporting supporting kernel space, user \ -space, Python, and Java programs" - -HOMEPAGE = "https://github.com/abrt/satyr" -LICENSE = "GPLv2" - -inherit autotools-brokensep python3native pkgconfig - -SRC_URI = "git://github.com/abrt/satyr.git \ - file://0002-fix-compile-failure-against-musl-C-library.patch \ -" -SRCREV = "8690a1f83adc5a7a83e856ebc7adf6310bbd3b9f" -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS += " \ - gdb \ - gperf-native \ - json-c \ - nettle \ - glib-2.0 \ -" - -PACKAGES += "python3-${BPN}" -FILES_python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" - -PACKAGECONFIG ??= "python3 rpm" -PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" - -do_configure_prepend() { - ${S}/gen-version -} diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.36.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.36.bb new file mode 100644 index 000000000..b6988baa7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.36.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Satyr is a collection of low-level algorithms for program \ +failure processing, analysis, and reporting supporting kernel space, user \ +space, Python, and Java programs" + +HOMEPAGE = "https://github.com/abrt/satyr" +LICENSE = "GPLv2" + +inherit autotools-brokensep python3native pkgconfig + +SRC_URI = "git://github.com/abrt/satyr.git \ + file://0002-fix-compile-failure-against-musl-C-library.patch \ +" +SRCREV = "a1f232b7dbca7ff787076fcfb63ce7d7fb15b753" +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS += " \ + gdb \ + gperf-native \ + json-c \ + nettle \ + glib-2.0 \ +" + +PACKAGES += "python3-${BPN}" +FILES_python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" + +PACKAGECONFIG ??= "python3 rpm" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" +PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" + +do_configure_prepend() { + ${S}/gen-version +} diff --git a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb index 56c2d4447..cde26df49 100644 --- a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb @@ -4,9 +4,9 @@ AUTHOR = "Christophe BLAESS" LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381" -BPV = "0.8.6" +BPV = "0.8.7" PV = "${BPV}" -SRCREV = "9ce73aab05873b2d3996bd21076305463133f102" +SRCREV = "67937230d70ad87c23c7116a72df83577e309f6f" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch deleted file mode 100644 index a444901f8..000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch +++ /dev/null @@ -1,321 +0,0 @@ -From b6c765d693a0833b94cb2e91b32842570c3458d2 Mon Sep 17 00:00:00 2001 -From: vboxsync -Date: Tue, 15 Dec 2020 22:29:56 +0000 -Subject: [PATCH] Additions/linux/drm: Adjustment for Linux 5.10. - -Upstream-Status: Backport - -git-svn-id: http://www.virtualbox.org/svn/vbox@87092 cfe28804-0f27-0410-a406-dd0f0b0b656f - -Signed-off-by: Bruce Ashfield - ---- - src/VBox/Additions/linux/drm/vbox_drv.h | 10 +- - src/VBox/Additions/linux/drm/vbox_fb.c | 2 +- - .../src/VBox/Additions/linux/drm/vbox_mode.c | 2 +- - src/VBox/Additions/linux/drm/vbox_ttm.c | 99 +++++++++++++++++-- - 4 files changed, 99 insertions(+), 14 deletions(-) - -diff --git a/src/VBox/Additions/linux/drm/vbox_drv.h b/src/VBox/Additions/linux/drm/vbox_drv.h -index 8c85371749..7937f2f2d2 100644 ---- a/src/VBox/Additions/linux/drm/vbox_drv.h -+++ b/src/VBox/Additions/linux/drm/vbox_drv.h -@@ -175,6 +175,9 @@ - #include - #include - #include -+#if RTLNX_VER_MIN(5,10,0) -+# include -+#endif - - #include "vboxvideo_guest.h" - #include "vboxvideo_vbe.h" -@@ -444,7 +447,10 @@ int vbox_bo_create(struct drm_device *dev, int size, int align, - int vbox_gem_create(struct drm_device *dev, - u32 size, bool iskernel, struct drm_gem_object **obj); - --int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr); -+#define VBOX_MEM_TYPE_VRAM 0x1 -+#define VBOX_MEM_TYPE_SYSTEM 0x2 -+ -+int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr); - int vbox_bo_unpin(struct vbox_bo *bo); - - static inline int vbox_bo_reserve(struct vbox_bo *bo, bool no_wait) -@@ -469,7 +475,7 @@ static inline void vbox_bo_unreserve(struct vbox_bo *bo) - ttm_bo_unreserve(&bo->bo); - } - --void vbox_ttm_placement(struct vbox_bo *bo, int domain); -+void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type); - int vbox_bo_push_sysram(struct vbox_bo *bo); - int vbox_mmap(struct file *filp, struct vm_area_struct *vma); - -diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c -index adead98d3d..7182d9da1a 100644 ---- a/src/VBox/Additions/linux/drm/vbox_fb.c -+++ b/src/VBox/Additions/linux/drm/vbox_fb.c -@@ -295,7 +295,7 @@ static int vboxfb_create(struct drm_fb_helper *helper, - if (ret) - return ret; - -- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL); -+ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, NULL); - if (ret) { - vbox_bo_unreserve(bo); - return ret; -diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c b/src/VBox/Additions/linux/drm/vbox_mode.c -index ce7d135cb6..5557db5ef8 100644 ---- a/src/VBox/Additions/linux/drm/vbox_mode.c -+++ b/src/VBox/Additions/linux/drm/vbox_mode.c -@@ -227,7 +227,7 @@ static int vbox_crtc_set_base(struct drm_crtc *crtc, - if (ret) - return ret; - -- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, &gpu_addr); -+ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, &gpu_addr); - vbox_bo_unreserve(bo); - if (ret) - return ret; -diff --git a/src/VBox/Additions/linux/drm/vbox_ttm.c b/src/VBox/Additions/linux/drm/vbox_ttm.c -index bf87aabc05..5eac926a42 100644 ---- a/src/VBox/Additions/linux/drm/vbox_ttm.c -+++ b/src/VBox/Additions/linux/drm/vbox_ttm.c -@@ -41,6 +41,7 @@ - #define PLACEMENT_FLAGS(placement) ((placement).flags) - #endif - -+ - static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd) - { - return container_of(bd, struct vbox_private, ttm.bdev); -@@ -125,6 +126,7 @@ static bool vbox_ttm_bo_is_vbox_bo(struct ttm_buffer_object *bo) - return false; - } - -+#if RTLNX_VER_MAX(5,10,0) - static int - vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type, - struct ttm_mem_type_manager *man) -@@ -148,6 +150,7 @@ vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type, - - return 0; - } -+#endif - - static void - vbox_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl) -@@ -157,7 +160,7 @@ vbox_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl) - if (!vbox_ttm_bo_is_vbox_bo(bo)) - return; - -- vbox_ttm_placement(vboxbo, TTM_PL_FLAG_SYSTEM); -+ vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_SYSTEM); - *pl = vboxbo->placement; - } - -@@ -167,11 +170,12 @@ static int vbox_bo_verify_access(struct ttm_buffer_object *bo, - return 0; - } - -+#if RTLNX_VER_MAX(5,10,0) - static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, - struct ttm_mem_reg *mem) - { -- struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; - struct vbox_private *vbox = vbox_bdev(bdev); -+ struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; - - mem->bus.addr = NULL; - mem->bus.offset = 0; -@@ -194,12 +198,53 @@ static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, - } - return 0; - } -+#else -+static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, -+ struct ttm_resource *mem) -+{ -+ struct vbox_private *vbox = vbox_bdev(bdev); -+ mem->bus.addr = NULL; -+ mem->bus.offset = 0; -+ mem->size = mem->num_pages << PAGE_SHIFT; -+ mem->start = 0; -+ mem->bus.is_iomem = false; -+ switch (mem->mem_type) { -+ case TTM_PL_SYSTEM: -+ /* system memory */ -+ return 0; -+ case TTM_PL_VRAM: -+ mem->bus.offset = mem->start << PAGE_SHIFT; -+ mem->start = pci_resource_start(vbox->dev->pdev, 0); -+ mem->bus.is_iomem = true; -+ break; -+ default: -+ return -EINVAL; -+ } -+ return 0; -+} -+#endif - -+ -+ -+#if RTLNX_VER_MIN(5,10,0) -+static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev, -+ struct ttm_resource *mem) -+{ -+} -+#else - static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev, - struct ttm_mem_reg *mem) - { - } -+#endif - -+#if RTLNX_VER_MIN(5,10,0) -+static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt) -+{ -+ ttm_tt_fini(tt); -+ kfree(tt); -+} -+#else - static void vbox_ttm_backend_destroy(struct ttm_tt *tt) - { - ttm_tt_fini(tt); -@@ -209,6 +254,7 @@ static void vbox_ttm_backend_destroy(struct ttm_tt *tt) - static struct ttm_backend_func vbox_tt_backend_func = { - .destroy = &vbox_ttm_backend_destroy, - }; -+#endif - - #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) - static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev, -@@ -226,7 +272,9 @@ static struct ttm_tt *vbox_ttm_tt_create(struct ttm_buffer_object *bo, - if (!tt) - return NULL; - -+#if RTLNX_VER_MAX(5,10,0) - tt->func = &vbox_tt_backend_func; -+#endif - #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) - if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) { - #else -@@ -261,11 +309,16 @@ static void vbox_ttm_tt_unpopulate(struct ttm_tt *ttm) - - static struct ttm_bo_driver vbox_bo_driver = { - .ttm_tt_create = vbox_ttm_tt_create, -+#if RTLNX_VER_MIN(5,10,0) -+ .ttm_tt_destroy = vbox_ttm_tt_destroy, -+#endif - #if RTLNX_VER_MAX(4,17,0) - .ttm_tt_populate = vbox_ttm_tt_populate, - .ttm_tt_unpopulate = vbox_ttm_tt_unpopulate, - #endif -+#if RTLNX_VER_MAX(5,10,0) - .init_mem_type = vbox_bo_init_mem_type, -+#endif - #if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4) - .eviction_valuable = ttm_bo_eviction_valuable, - #endif -@@ -318,8 +371,13 @@ int vbox_mm_init(struct vbox_private *vbox) - #endif - } - -+#if RTLNX_VER_MIN(5,10,0) -+ ret = ttm_range_man_init(bdev, TTM_PL_VRAM, false, -+ vbox->available_vram_size >> PAGE_SHIFT); -+#else - ret = ttm_bo_init_mm(bdev, TTM_PL_VRAM, - vbox->available_vram_size >> PAGE_SHIFT); -+#endif - if (ret) { - DRM_ERROR("Failed ttm VRAM init: %d\n", ret); - goto err_device_release; -@@ -359,7 +417,7 @@ void vbox_mm_fini(struct vbox_private *vbox) - #endif - } - --void vbox_ttm_placement(struct vbox_bo *bo, int domain) -+void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type) - { - u32 c = 0; - #if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2) -@@ -372,15 +430,36 @@ void vbox_ttm_placement(struct vbox_bo *bo, int domain) - bo->placement.placement = bo->placements; - bo->placement.busy_placement = bo->placements; - -- if (domain & TTM_PL_FLAG_VRAM) -+ if (mem_type & VBOX_MEM_TYPE_VRAM) { -+#if RTLNX_VER_MIN(5,10,0) -+ bo->placements[c].mem_type = TTM_PL_VRAM; -+ PLACEMENT_FLAGS(bo->placements[c++]) = -+ TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED; -+#else - PLACEMENT_FLAGS(bo->placements[c++]) = - TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM; -- if (domain & TTM_PL_FLAG_SYSTEM) -+#endif -+ } -+ if (mem_type & VBOX_MEM_TYPE_SYSTEM) { -+#if RTLNX_VER_MIN(5,10,0) -+ bo->placements[c].mem_type = TTM_PL_SYSTEM; -+ PLACEMENT_FLAGS(bo->placements[c++]) = -+ TTM_PL_MASK_CACHING; -+#else - PLACEMENT_FLAGS(bo->placements[c++]) = - TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM; -- if (!c) -+#endif -+ } -+ if (!c) { -+#if RTLNX_VER_MIN(5,10,0) -+ bo->placements[c].mem_type = TTM_PL_SYSTEM; -+ PLACEMENT_FLAGS(bo->placements[c++]) = -+ TTM_PL_MASK_CACHING; -+#else - PLACEMENT_FLAGS(bo->placements[c++]) = - TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM; -+#endif -+ } - - bo->placement.num_placement = c; - bo->placement.num_busy_placement = c; -@@ -414,7 +493,7 @@ int vbox_bo_create(struct drm_device *dev, int size, int align, - vboxbo->bo.bdev->dev_mapping = dev->dev_mapping; - #endif - -- vbox_ttm_placement(vboxbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM); -+ vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM); - - acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size, - sizeof(struct vbox_bo)); -@@ -452,7 +531,7 @@ static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo) - #endif - } - --int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr) -+int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr) - { - #if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) - struct ttm_operation_ctx ctx = { false, false }; -@@ -467,7 +546,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr) - return 0; - } - -- vbox_ttm_placement(bo, pl_flag); -+ vbox_ttm_placement(bo, mem_type); - - for (i = 0; i < bo->placement.num_placement; i++) - PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT; -@@ -540,7 +619,7 @@ int vbox_bo_push_sysram(struct vbox_bo *bo) - if (bo->kmap.virtual) - ttm_bo_kunmap(&bo->kmap); - -- vbox_ttm_placement(bo, TTM_PL_FLAG_SYSTEM); -+ vbox_ttm_placement(bo, VBOX_MEM_TYPE_SYSTEM); - - for (i = 0; i < bo->placement.num_placement; i++) - PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT; --- -2.19.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch deleted file mode 100644 index db27cb883..000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 2a6e3cf63f58e289802a11faad5fb495e2d04e97 Mon Sep 17 00:00:00 2001 -From: vboxsync -Date: Wed, 9 Dec 2020 18:59:04 +0000 -Subject: [PATCH] Runtime/memobj-r0drv-linux.c: Changes to support the upcoming - 5.10 kernel, bugref:9879 - -Upstream-Status: Backport - -git-svn-id: http://www.virtualbox.org/svn/vbox@87074 cfe28804-0f27-0410-a406-dd0f0b0b656f - -Signed-off-by: Bruce Ashfield ---- - .../Runtime/r0drv/linux/memobj-r0drv-linux.c | 68 ++++++++++++++++++- - 1 file changed, 67 insertions(+), 1 deletion(-) - ---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -@@ -56,9 +56,19 @@ - * Whether we use alloc_vm_area (3.2+) for executable memory. - * This is a must for 5.8+, but we enable it all the way back to 3.2.x for - * better W^R compliance (fExecutable flag). */ --#if RTLNX_VER_MIN(3,2,0) || defined(DOXYGEN_RUNNING) -+#if RTLNX_VER_RANGE(3,2,0, 5,10,0) || defined(DOXYGEN_RUNNING) - # define IPRT_USE_ALLOC_VM_AREA_FOR_EXEC - #endif -+/** @def IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC -+ * alloc_vm_area was removed with 5.10 so we have to resort to a different way -+ * to allocate executable memory. -+ * It would be possible to remove IPRT_USE_ALLOC_VM_AREA_FOR_EXEC and use -+ * this path execlusively for 3.2+ but no time to test it really works on every -+ * supported kernel, so better play safe for now. -+ */ -+#if RTLNX_VER_MIN(5,10,0) || defined(DOXYGEN_RUNNING) -+# define IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC -+#endif - - /* - * 2.6.29+ kernels don't work with remap_pfn_range() anymore because -@@ -502,6 +512,46 @@ static void rtR0MemObjLinuxFreePages(PRT - } - - -+#ifdef IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC -+/** -+ * User data passed to the apply_to_page_range() callback. -+ */ -+typedef struct LNXAPPLYPGRANGE -+{ -+ /** Pointer to the memory object. */ -+ PRTR0MEMOBJLNX pMemLnx; -+ /** The page protection flags to apply. */ -+ pgprot_t fPg; -+} LNXAPPLYPGRANGE; -+/** Pointer to the user data. */ -+typedef LNXAPPLYPGRANGE *PLNXAPPLYPGRANGE; -+/** Pointer to the const user data. */ -+typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE; -+ -+/** -+ * Callback called in apply_to_page_range(). -+ * -+ * @returns Linux status code. -+ * @param pPte Pointer to the page table entry for the given address. -+ * @param uAddr The address to apply the new protection to. -+ * @param pvUser The opaque user data. -+ */ -+#ifdef __i386__ -+static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) -+#else -+static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) -+#endif -+{ -+ PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser; -+ PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx; -+ size_t idxPg = (uAddr - (unsigned long)pMemLnx->Core.pv) >> PAGE_SHIFT; -+ -+ set_pte(pPte, mk_pte(pMemLnx->apPages[idxPg], pArgs->fPg)); -+ return 0; -+} -+#endif -+ -+ - /** - * Maps the allocation into ring-0. - * -@@ -584,6 +634,11 @@ static int rtR0MemObjLinuxVMap(PRTR0MEMO - else - # endif - { -+# if defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC) -+ if (fExecutable) -+ pgprot_val(fPg) |= _PAGE_NX; /* Uses RTR0MemObjProtect to clear NX when memory ready, W^X fashion. */ -+# endif -+ - # ifdef VM_MAP - pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg); - # else -@@ -1851,6 +1906,21 @@ DECLHIDDEN(int) rtR0MemObjNativeProtect( - preempt_enable(); - return VINF_SUCCESS; - } -+# elif defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC) -+ PRTR0MEMOBJLNX pMemLnx = (PRTR0MEMOBJLNX)pMem; -+ if ( pMemLnx->fExecutable -+ && pMemLnx->fMappedToRing0) -+ { -+ LNXAPPLYPGRANGE Args; -+ Args.pMemLnx = pMemLnx; -+ Args.fPg = rtR0MemObjLinuxConvertProt(fProt, true /*fKernel*/); -+ int rcLnx = apply_to_page_range(current->active_mm, (unsigned long)pMemLnx->Core.pv + offSub, cbSub, -+ rtR0MemObjLinuxApplyPageRange, (void *)&Args); -+ if (rcLnx) -+ return VERR_NOT_SUPPORTED; -+ -+ return VINF_SUCCESS; -+ } - # endif - - NOREF(pMem); diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch deleted file mode 100644 index 3cfe2e917..000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a276f8bc5e4515f7ea51e2c56e0e634a723ca104 Mon Sep 17 00:00:00 2001 -From: vboxsync -Date: Tue, 8 Dec 2020 13:52:53 +0000 -Subject: [PATCH] linser/vboxsf: Adjustment for linux 5.10 - TASK_SIZE_MAX - replaces USER_DS.seg. bugref:9879 - -Upstream-Status: Backport - -git-svn-id: http://www.virtualbox.org/svn/vbox@87053 cfe28804-0f27-0410-a406-dd0f0b0b656f - -Signed-off-by: Bruce Ashfield ---- - src/VBox/Additions/linux/sharedfolders/regops.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c -index e1fad3d820..401fd69930 100644 ---- a/src/VBox/Additions/linux/sharedfolders/regops.c -+++ b/src/VBox/Additions/linux/sharedfolders/regops.c -@@ -147,7 +147,11 @@ static int vbsf_iov_iter_detect_type(struct iovec const *paIov, size_t cSegs) - while (cSegs-- > 0) { - if (paIov->iov_len > 0) { - if (access_ok(VERIFY_READ, paIov->iov_base, paIov->iov_len)) -+#if RTLNX_VER_MIN(5,10,0) -+ return (uintptr_t)paIov->iov_base >= TASK_SIZE_MAX ? ITER_KVEC : 0; -+#else - return (uintptr_t)paIov->iov_base >= USER_DS.seg ? ITER_KVEC : 0; -+#endif - AssertMsgFailed(("%p LB %#zx\n", paIov->iov_base, paIov->iov_len)); - break; - } -@@ -1401,7 +1405,10 @@ static int vbsf_lock_user_pages_failed_check_kernel(uintptr_t uPtrFrom, size_t c - /* - * Check that this is valid user memory that is actually in the kernel range. - */ --#if RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1) -+#if RTLNX_VER_MIN(5,10,0) -+ if ( access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT) -+ && uPtrFrom >= TASK_SIZE_MAX) -+#elif RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1) - if ( access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT) - && uPtrFrom >= USER_DS.seg) - #else --- -2.19.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch new file mode 100644 index 000000000..a6b0a0454 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch @@ -0,0 +1,23 @@ +Origin: https://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg461494.html +From 80bfab5ec8575703ef26b442a3af2d030793ebde Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Jan=20R=C4=99korajski?= +Date: Thu, 24 Dec 2020 23:03:55 +0100 +Subject: [PATCH] - DECLCALLBACK generates incorrect code on ix86, remove it + +--- + kernel-5.10.patch | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel-5.10.patch b/kernel-5.10.patch +index b28d6e0..729235d 100644 +--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c ++++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +@@ -536,7 +536,7 @@ typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE; + * @param uAddr The address to apply the new protection to. + * @param pvUser The opaque user data. + */ +-static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) ++static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) + { + PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser; + PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx; diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb deleted file mode 100644 index ff639c09f..000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb +++ /dev/null @@ -1,85 +0,0 @@ -SUMMARY = "VirtualBox Linux Guest Drivers" -SECTION = "core" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" - -DEPENDS = "virtual/kernel" - -inherit module kernel-module-split - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" - -VBOX_NAME = "VirtualBox-${PV}" - -SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ - file://Makefile.utils \ - file://0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch \ - file://0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch \ - file://0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch \ -" -SRC_URI[md5sum] = "a12a647f6c114f2cb1571089b36841fe" -SRC_URI[sha256sum] = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1" - -S ?= "${WORKDIR}/vbox_module" -S_task-patch = "${WORKDIR}/${VBOX_NAME}" - -export BUILD_TARGET_ARCH="${ARCH}" -export BUILD_TARGET_ARCH_x86-64="amd64" - -EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" - -# otherwise 5.2.22 builds just vboxguest -MAKE_TARGETS = "all" - -addtask export_sources after do_patch before do_configure - -do_export_sources() { - mkdir -p "${S}" - ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz - tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz - - # add a mount utility to use shared folder from VBox Addition Source Code - mkdir -p "${S}/utils" - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils - install ${S}/../Makefile.utils ${S}/utils/Makefile - -} - -do_configure_prepend() { - # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. - # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in /build, or the variable KERN_VER must be set. Stop. - mkdir -p ${WORKDIR}/${KERNEL_VERSION} - ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build -} - -# compile and install mount utility -do_compile() { - oe_runmake all - oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils - if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then - echo "ERROR: One of vbox*.ko modules wasn't built" - exit 1 - fi -} - -module_do_install() { - MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc - install -d $MODULE_DIR - install -m 644 vboxguest.ko $MODULE_DIR - install -m 644 vboxsf.ko $MODULE_DIR - install -m 644 vboxvideo.ko $MODULE_DIR -} - -do_install_append() { - install -d ${D}${base_sbindir} - install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} -} - -PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" -RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" - -FILES_${PN} = "${base_sbindir}" - -# autoload if installed -KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb new file mode 100644 index 000000000..d620e9893 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb @@ -0,0 +1,83 @@ +SUMMARY = "VirtualBox Linux Guest Drivers" +SECTION = "core" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" + +DEPENDS = "virtual/kernel" + +inherit module kernel-module-split + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" + +VBOX_NAME = "VirtualBox-${PV}" + +SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ + file://Makefile.utils \ + file://kernel-5.10.patch \ +" +SRC_URI[md5sum] = "c61001386eb3822ab8f06d688a82e84b" +SRC_URI[sha256sum] = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40" + +S ?= "${WORKDIR}/vbox_module" +S_task-patch = "${WORKDIR}/${VBOX_NAME}" + +export BUILD_TARGET_ARCH="${ARCH}" +export BUILD_TARGET_ARCH_x86-64="amd64" + +EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" + +# otherwise 5.2.22 builds just vboxguest +MAKE_TARGETS = "all" + +addtask export_sources after do_patch before do_configure + +do_export_sources() { + mkdir -p "${S}" + ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz + tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz + + # add a mount utility to use shared folder from VBox Addition Source Code + mkdir -p "${S}/utils" + install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils + install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils + install ${S}/../Makefile.utils ${S}/utils/Makefile + +} + +do_configure_prepend() { + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in /build, or the variable KERN_VER must be set. Stop. + mkdir -p ${WORKDIR}/${KERNEL_VERSION} + ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build +} + +# compile and install mount utility +do_compile() { + oe_runmake all + oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils + if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then + echo "ERROR: One of vbox*.ko modules wasn't built" + exit 1 + fi +} + +module_do_install() { + MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc + install -d $MODULE_DIR + install -m 644 vboxguest.ko $MODULE_DIR + install -m 644 vboxsf.ko $MODULE_DIR + install -m 644 vboxvideo.ko $MODULE_DIR +} + +do_install_append() { + install -d ${D}${base_sbindir} + install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} +} + +PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" +RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" + +FILES_${PN} = "${base_sbindir}" + +# autoload if installed +KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch new file mode 100644 index 000000000..a5a298af0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch @@ -0,0 +1,22 @@ +xmlsec1: Fix configure QA error caused by host lookup path + +ERROR: mc:my-sdk:xmlsec1-1.2.30-r0 do_configure: QA Issue: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. + +It will eventually arise after the configure QA as the configure script should only look at the staging sysroot dir, not at the host. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Anatol Belski + +--- a/configure.ac.orig 2021-01-13 14:37:42.254991177 +0000 ++++ b/configure.ac 2021-01-13 14:40:56.546269330 +0000 +@@ -250,8 +250,8 @@ + dnl ========================================================================== + dnl Common installation locations + dnl ========================================================================== +-COMMON_INCLUDE_DIR="/usr/include /usr/local/include" +-COMMON_LIB_DIR="/usr/lib /usr/lib64 /usr/local/lib" ++COMMON_INCLUDE_DIR="${STAGING_INCDIR}" ++COMMON_LIB_DIR="${STAGING_LIBDIR}" + case $host in + i*86-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/i386-linux-gnu" ;; + x86_64-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/x86_64-linux-gnu" ;; diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb index 803016c96..3464f2f43 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb @@ -19,6 +19,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://xmlsec1-examples-allow-build-in-separate-dir.patch \ file://0001-nss-nspr-fix-for-multilib.patch \ file://run-ptest \ + file://ensure-search-path-non-host.patch \ " SRC_URI[md5sum] = "182f5cbdfb8ddbac535c04470c170dc3" diff --git a/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb b/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb index 170e0bf78..becf99148 100644 --- a/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780 S = "${WORKDIR}/${XORG_PN}-${PV}" B = "${WORKDIR}/build" -inherit native pkgconfig +inherit pkgconfig native do_configure[noexec] = "1" diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch b/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch deleted file mode 100644 index c93af3296..000000000 --- a/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 224507bc4b6e58f7a6e445bfebfb59d6b8d78bd6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 2 Dec 2016 17:38:51 -0800 -Subject: [PATCH] make relies GNU extentions - -We get errors like -`%'-style pattern rules are a GNU make extension - -Disable this warning, since we use gmake with OE -anyway - -Signed-off-by: Khem Raj ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -3,7 +3,7 @@ AC_PREREQ([2.61]) - AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net]) - AC_CONFIG_AUX_DIR(config) - AC_CONFIG_MACRO_DIR(config) --AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2]) -+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-error foreign subdir-objects std-options dist-bzip2]) - AC_CONFIG_HEADERS([include/config.h]) - AC_CONFIG_SRCDIR(zbar/scanner.c) - LT_PREREQ([2.2]) -@@ -47,7 +47,7 @@ AC_DEFINE_UNQUOTED([LIB_VERSION_REVISION - [Library revision]) - - AM_CPPFLAGS="-I$srcdir/include" --AM_CFLAGS="-Wall -Wno-parentheses -Werror" -+AM_CFLAGS="-Wall -Wno-parentheses" - AM_CXXFLAGS="$AM_CFLAGS" - AC_SUBST([AM_CPPFLAGS]) - AC_SUBST([AM_CFLAGS]) diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch b/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch new file mode 100644 index 000000000..d7ca15207 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch @@ -0,0 +1,35 @@ +From 9c67f377477a07495a712f478eabfa8d33164c45 Mon Sep 17 00:00:00 2001 +From: Daniel Gomez +Date: Sun, 17 Jan 2021 23:32:51 +0100 +Subject: [PATCH 1/2] qt: Create subdir in Makefile + +Create builddir/qt subdir when --with-qt5 is enabled. + +Fixes the following error: + +moc -Iqt -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore +-I../git/include ../git/include/zbar/QZBar.h -o qt/moc_QZBar.cpp +moc: Cannot create qt/moc_QZBar.cpp +make: *** [Makefile:2459: qt/moc_QZBar.cpp] Error 1 + +Signed-off-by: Daniel Gomez +--- + qt/Makefile.am.inc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/qt/Makefile.am.inc b/qt/Makefile.am.inc +index b099c2b..c98fbeb 100644 +--- a/qt/Makefile.am.inc ++++ b/qt/Makefile.am.inc +@@ -15,4 +15,5 @@ qt/moc_%.cpp: qt/%.h + $(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@ + + qt/moc_%.cpp: include/zbar/%.h ++ @$(mkdir_p) qt 2>/dev/null + $(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@ +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch b/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch new file mode 100644 index 000000000..a1c27b8b4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch @@ -0,0 +1,40 @@ +From fe751929ccc8fd75e350ed6db9d28d04bd31fc79 Mon Sep 17 00:00:00 2001 +From: Daniel Gomez +Date: Sun, 17 Jan 2021 23:33:19 +0100 +Subject: [PATCH 2/2] zbarcam: Create subdir in Makefile + +Create builddir/zbarcam when --with-qt5 is enabled. + +Fixes the following error: + +moc -i -Izbarcam -DQT_WIDGETS_LIB -DQT_X11EXTRAS_LIB -DQT_GUI_LIB +-DQT_CORE_LIB +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtX11Extras +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore +-I../git/include ../git/zbarcam/zbarcam-qt.cpp -o +zbarcam/moc_zbarcam_qt.h +moc: Cannot create zbarcam/moc_zbarcam_qt.h +make: *** [Makefile:2438: zbarcam/moc_zbarcam_qt.h] Error 1 + +Signed-off-by: Daniel Gomez +--- + zbarcam/Makefile.am.inc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc +index b6de82c..e90c50c 100644 +--- a/zbarcam/Makefile.am.inc ++++ b/zbarcam/Makefile.am.inc +@@ -28,6 +28,7 @@ DISTCLEANFILES += $(nodist_zbarcam_zbarcam_qt_SOURCES) zbarcam/moc_zbarcam_qt.h + + + zbarcam/moc_zbarcam_qt.h: zbarcam/zbarcam-qt.cpp ++ @$(mkdir_p) zbarcam 2>/dev/null + $(MOC) -i $(zbarcam_zbarcam_qt_CPPFLAGS) $< -o $@ + endif + +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb index 181d7ae43..dae912252 100644 --- a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb @@ -1,31 +1,59 @@ -DESCRIPTION = "2D barcode scanner toolkit." +HOMEPAGE = "https://github.com/mchehab/zbar" +SUMMARY = "A bar code library" +DESRIPTION = "ZBar is an open source software suite for reading bar codes \ +from various sources, such as video streams, image files and raw \ +intensity sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128, \ +Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code" SECTION = "graphics" + LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef" -DEPENDS = "pkgconfig intltool-native libpng jpeg" +SRC_URI = "git://github.com/mchehab/zbar.git;branch=master \ + file://0001-qt-Create-subdir-in-Makefile.patch \ + file://0002-zbarcam-Create-subdir-in-Makefile.patch \ +" +SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37" -LIC_FILES_CHKSUM = "file://COPYING;md5=4015840237ca7f0175cd626f78714ca8" +S = "${WORKDIR}/git" +PV = "0.23.1+git${SRCPV}" -PV = "0.10+git${SRCPV}" +DEPENDS += "xmlto-native" -# iPhoneSDK-1.3.1 tag -SRCREV = "67003d2a985b5f9627bee2d8e3e0b26d0c474b57" -SRC_URI = "git://github.com/ZBar/Zbar \ - file://0001-make-relies-GNU-extentions.patch \ +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ " -S = "${WORKDIR}/git" -inherit autotools pkgconfig +PACKAGECONFIG ??= "video python3" -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +inherit autotools pkgconfig gettext \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} -PACKAGECONFIG[x11] = "--with-x,-without-x,libxcb libx11 libsm libxau libxext libxv libice libxdmcp" +PACKAGECONFIG[x11] = "--with-x, --without-x, libxv" +PACKAGECONFIG[video] = "--enable-video, --disable-video, v4l-utils libv4l" +PACKAGECONFIG[jpeg] = "--with-jpeg, --without-jpeg, jpeg" +PACKAGECONFIG[python3] = "--with-python=auto, --without-python, python3" +PACKAGECONFIG[gtk3] = "--with-gtk=gtk3, --without-gtk, gtk+3" +PACKAGECONFIG[qt5] = "--with-qt5, --without-qt5, qtbase qtbase-native qtx11extras qtsvg, qtbase" +PACKAGECONFIG[imagemagick] = "--with-imagemagick, --without-imagemagick, imagemagick" -EXTRA_OECONF = "--without-imagemagick --without-qt --without-python --disable-video --without-gtk" +FILES_${PN} += "${bindir} \ + ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ +" + +CPPFLAGS_append = "\ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ + -I${STAGING_INCDIR}/QtX11Extras \ + -I${STAGING_INCDIR}/dbus-1.0 \ + -I${STAGING_LIBDIR}/dbus-1.0/include \ + ', '', d)} \ +" -CPPFLAGS += "-Wno-error" +TARGET_CXXFLAGS_append = " -fPIC" -do_install_append() { - #remove usr/bin if empty - rmdir ${D}${bindir} +do_prepare_recipe_sysroot_gettext() { + install -m 755 ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${S}/ } +addtask do_prepare_recipe_sysroot_gettext after do_prepare_recipe_sysroot before do_configure \ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb b/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb index 92db31e1e..f4871ee77 100644 --- a/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb +++ b/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb @@ -12,3 +12,5 @@ SRC_URI[md5sum] = "9dc669e6145cadd9674873e24943e6dd" SRC_URI[sha256sum] = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7" inherit autotools + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.001004.bb b/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.001004.bb deleted file mode 100644 index 41743d508..000000000 --- a/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.001004.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Role::Tiny - Roles. Like a nouvelle cousine portion size of Moose." -DESCRIPTION = "\"Role::Tiny\" is a minimalist role composition tool." - -SECTION = "libs" - -HOMEPAGE = "https://metacpan.org/pod/Role::Tiny" - -LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://README;beginline=182;endline=219;md5=26df7e7c20551fb1906e2286624f0b71" - -SRC_URI = "${CPAN_MIRROR}/authors/id/H/HA/HAARG/Role-Tiny-${PV}.tar.gz" -SRC_URI[md5sum] = "98446826608b1e943e65c1f6e35942fe" -SRC_URI[sha256sum] = "92ba5712850a74102c93c942eb6e7f62f7a4f8f483734ed289d08b324c281687" - -S = "${WORKDIR}/Role-Tiny-${PV}" - -inherit cpan - -RDEPENDS_${PN} = " perl-module-exporter \ - perl-module-strict \ - perl-module-test-more \ - perl-module-warnings \ -" - -RPROVIDES_${PN} = " librole-tiny-perl \ - librole-tiny-with-perl \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.002003.bb b/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.002003.bb new file mode 100644 index 000000000..531e77a10 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.002003.bb @@ -0,0 +1,29 @@ +SUMMARY = "Role::Tiny - Roles. Like a nouvelle cousine portion size of Moose." +DESCRIPTION = "\"Role::Tiny\" is a minimalist role composition tool." + +SECTION = "libs" + +HOMEPAGE = "https://metacpan.org/pod/Role::Tiny" + +LICENSE = "Artistic-1.0 | GPL-1.0+" +LIC_FILES_CHKSUM = "file://README;beginline=197;endline=234;md5=26df7e7c20551fb1906e2286624f0b71" + +SRC_URI = "${CPAN_MIRROR}/authors/id/H/HA/HAARG/Role-Tiny-${PV}.tar.gz" +SRC_URI[md5sum] = "065e459cdc3c6e163c6e8359baf69f45" +SRC_URI[sha256sum] = "6981e5f2d0beded157840199d678da462b22a9a3753333cab322ab6efb0fbb89" + +S = "${WORKDIR}/Role-Tiny-${PV}" + +inherit cpan + +RDEPENDS_${PN} = " perl-module-exporter \ + perl-module-strict \ + perl-module-test-more \ + perl-module-warnings \ +" + +RPROVIDES_${PN} = " librole-tiny-perl \ + librole-tiny-with-perl \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index bf46896f1..8b267c9cb 100644 --- a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -7,440 +7,439 @@ PACKAGES = ' \ packagegroup-meta-python3 \ ' +# Note that python3-cvxopt requires Fortran support. To enable this, +# add the following to your local.conf: +# FORTRAN_forcevariable = ",fortran" RDEPENDS_packagegroup-meta-python3 = "\ - packagegroup-meta-python3-extended \ - packagegroup-meta-python3-connectivity \ -" - -RDEPENDS_packagegroup-meta-python3 = "\ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "python3-systemd", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "python3-blivetgui", "", d)} \ + gyp \ pamela \ pyrtm \ - ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "python3-systemd", "", d)} \ - python3-bcrypt \ - python3-flask-mail \ - python3-editor \ - python3-flask-pymongo \ - python3-cffi \ - python3-pillow \ - python3-markupsafe \ - python3-flask-nav \ - python3-asciitree \ - python3-flask-sqlalchemy \ - python3-gevent \ + python3-absl \ python3-aenum \ - python3-gast \ - python3-blinker \ - python3-prettytable \ - python3-cmd2 \ python3-aiofiles \ - python3-anyjson \ - python3-isodate \ - python3-incremental \ - python3-aiohttp-jinja2 \ python3-aiohttp \ + python3-aiohttp-jinja2 \ python3-alembic \ python3-ansi2html \ python3-ansicolors \ - python3-argcomplete \ - python3-argexec \ + python3-anyjson \ python3-appdirs \ python3-apply-defaults \ + python3-argcomplete \ + python3-argexec \ python3-argh \ - python3-ply \ - python3-astroid \ - python3-ndg-httpsclient \ python3-arpeggio \ - python3-astor \ - python3-pika \ + python3-asciitree \ python3-asn1crypto \ + python3-astor \ + python3-astroid \ + python3-asttokens \ python3-async-timeout \ - python3-absl \ python3-attr \ - python3-flask \ python3-autobahn \ - python3-babel \ - python3-pretend \ python3-automat \ - python3-ptyprocess \ python3-aws-iot-device-sdk-python \ - python3-bandit \ + python3-babel \ python3-backcall \ python3-backports-functools-lru-cache \ + python3-bandit \ + python3-bcrypt \ python3-beautifulsoup4 \ - python3-betamax \ python3-behave \ - python3-jsonpointer \ + python3-betamax \ python3-bitarray \ python3-bitstring \ python3-bitstruct \ - python3-cachecontrol \ + python3-blinker \ + python3-blivet \ python3-booleanpy \ + python3-cachecontrol \ python3-cachetools \ python3-can \ python3-cantools \ python3-cassandra-driver \ python3-cbor2 \ - python3-chardet \ + python3-cerberus \ python3-certifi \ - python3-isort \ - python3-colorama \ + python3-cffi \ + python3-chardet \ python3-cheetah \ python3-click \ - python3-huey \ + python3-click-repl \ + python3-click-spinner \ + python3-cmd2 \ + python3-colorama \ python3-coloredlogs \ python3-colorlog \ - python3-wheel \ - python3-configshell-fb \ - python3-constantly \ - python3-contextlib2 \ python3-configargparse \ - python3-crcmod \ python3-configobj \ python3-configparser \ + python3-configshell-fb \ + python3-constantly \ + python3-contextlib2 \ + python3-coverage \ python3-cppy \ - python3-dbussy \ + python3-crcmod \ + python3-croniter \ + python3-cryptography \ + python3-cryptography-vectors \ + python3-cson \ + python3-custom-inherit \ + python3-cvxopt \ + python3-cycler \ + python3-dateparser \ python3-dateutil \ + python3-dbus-next \ + python3-dbussy \ + python3-decorator \ + python3-defusedxml \ + python3-dill \ + python3-diskcache \ python3-distro \ - python3-click-repl \ - python3-redis \ + python3-django \ + python3-django-south \ + python3-djangorestframework \ + python3-dnspython \ + python3-docopt \ python3-dominate \ + python3-dt-schema \ + python3-dynamic-dispatch \ + python3-ecdsa \ + python3-editor \ + python3-engineio \ python3-et-xmlfile \ + python3-evdev \ + python3-fann2 \ + python3-fasteners \ + python3-fastnumbers \ python3-feedformatter \ + python3-flask \ + python3-flask-babel \ + python3-flask-bootstrap \ python3-flask-jsonpify \ python3-flask-jwt \ + python3-flask-login \ + python3-flask-mail \ python3-flask-migrate \ - python3-pyinotify \ + python3-flask-nav \ + python3-flask-pymongo \ python3-flask-restful \ + python3-flask-script \ + python3-flask-sijax \ python3-flask-socketio \ + python3-flask-sqlalchemy \ + python3-flask-uploads \ + python3-flask-user \ + python3-flask-versioned \ + python3-flask-wtf \ + python3-flask-xstatic \ + python3-future \ + python3-gast \ + python3-geojson \ + python3-gevent \ + python3-gmpy2 \ python3-gmqtt \ - python3-dateparser \ - python3-defusedxml \ - python3-rsa \ - python3-django-south \ - python3-grpcio \ - python3-pybind11-json \ + python3-gnupg \ python3-google-api-python-client \ + python3-graphviz \ + python3-greenlet \ + python3-greenstalk \ + python3-grpcio \ + python3-grpcio-tools \ + python3-gsocketpool \ + python3-gunicorn \ + python3-h2 \ python3-h5py \ - python3-dt-schema \ python3-haversine \ - python3-fasteners \ - python3-flask-bootstrap \ - python3-dbus-next \ - python3-dnspython \ - python3-traitlets \ - python3-pybind11 \ - python3-flask-script \ - python3-flask-sijax \ + python3-hexdump \ + python3-hpack \ python3-html2text \ python3-html5lib \ - python3-intervals \ - python3-ipy \ - python3-ipaddress \ - python3-iso8601 \ + python3-httplib2 \ + python3-huey \ python3-humanfriendly \ - python3-lrparsing \ - python3-itsdangerous \ + python3-humanize \ + python3-hyperframe \ python3-hyperlink \ - python3-idna-ssl \ - python3-jdcal \ - python3-greenstalk \ python3-icu \ - python3-jsonschema \ - python3-keras-applications \ python3-idna \ - python3-sympy \ - python3-langtable \ - python3-lockfile \ - python3-nmap \ + python3-idna \ + python3-idna-ssl \ + python3-imageio \ + python3-incremental \ + python3-inflection \ + python3-intervals \ + python3-ipaddress \ + python3-ipy \ + python3-ipython \ + python3-ipython-genutils \ + python3-iso3166 \ + python3-iso8601 \ + python3-isodate \ + python3-isort \ + python3-itsdangerous \ + python3-javaobj-py3 \ python3-jdatetime \ - python3-monotonic \ - python3-mpmath \ + python3-jdcal \ python3-jedi \ + python3-jsmin \ python3-jsonpatch \ + python3-jsonpath-rw \ + python3-jsonpointer \ + python3-jsonref \ python3-jsonrpcserver \ - python3-libconf \ - python3-netifaces \ - python3-msm \ - python3-nocaselist \ + python3-jsonschema \ + python3-jstyleson \ + python3-kconfiglib \ + python3-keras-applications \ python3-keras-preprocessing \ - python3-flask-babel \ + python3-kiwisolver \ + python3-langtable \ + python3-lazy-object-proxy \ + python3-libconf \ + python3-license-expression \ + python3-lockfile \ python3-lorem \ - python3-javaobj-py3 \ - python3-passlib \ - python3-pexpect \ + python3-lrparsing \ + python3-luma-core \ python3-luma-oled \ python3-lxml \ - python3-precise-runner \ - python3-padaos \ - python3-progress \ - python3-sqlalchemy \ - python3-sh \ - python3-petact \ + python3-lz4 \ + python3-m2crypto \ + python3-markdown \ + python3-markupsafe \ + python3-matplotlib \ + python3-mccabe \ + python3-meh \ + python3-meld3 \ python3-mock \ + python3-monotonic \ + python3-mpmath \ python3-msgpack \ - python3-pyasn1 \ python3-msk \ - python3-openpyxl \ - python3-prctl \ - python3-pyatspi \ + python3-msm \ python3-multidict \ + python3-mypy \ + python3-mypy-extensions \ + python3-natsort \ + python3-ndg-httpsclient \ python3-netaddr \ - python3-parse \ + python3-netifaces \ + python3-networkx \ + python3-nmap \ + python3-nocasedict \ + python3-nocaselist \ + python3-ntplib \ python3-oauthlib \ - python3-pyfirmata \ - python3-pandas \ + python3-obd \ + python3-openpyxl \ + python3-ordered-set \ + python3-padaos \ python3-padatious \ - python3-prompt-toolkit \ - python3-parse-type \ - python3-cycler \ - python3-decorator \ - python3-django \ - python3-croniter \ - python3-flask-user \ - python3-twitter \ - python3-evdev \ - python3-dynamic-dispatch \ - python3-click-spinner \ - python3-future \ - python3-geojson \ - python3-gunicorn \ - python3-engineio \ - python3-gmpy2 \ - python3-coverage \ - python3-fastnumbers \ - python3-fann2 \ - python3-gnupg \ - python3-flask-login \ - python3-pyzmq \ - python3-cryptography-vectors \ - python3-flask-uploads \ - python3-ecdsa \ - python3-networkx \ - python3-flask-xstatic \ - python3-pint \ - python3-iso3166 \ - python3-imageio \ - python3-mccabe \ - python3-kconfiglib \ - python3-grpcio-tools \ - python3-jsmin \ - python3-greenlet \ - python3-idna \ - python3-flask-versioned \ - python3-httplib2 \ - python3-ipython-genutils \ - python3-kiwisolver \ - python3-lz4 \ - python3-obd \ - python3-markdown \ - python3-m2crypto \ python3-paho-mqtt \ - python3-graphviz \ - python3-pyaudio \ python3-pako \ - python3-meld3 \ + python3-pandas \ python3-parallax \ - python3-lazy-object-proxy \ - python3-license-expression \ - python3-luma-core \ - python3-natsort \ - python3-polyline \ - python3-ordered-set \ + python3-paramiko \ + python3-parse \ + python3-parse-type \ python3-parso \ + python3-passlib \ + python3-pathtools3 \ + python3-pep8 \ + python3-periphery \ + python3-petact \ + python3-pexpect \ + python3-pickleshare \ + python3-pid \ + python3-pika \ + python3-pillow \ + python3-pint \ + python3-pkgconfig \ + python3-ply \ + python3-pocketsphinx \ + python3-polyline \ + python3-prctl \ + python3-precise-runner \ + python3-pretend \ + python3-prettytable \ + python3-priority \ + python3-progress \ + python3-prompt-toolkit \ + python3-protobuf \ + python3-psutil \ + python3-ptyprocess \ + python3-pulsectl \ + python3-py-ubjson \ + python3-pyalsaaudio \ + python3-pyasn1 \ + python3-pyasn1-modules \ + python3-pyatspi \ + python3-pyaudio \ + python3-pybind11 \ + python3-pybind11-json \ + python3-pybluez \ + python3-pychromecast \ + python3-pycodestyle \ + python3-pyconnman \ python3-pycparser \ python3-pycrypto \ + python3-pycurl \ python3-pydbus \ - python3-pathtools3 \ - python3-periphery \ + python3-pydicti \ + python3-pyephem \ + python3-pyexpect \ + python3-pyfirmata \ + python3-pyflakes \ + python3-pyhamcrest \ python3-pyiface \ + python3-pyinotify \ + python3-pyjks \ python3-pyjwt \ + python3-pykickstart \ python3-pykwalify \ - python3-docopt \ python3-pylint \ + python3-pylyrics \ + python3-pymisp \ + python3-pymongo \ + python3-pymysql \ + python3-pynacl \ python3-pynetlinux \ - python3-pickleshare \ python3-pyopenssl \ - python3-protobuf \ - python3-pyasn1-modules \ + python3-pyparted \ + python3-pyperclip \ + python3-pyperf \ + python3-pyrad \ + python3-pyro4 \ + python3-pyroute2 \ + python3-pyrsistent \ python3-pyscaffold \ python3-pyserial \ python3-pysocks \ - python3-pytoml \ + python3-pystache \ + python3-pystemd \ + python3-pytest-asyncio \ python3-pytest-helpers-namespace \ + python3-pytest-html \ + python3-pytest-metadata \ + python3-pytest-runner \ python3-pytest-tempdir \ - python3-pyflakes \ - python3-pyrad \ + python3-pytest-timeout \ + python3-python-vlc \ + python3-pytoml \ + python3-pytun \ + python3-pytz \ + python3-pyudev \ python3-pyusb \ - python3-pyhamcrest \ - python3-custom-inherit \ - python3-pymysql \ - python3-pyperclip \ + python3-pywbem \ + python3-pywbemtools \ + python3-pyyaml \ + python3-pyzmq \ + python3-qrcode \ + python3-raven \ + python3-rdflib \ + python3-redis \ + python3-regex \ + python3-requests \ + python3-requests-file \ + python3-requests-ftp \ + python3-requests-futures \ + python3-requests-oauthlib \ + python3-requests-toolbelt \ python3-rfc3339-validator \ - python3-pytz \ + python3-rfc3986-validator \ + python3-rfc3987 \ + python3-robotframework \ + python3-robotframework-seriallibrary \ + python3-rsa \ + python3-ruamel-yaml \ + python3-scapy \ python3-scrypt \ - python3-rdflib \ + python3-sdnotify \ + python3-semver \ + python3-send2trash \ + python3-sentry-sdk \ + python3-serpent \ + python3-sh \ python3-sijax \ - python3-regex \ + python3-simpleeval \ + python3-simplejson \ python3-slip-dbus \ + python3-smbus \ python3-smbus2 \ - python3-pytest-metadata \ - python3-term \ - python3-pystache \ - python3-pep8 \ - python3-pytest-runner \ - python3-pybluez \ - python3-rfc3986-validator \ - python3-pocketsphinx \ - python3-sdnotify \ - python3-pycodestyle \ + python3-smpplib \ + python3-snappy \ + python3-socketio \ + python3-soupsieve \ python3-speaklater \ - python3-wtforms \ python3-speedtest-cli \ - python3-pyudev \ - python3-sqlparse \ - python3-pyexpect \ - python3-pytest-html \ - python3-uritemplate \ - python3-cryptography \ - python3-requests \ - python3-test-generator \ - python3-whoosh \ - python3-xstatic-font-awesome \ - python3-tqdm \ - python3-vcversioner \ - python3-semver \ - python3-serpent \ python3-spidev \ + python3-spidev \ + python3-sqlalchemy \ + python3-sqlparse \ python3-sqlsoup \ - python3-tornado \ - python3-trafaret \ - python3-urllib3 \ - python3-yappi \ - python3-texttable \ - python3-humanize \ + python3-stevedore \ python3-strict-rfc3339 \ python3-supervisor \ - python3-diskcache \ - python3-requests-futures \ - python3-matplotlib \ - python3-sentry-sdk \ - python3-xlrd \ - python3-xstatic \ - python3-tzlocal \ - python3-ntplib \ - python3-u-msgpack-python \ - python3-python-vlc \ - python3-xlsxwriter \ - python3-inflection \ + python3-sympy \ python3-tabulate \ - python3-typing-extensions \ - python3-pystemd \ - python3-pid \ - python3-pkgconfig \ - python3-pylyrics \ - python3-pyyaml \ - python3-raven \ - python3-stevedore \ - python3-requests-oauthlib \ - python3-rfc3987 \ - python3-psutil \ - python3-robotframework-seriallibrary \ - python3-pulsectl \ - python3-py-ubjson \ - python3-pyalsaaudio \ - python3-simpleeval \ - python3-smbus \ - python3-pychromecast \ - python3-pyjks \ - python3-pymongo \ - python3-spidev \ - python3-pynacl \ + python3-term \ python3-termcolor \ - python3-pyperf \ - python3-qrcode \ - python3-visitor \ - python3-pyroute2 \ - python3-webencodings \ - python3-pyrsistent \ - python3-werkzeug \ - python3-pydicti \ - python3-xmlrunner \ - python3-smpplib \ - python3-pymisp \ - python3-requests-file \ - python3-requests-toolbelt \ - python3-ruamel-yaml \ - python3-socketio \ - python3-soupsieve \ + python3-test-generator \ python3-textparser \ + python3-texttable \ + python3-thrift \ python3-tinyrecord \ + python3-tornado \ + python3-tqdm \ + python3-trafaret \ + python3-trafaret-config \ + python3-traitlets \ + python3-transitions \ python3-twine \ + python3-twisted \ + python3-twitter \ + python3-twofish \ + python3-txaio \ + python3-txws \ + python3-typed-ast \ + python3-typeguard \ + python3-typing-extensions \ + python3-tzlocal \ + python3-u-msgpack-python \ + python3-ujson \ python3-unidiff \ + python3-uritemplate \ + python3-urllib3 \ + python3-vcversioner \ + python3-versiontools \ + python3-visitor \ + python3-waitress \ python3-watchdog \ python3-webcolors \ - python3-robotframework \ - python3-xxhash \ - python3-yarl \ - python3-zopeinterface \ - python3-requests-ftp \ - python3-scapy \ - python3-paramiko \ - python3-twofish \ - python3-simplejson \ - python3-snappy \ - python3-versiontools \ - python3-flask-wtf \ + python3-webencodings \ + python3-websocket-client \ python3-websockets \ python3-werkzeug \ + python3-werkzeug \ + python3-wheel \ + python3-whoosh \ python3-wrapt \ + python3-wtforms \ + python3-xlrd \ + python3-xlsxwriter \ + python3-xmlrunner \ python3-xmltodict \ - python3-trafaret-config \ - python3-twisted \ - python3-txaio \ - python3-typeguard \ - python3-pytest-timeout \ - python3-ujson \ - python3-waitress \ - python3-websocket-client \ python3-xmodem \ - python3-djangorestframework \ - python3-pytest-asyncio \ - python3-nocasedict \ + python3-xstatic \ + python3-xstatic-font-awesome \ + python3-xxhash \ python3-yamlloader \ - python3-ipython \ - python3-pycurl \ - gyp \ - python3-jsonref \ - python3-transitions \ - python3-dill \ - python3-cerberus \ - python3-cvxopt \ - python3-jsonpath-rw \ -" - -RDEPENDS_packagegroup-meta-python3-extended = "\ - python3-blivet \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "python3-blivetgui", "", d)} \ - python3-cson \ - python3-meh \ - python3-pyephem \ - python3-pykickstart \ - python3-pyparted \ - python3-pywbem \ - python3-pywbemtools \ -" - -RDEPENDS_packagegroup-meta-python3-connectivity = "\ - python3-gsocketpool \ - python3-h2 \ - python3-hpack \ - python3-hyperframe \ - python3-priority \ - python3-pyconnman \ - python3-pyro4 \ - python3-thrift \ - python3-txws \ - python3-pytun \ + python3-yappi \ + python3-yarl \ + python3-zopeinterface \ telepathy-python3 \ " @@ -448,6 +447,70 @@ RDEPENDS_packagegroup-meta-python3-ptest = "\ python3-cryptography-ptest \ python3-jinja2-ptest \ python3-markupsafe-ptest \ + python3-ansicolors-ptest \ + python3-anyjson-ptest \ + python3-appdirs-ptest \ + python3-backports-functools-lru-cache-ptest \ + python3-bcrypt-ptest \ + python3-betamax-ptest \ + python3-blinker-ptest \ + python3-cachetools-ptest \ + python3-cbor2-ptest \ + python3-click-ptest \ + python3-cryptography-ptest \ + python3-dnspython-ptest \ + python3-dominate-ptest \ + python3-geojson-ptest \ + python3-gunicorn-ptest \ + python3-html2text-ptest \ + python3-inflection-ptest \ + python3-intervals-ptest \ + python3-ipy-ptest \ + python3-iso3166-ptest \ + python3-jdcal-ptest \ + python3-jinja2-ptest \ + python3-jsmin-ptest \ + python3-jsonpointer-ptest \ + python3-license-expression-ptest \ + python3-markupsafe-ptest \ + python3-msgpack-ptest \ + python3-multidict-ptest \ + python3-ordered-set-ptest \ + python3-parse-ptest \ + python3-parse-type-ptest \ + python3-pint-ptest \ + python3-polyline-ptest \ + python3-precise-runner-ptest \ + python3-prettytable-ptest \ + python3-ptyprocess-ptest \ + python3-pyasn1-modules-ptest \ + python3-pyroute2-ptest \ + python3-pyserial-ptest \ + python3-pytoml-ptest \ + python3-pytz-ptest \ + python3-requests-file-ptest \ + python3-requests-toolbelt-ptest \ + python3-scrypt-ptest \ + python3-semver-ptest \ + python3-serpent-ptest \ + python3-simpleeval-ptest \ + python3-smpplib-ptest \ + python3-soupsieve-ptest \ + python3-sqlparse-ptest \ + python3-test-generator-ptest \ + python3-typeguard-ptest \ + python3-ujson-ptest \ + python3-u-msgpack-python-ptest \ + python3-unidiff-ptest \ + python3-uritemplate-ptest \ + python3-webcolors-ptest \ + python3-whoosh-ptest \ + python3-xlrd-ptest \ + python3-xmltodict-ptest \ + python3-xxhash-ptest \ + python3-yappi-ptest \ + python3-yarl-ptest \ + python3-pyasn1-ptest \ " EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch index 936f16585..d4e144a61 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch @@ -1,13 +1,31 @@ +From b394003d31a7187767b7d6cc7b871968d2674be9 Mon Sep 17 00:00:00 2001 +From: Leon Anavi +Date: Fri, 22 Jan 2021 11:41:12 +0200 +Subject: [PATCH] setup.py: Adjust _add_rpath + +Fix error: unrecognized command-line option '-R' + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Leon Anavi +--- + setup.py | 3 --- + 1 file changed, 3 deletions(-) + diff --git a/setup.py b/setup.py -index d243eaa..98099bc 100755 +index 22f582d..2d28655 100755 --- a/setup.py +++ b/setup.py -@@ -192,8 +192,6 @@ def _add_rpath(settings, path): +@@ -231,9 +231,6 @@ def _add_rpath(settings, path): """ if sys.platform == 'darwin': - settings['extra_link_args'].extend(['-Wl,-rpath','-Wl,%s' % path]) + settings['extra_link_args'].extend(['-Wl,-rpath', '-Wl,%s' % path]) - else: - settings['runtime_library_dirs'].append(path) +- def settings_from_prefix(prefix=None, bundle_libzmq_dylib=False): """load appropriate library/include settings from ZMQ prefix""" +-- +2.17.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.6.bb deleted file mode 100644 index 061770a93..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Advanced Enumerations library" -HOMEPAGE = "https://pypi.org/project/aenum/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://aenum/LICENSE;md5=c6a85477543f8b8591b9c1f82abebbe9" - -SRC_URI[md5sum] = "52ec17f5efdfa13952657fe954cd6d99" -SRC_URI[sha256sum] = "260225470b49429f5893a195a8b99c73a8d182be42bf90c37c93e7b20e44eaae" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.0.0.bb new file mode 100644 index 000000000..cb8462d24 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.0.0.bb @@ -0,0 +1,10 @@ +SUMMARY = "Advanced Enumerations library" +HOMEPAGE = "https://pypi.org/project/aenum/" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://aenum/LICENSE;md5=c6a85477543f8b8591b9c1f82abebbe9" + +SRC_URI[sha256sum] = "17cd8cfed1ee4b617198c9fabbabd70ebd8f01e54ac29cd6c3a92df14bd86656" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.2.bb deleted file mode 100644 index c98e3aee7..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Async http client/server framework" -DESCRIPTION = "Asynchronous HTTP client/server framework for asyncio and Python" -HOMEPAGE = "https://github.com/aio-libs/aiohttp" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3bf3d48554bdca1ea7fdb48de378c2ca" - -SRC_URI[md5sum] = "dcf770341241aa09340653a1562ca816" -SRC_URI[sha256sum] = "c6da1af59841e6d43255d386a2c4bfb59c0a3b262bdb24325cc969d211be6070" - -PYPI_PACKAGE = "aiohttp" -inherit setuptools3 pypi -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-async-timeout \ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-chardet \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-idna-ssl \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-multidict \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-yarl \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.3.bb new file mode 100644 index 000000000..bccbd4b0e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.3.bb @@ -0,0 +1,22 @@ +SUMMARY = "Async http client/server framework" +DESCRIPTION = "Asynchronous HTTP client/server framework for asyncio and Python" +HOMEPAGE = "https://github.com/aio-libs/aiohttp" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3bf3d48554bdca1ea7fdb48de378c2ca" + +SRC_URI[sha256sum] = "9c1a81af067e72261c9cbe33ea792893e83bc6aa987bfbd6fdc1e5e7b22777c4" + +PYPI_PACKAGE = "aiohttp" +inherit setuptools3 pypi +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-async-timeout \ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-chardet \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-idna-ssl \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-multidict \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-yarl \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.4.3.bb deleted file mode 100644 index 0e7f629d4..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.4.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "A database migration tool for SQLAlchemy" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bd64aba1b968c2bfbc2b525a181ce85c" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "6051576d8e25e3d4a9fd818d79531bad" -SRC_URI[sha256sum] = "5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245" - -PYPI_PACKAGE = "alembic" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-editor \ - ${PYTHON_PN}-mako \ - ${PYTHON_PN}-sqlalchemy \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.5.2.bb new file mode 100644 index 000000000..9e30cc131 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.5.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "A database migration tool for SQLAlchemy" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c4ece55266dcdd02ce165b1ee0e490bb" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "a4de8d3525a95a96d59342e14b95cab5956c25b0907dce1549bb4e3e7958f4c2" + +PYPI_PACKAGE = "alembic" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-editor \ + ${PYTHON_PN}-mako \ + ${PYTHON_PN}-sqlalchemy \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asttokens_2.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asttokens_2.0.4.bb new file mode 100644 index 000000000..c2149336f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-asttokens_2.0.4.bb @@ -0,0 +1,17 @@ +SUMMARY = "The asttokens module annotates Python abstract syntax trees (ASTs)" +HOMEPAGE = "https://github.com/gristlabs/asttokens" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +PYPI_PACKAGE = "asttokens" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "a42e57e28f2ac1c85ed9b1f84109401427e5c63c04f61d15b8842b027eec5128" + +DEPENDS += "\ + python3-setuptools-scm-native \ + python3-wheel-native \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.1.bb deleted file mode 100644 index f54d54f92..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "A high-level Python efficient arrays of booleans -- C extension" -HOMEPAGE = "https://github.com/ilanschnell/bitarray" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" - -SRC_URI[md5sum] = "a082075dbae478fb53c69e25cc7f9cd6" -SRC_URI[sha256sum] = "ab85b38365dd9956264226b30dababa02161ed49bb36c7ee82cc6545e07b1599" - -inherit setuptools3 pypi - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.3.bb new file mode 100644 index 000000000..16beab551 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.3.bb @@ -0,0 +1,10 @@ +SUMMARY = "A high-level Python efficient arrays of booleans -- C extension" +HOMEPAGE = "https://github.com/ilanschnell/bitarray" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" + +SRC_URI[sha256sum] = "ae27ce4bef4f35b4cc2c0b0d9cf02ed49eee567c23d70cb5066ad215f9b62b3c" + +inherit setuptools3 pypi + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.0.bb deleted file mode 100644 index cc697d5a9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Extensible memoizing collections and decorators" -HOMEPAGE = "https://github.com/tkem/cachetools" -DESCRIPTION = "This module provides various memoizing \ -collections and decorators, including variants of the \ -Python 3 Standard Library @lru_cache function decorator." -SECTION = "devel/python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d1e1bf0ccb26126a230c51f997ce362" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-math \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -SRC_URI[md5sum] = "9d54dacd774e2af7e9a50741386f5455" -SRC_URI[sha256sum] = "3796e1de094f0eaca982441c92ce96c68c89cced4cd97721ab297ea4b16db90e" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.1.bb new file mode 100644 index 000000000..616e88045 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.1.bb @@ -0,0 +1,32 @@ +SUMMARY = "Extensible memoizing collections and decorators" +HOMEPAGE = "https://github.com/tkem/cachetools" +DESCRIPTION = "This module provides various memoizing \ +collections and decorators, including variants of the \ +Python 3 Standard Library @lru_cache function decorator." +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d1e1bf0ccb26126a230c51f997ce362" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-math \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +SRC_URI[sha256sum] = "f469e29e7aa4cff64d8de4aad95ce76de8ea1125a16c68e0d93f65c3c3dc92e9" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.11.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.11.8.bb deleted file mode 100644 index b680fade6..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.11.8.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Python package for providing Mozilla's CA Bundle." -DESCRIPTION = "This installable Python package contains a CA Bundle that you can reference in your \ -Python code. This is useful for verifying HTTP requests, for example. This is the same CA Bundle \ -which ships with the Requests codebase, and is derived from Mozilla Firefox's canonical set." -HOMEPAGE = " http://certifi.io/" - -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" - -SRC_URI[md5sum] = "b25267355218d11652c707e46accd059" -SRC_URI[sha256sum] = "f05def092c44fbf25834a51509ef6e631dc19765ab8a57b4e7ab85531f0a9cf4" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.12.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.12.5.bb new file mode 100644 index 000000000..dd2f6a2f6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.12.5.bb @@ -0,0 +1,14 @@ +SUMMARY = "Python package for providing Mozilla's CA Bundle." +DESCRIPTION = "This installable Python package contains a CA Bundle that you can reference in your \ +Python code. This is useful for verifying HTTP requests, for example. This is the same CA Bundle \ +which ships with the Requests codebase, and is derived from Mozilla Firefox's canonical set." +HOMEPAGE = " http://certifi.io/" + +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" + +SRC_URI[sha256sum] = "1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.3.bb deleted file mode 100644 index dbdd16f66..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Foreign Function Interface for Python calling C code" -HOMEPAGE = "http://cffi.readthedocs.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" -DEPENDS += "libffi ${PYTHON_PN}-pycparser" - -SRC_URI[md5sum] = "c2a47ffd5d183b193ac8ed3414dcfd07" -SRC_URI[sha256sum] = "f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591" - -inherit pypi setuptools3 - -RDEPENDS_${PN}_class-target = " \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-pycparser \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.4.bb new file mode 100644 index 000000000..45962c6ce --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.4.bb @@ -0,0 +1,18 @@ +SUMMARY = "Foreign Function Interface for Python calling C code" +HOMEPAGE = "http://cffi.readthedocs.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" +DEPENDS += "libffi ${PYTHON_PN}-pycparser" + +SRC_URI[sha256sum] = "1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c" + +inherit pypi setuptools3 + +RDEPENDS_${PN}_class-target = " \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-pycparser \ + ${PYTHON_PN}-shell \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.5.bb deleted file mode 100644 index 6fa088f59..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.5.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Python template engine and code generation tool" -HOMEPAGE = "https://cheetahtemplate.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=15e13a4ed0e5880e3e55ec88b0921181" - -PYPI_PACKAGE = "Cheetah3" -inherit pypi setuptools3 - -RDEPENDS_${PN} = "python3-pickle python3-pprint" -RDEPENDS_${PN}_class-native = "" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "fc735d4ca7997df2a2da1cae0cf89a1e" -SRC_URI[sha256sum] = "ececc9ca7c58b9a86ce71eb95594c4619949e2a058d2a1af74c7ae8222515eb1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.bb new file mode 100644 index 000000000..a7e5443f2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.bb @@ -0,0 +1,14 @@ +SUMMARY = "Python template engine and code generation tool" +HOMEPAGE = "https://cheetahtemplate.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=15e13a4ed0e5880e3e55ec88b0921181" + +PYPI_PACKAGE = "Cheetah3" +inherit pypi setuptools3 + +RDEPENDS_${PN} = "python3-pickle python3-pprint" +RDEPENDS_${PN}_class-native = "" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[sha256sum] = "f1c2b693cdcac2ded2823d363f8459ae785261e61c128d68464c8781dba0466b" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_14.0.bb deleted file mode 100644 index 64f3008ee..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_14.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Colored terminal output for Python's logging module" -HOMEPAGE = "https://coloredlogs.readthedocs.io" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=764e737b117a38d773609885e8d04f0b" - -SRC_URI[md5sum] = "34cd8ef3f758b10c6f1482b2614a81f2" -SRC_URI[sha256sum] = "a1fab193d2053aa6c0a97608c4342d031f1f93a3d1218432c59322441d31a505" - -inherit pypi setuptools3 - -do_compile_prepend() { - sed -ie "s/find_pth_directory(),/'',/g" ${S}/setup.py -} - -do_install_append() { - rm -rf ${D}${datadir} -} - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-humanfriendly \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_15.0.bb new file mode 100644 index 000000000..daeda6b2e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_15.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Colored terminal output for Python's logging module" +HOMEPAGE = "https://coloredlogs.readthedocs.io" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=764e737b117a38d773609885e8d04f0b" + +SRC_URI[sha256sum] = "5e78691e2673a8e294499e1832bb13efcfb44a86b92e18109fa18951093218ab" + +inherit pypi setuptools3 + +do_compile_prepend() { + sed -ie "s/find_pth_directory(),/'',/g" ${S}/setup.py +} + +do_install_append() { + rm -rf ${D}${datadir} +} + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-humanfriendly \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.6.2.bb deleted file mode 100644 index e98d276f0..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.6.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "A colored formatter for the python logging module" -HOMEPAGE = "https://github.com/borntyping/python-colorlog" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=85a1d478cd35d62763a1419e948bdde4" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "colorlog" - -SRC_URI[md5sum] = "72441753be8ec437af9e5bb89db344e7" -SRC_URI[sha256sum] = "54e5f153419c22afc283c130c4201db19a3dbd83221a0f4657d5ee66234a2ea4" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.7.2.bb new file mode 100644 index 000000000..c9754ed88 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.7.2.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "A colored formatter for the python logging module" +HOMEPAGE = "https://github.com/borntyping/python-colorlog" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=85a1d478cd35d62763a1419e948bdde4" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "colorlog" + +SRC_URI[sha256sum] = "18d05b616438a75762d7d214b9ec3b05d274466c9f3ddd92807e755840c88251" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.3.bb deleted file mode 100644 index 2354c5e73..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.3.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Code coverage measurement for Python" -HOMEPAGE = "https://coverage.readthedocs.io" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" - -SRC_URI[md5sum] = "c2faf2ccc498ce16fd48cc9201c520d7" -SRC_URI[sha256sum] = "280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0" - -inherit pypi setuptools3 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.4.bb new file mode 100644 index 000000000..4ea9b6a19 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.4.bb @@ -0,0 +1,9 @@ +SUMMARY = "Code coverage measurement for Python" +HOMEPAGE = "https://coverage.readthedocs.io" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" + +SRC_URI[sha256sum] = "6d2e262e5e8da6fa56e774fb8e2643417351427604c2b177f8e8c5f75fc928ca" + +inherit pypi setuptools3 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.37.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.37.bb deleted file mode 100644 index 28c4057cd..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.37.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "croniter provides iteration for datetime object with cron like format" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=b8ee59850b882cbf623188489ea748e2" - -PYPI_PACKAGE = "croniter" - -SRC_URI[sha256sum] = "12ced475dfc107bf7c6c1440af031f34be14cd97bbbfaf0f62221a9c11e86404" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " python3-dateutil python3-natsort" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.2.bb new file mode 100644 index 000000000..bfe1f1d4c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "croniter provides iteration for datetime object with cron like format" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=b8ee59850b882cbf623188489ea748e2" + +PYPI_PACKAGE = "croniter" + +SRC_URI[sha256sum] = "12f9fd52e7cfb623d0788956d137a3de26e5583a25820fa7710fb6b58d32b213" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " python3-dateutil python3-natsort" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.2.bb deleted file mode 100644 index 2e7ed8169..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Test vectors for the cryptography package." -HOMEPAGE = "https://cryptography.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 | BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" - -SRC_URI[md5sum] = "20976284d12ed99e31d38814be038ac1" -SRC_URI[sha256sum] = "785f06ffd0bbc73bdd69d0b164d72a7a7827c7c3bbf79ae9a235d7126afd98e4" - -PYPI_PACKAGE = "cryptography_vectors" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-cryptography \ -" - -BBCLASSEXTEND = "native nativesdk" - -UPSTREAM_CHECK_REGEX = "" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.3.1.bb new file mode 100644 index 000000000..bcdbc6adb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.3.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "Test vectors for the cryptography package." +HOMEPAGE = "https://cryptography.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 | BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" + +SRC_URI[sha256sum] = "03789c305dda8dccb4b8c9c019963a742469d88365abbc82e8e898ac478f5ca4" + +PYPI_PACKAGE = "cryptography_vectors" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-cryptography \ +" + +BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_REGEX = "" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.2.bb deleted file mode 100644 index cec37b027..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.2.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Provides cryptographic recipes and primitives to python developers" -HOMEPAGE = "https://cryptography.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 | BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=097f805837700cfac572ac274cd38124" - -LDSHARED += "-pthread" - -SRC_URI[md5sum] = "1e476287399bae923514e19429804155" -SRC_URI[sha256sum] = "e4789b84f8dedf190148441f7c5bfe7244782d9cbb194a36e17b91e7d3e1cca9" - -SRC_URI += " \ - file://run-ptest \ - file://h-test.patch \ -" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-cffi-native \ - ${PYTHON_PN}-asn1crypto \ - ${PYTHON_PN}-six \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-idna \ - ${PYTHON_PN}-asn1crypto \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ -" - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-idna \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-asn1crypto \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-threading \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PN} \ - ${PYTHON_PN}-cryptography-vectors \ - ${PYTHON_PN}-iso8601 \ - ${PYTHON_PN}-pretend \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytz \ -" - -inherit ptest - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - install -d ${D}${PTEST_PATH}/tests/hazmat - cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ -} - -FILES_${PN}-dbg += " \ - ${libdir}/${PYTHON_PN}2.7/site-packages/${SRCNAME}/hazmat/bindings/.debug \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb new file mode 100644 index 000000000..79a7ac1bf --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb @@ -0,0 +1,65 @@ +SUMMARY = "Provides cryptographic recipes and primitives to python developers" +HOMEPAGE = "https://cryptography.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 | BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bf405a8056a6647e7d077b0e7bc36aba" + +LDSHARED += "-pthread" + +SRC_URI[sha256sum] = "7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6" + +SRC_URI += " \ + file://run-ptest \ + file://h-test.patch \ +" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-cffi-native \ + ${PYTHON_PN}-asn1crypto \ + ${PYTHON_PN}-six \ +" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-idna \ + ${PYTHON_PN}-asn1crypto \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ +" + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-idna \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-asn1crypto \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-threading \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PN} \ + ${PYTHON_PN}-cryptography-vectors \ + ${PYTHON_PN}-iso8601 \ + ${PYTHON_PN}-pretend \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytz \ +" + +inherit ptest + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/hazmat + cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ +} + +FILES_${PN}-dbg += " \ + ${libdir}/${PYTHON_PN}2.7/site-packages/${SRCNAME}/hazmat/bindings/.debug \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-custom-inherit_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-custom-inherit_2.3.0.bb deleted file mode 100644 index 489e71984..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-custom-inherit_2.3.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "A Python package that provides customized docstring inheritance schemes between derived classes and their parents." -HOMEPAGE = "https://github.com/rsokl/custom_inherit" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=adc1f231c76ee2f1f36025d56926ba2c" - -PYPI_PACKAGE = "custom_inherit" -PYPI_SRC_URI = "https://files.pythonhosted.org/packages/0e/82/c5bb7ec49a7892a2c583e1017597e3921c59171f10602086ca93c8a83baa/custom_inherit-${PV}.tar.gz" - -SRC_URI[md5sum] = "adf2850dc0e488df959821a5d4c16cbd" -SRC_URI[sha256sum] = "1609d283c2cffce3a58baf7c0c22b655c55f85e1ec39c4717a4423d34610723a" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-custom-inherit_2.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-custom-inherit_2.3.1.bb new file mode 100644 index 000000000..c0e10448e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-custom-inherit_2.3.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "A Python package that provides customized docstring inheritance schemes between derived classes and their parents." +HOMEPAGE = "https://github.com/rsokl/custom_inherit" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f910a85a4c3da51edf780f17a7608434" + +PYPI_PACKAGE = "custom_inherit" + +SRC_URI[sha256sum] = "a0d104847b4cc1ae24e00061fc2e11da8766b019bf4c8c753822347366c8c49f" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-next_0.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-next_0.1.4.bb deleted file mode 100644 index 0a5f19974..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-next_0.1.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "A zero-dependency DBus library for Python with asyncio support" -HOMEPAGE = "https://github.com/acrisci/python-dbus-next" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94e750c96e56788499b56c81de91431c" - -SRC_URI[md5sum] = "0d44e12e8689637a0c048ec7bb51d842" -SRC_URI[sha256sum] = "1b1942bffcc8c9a5bd6834257df227a55ee28e07dd413ead82ddd23115652363" - -PYPI_PACKAGE = "dbus_next" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-next_0.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-next_0.2.2.bb new file mode 100644 index 000000000..1970fdec1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-next_0.2.2.bb @@ -0,0 +1,12 @@ +SUMMARY = "A zero-dependency DBus library for Python with asyncio support" +HOMEPAGE = "https://github.com/acrisci/python-dbus-next" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94e750c96e56788499b56c81de91431c" + +SRC_URI[sha256sum] = "f656a3d3450b670f228248ffb1c3a703a69c4a8cb10cce63b108f17c8bd6c3de" + +PYPI_PACKAGE = "dbus_next" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.1.0.bb deleted file mode 100644 index 9aaf71403..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.1.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Disk Cache -- Disk and file backed persistent cache." -HOMEPAGE = "http://www.grantjenks.com/docs/diskcache/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c985b6a9269e57a1073d5f142d68eb68" - -SRC_URI[md5sum] = "9ce87661369752c9ead63243b07eaf19" -SRC_URI[sha256sum] = "bc7928df986dbc8a8d6e34c33b0da89d668cfa65e7fcc91298a6959a35076993" - -PYPI_PACKAGE = "diskcache" - -inherit pypi setuptools3 - -CLEANBROKEN = "1" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.2.1.bb new file mode 100644 index 000000000..4a028d769 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.2.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Disk Cache -- Disk and file backed persistent cache." +HOMEPAGE = "http://www.grantjenks.com/docs/diskcache/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a3e7dd5bc8f0053fee7c5fe9692b932d" + +SRC_URI[sha256sum] = "1805acd5868ac10ad547208951a1190a0ab7bbff4e70f9a07cde4dbdfaa69f64" + +PYPI_PACKAGE = "diskcache" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.1.bb deleted file mode 100644 index 60bdbaa9e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "djangorestframework" -DESCRIPTION = "pip3 install djangorestframework" -HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1" - -SRC_URI[md5sum] = "47d5ea46923a131c5fbefeb610c6ce2c" -SRC_URI[sha256sum] = "d54452aedebb4b650254ca092f9f4f5df947cb1de6ab245d817b08b4f4156249" -PYPI_PACKAGE = "djangorestframework" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-django \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.2.bb new file mode 100644 index 000000000..6742b87b2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.2.bb @@ -0,0 +1,16 @@ +SUMMARY = "djangorestframework" +DESCRIPTION = "pip3 install djangorestframework" +HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1" + +SRC_URI[md5sum] = "e70d58ee2f83f11d4efe33162bb8af3b" +SRC_URI[sha256sum] = "0898182b4737a7b584a2c73735d89816343369f259fea932d90dc78e35d8ac33" +PYPI_PACKAGE = "djangorestframework" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-django \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.0.0.bb deleted file mode 100644 index a4e984619..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.0.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "DNS toolkit for Python" -HOMEPAGE = "http://www.dnspython.org/" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34" - -SRC_URI[md5sum] = "42f922c9223dde0275e8c0695ead37da" -SRC_URI[sha256sum] = "044af09374469c3a39eeea1a146e8cac27daec951f1f1f157b1962fc7cb9d1b7" - -PYPI_PACKAGE_EXT = "zip" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.1.0.bb new file mode 100644 index 000000000..20de09391 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.1.0.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "DNS toolkit for Python" +HOMEPAGE = "http://www.dnspython.org/" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34" + +SRC_URI[sha256sum] = "e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4" + +PYPI_PACKAGE_EXT = "zip" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-threading \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.16.0.bb deleted file mode 100644 index 36bb246fd..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.16.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "ECDSA cryptographic signature library (pure python)" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=66ffc5e30f76cbb5358fe54b645e5a1d" - -DEPENDS += "python3-pip python3-pbr" - -PYPI_PACKAGE = "ecdsa" -SRC_URI[md5sum] = "d593df1ab57da611dca76f7328c47b21" -SRC_URI[sha256sum] = "494c6a853e9ed2e9be33d160b41d47afc50a6629b993d2b9c5ad7bb226add892" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "python3-six python3-gmpy2 python3-pbr" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.16.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.16.1.bb new file mode 100644 index 000000000..819d41e86 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.16.1.bb @@ -0,0 +1,13 @@ +SUMMARY = "ECDSA cryptographic signature library (pure python)" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=66ffc5e30f76cbb5358fe54b645e5a1d" + +DEPENDS += "python3-pip python3-pbr" + +PYPI_PACKAGE = "ecdsa" +SRC_URI[sha256sum] = "cfc046a2ddd425adbd1a78b3c46f0d1325c657811c0f45ecc3a0a6236c1e50ff" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "python3-six python3-gmpy2 python3-pbr" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.1.2.bb new file mode 100644 index 000000000..f47f15222 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.1.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Provide XPath 1.0 and 2.0 selectors for Python's ElementTree XML data structures, both for the standard ElementTree library and for the lxml.etree library." +HOMEPAGE = "https://github.com/sissaschool/elementpath" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" + +SRC_URI[md5sum] = "887f60e9c4fb9b0804a38372b2798101" +SRC_URI[sha256sum] = "23e1fed8d196d9a6cc4d220ef11fbe7eb8cff3a27848621c447e9d96134b2085" + +PYPI_PACKAGE = "elementpath" +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.3.0.bb deleted file mode 100644 index fe11049ad..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.3.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Python evdev lib" -HOMEPAGE = "https://github.com/gvalkov/python-evdev" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" - -SRC_URI[md5sum] = "05f9e900d6e11e1674475d2dd2668f0d" -SRC_URI[sha256sum] = "b1c649b4fed7252711011da235782b2c260b32e004058d62473471e5cd30634d" - -inherit pypi setuptools3 - -do_compile_prepend() { - rm -rf ${S}/evdev/ecodes.c -} - -DISTUTILS_BUILD_ARGS = "build_ecodes --evdev-headers ${STAGING_DIR_TARGET}/usr/include/linux/input.h:${STAGING_DIR_TARGET}/usr/include/linux/input-event-codes.h" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-stringold \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.4.0.bb new file mode 100644 index 000000000..e15d83b60 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.4.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "Python evdev lib" +HOMEPAGE = "https://github.com/gvalkov/python-evdev" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" + +SRC_URI[sha256sum] = "8782740eb1a86b187334c07feb5127d3faa0b236e113206dfe3ae8f77fb1aaf1" + +inherit pypi setuptools3 + +do_compile_prepend() { + rm -rf ${S}/evdev/ecodes.c +} + +DISTUTILS_BUILD_ARGS = "build_ecodes --evdev-headers ${STAGING_DIR_TARGET}/usr/include/linux/input.h:${STAGING_DIR_TARGET}/usr/include/linux/input-event-codes.h" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-fcntl \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-stringold \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.5.bb deleted file mode 100644 index 87c221241..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.5.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, Moderator, and many other Google APIs." -HOMEPAGE = "https://github.com/googleapis/google-api-python-client" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" - -SRC_URI[md5sum] = "4aee3820666e80944f38c39176193d5c" -SRC_URI[sha256sum] = "1892cd490d164e5ec2f2168dc3b4fa0af68f36ca15a88b91bca1826b3d4f2829" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.8.bb new file mode 100644 index 000000000..1774f962e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.8.bb @@ -0,0 +1,8 @@ +SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, Moderator, and many other Google APIs." +HOMEPAGE = "https://github.com/googleapis/google-api-python-client" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" + +SRC_URI[sha256sum] = "f3b9684442eec2cfe9f9bb48e796ef919456b82142c7528c5fd527e5224f08bb" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.17.bb deleted file mode 100644 index 744265e1f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.17.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Python lightweight in-process concurrent programming" -LICENSE = "MIT & PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=03143d7a1a9f5d8a0fee825f24ca9c36 \ - file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" - -SRC_URI[md5sum] = "d964c95c2d2f0f02f36c75e158d8e3dc" -SRC_URI[sha256sum] = "41d8835c69a78de718e466dd0e6bfd4b46125f21a67c3ff6d76d8d8059868d6b" - -inherit pypi distutils3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_1.0.0.bb new file mode 100644 index 000000000..32194dba7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_1.0.0.bb @@ -0,0 +1,8 @@ +SUMMARY = "Python lightweight in-process concurrent programming" +LICENSE = "MIT & PSF" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \ + file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" + +SRC_URI[sha256sum] = "719e169c79255816cdcf6dccd9ed2d089a72a9f6c42273aae12d55e8d35bdcf8" + +inherit pypi distutils3 setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-hexdump_3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-hexdump_3.3.bb new file mode 100644 index 000000000..cb04e17df --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-hexdump_3.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "view/edit your binary with any text editor" + +# The homepage listed on pypi is [1] but the repository has been removed. +# Instead, set the homepage to pypi. +# +# [1] https://bitbucket.org/techtonik/hexdump/ +HOMEPAGE = "https://pypi.org/project/hexdump/" + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851" + +PYPI_PACKAGE_EXT = "zip" + +inherit pypi distutils3 + +SRC_URI[sha256sum] = "d781a43b0c16ace3f9366aade73e8ad3a7bd5137d58f0b45ab2d3f54876f20db" + +S = "${WORKDIR}" + +BBCLASSEXTEND = "native nativesdk" + +do_cleanup_hexfile() { + rm ${D}${datadir}/data/hexfile.bin + rmdir ${D}${datadir}/data ${D}${datadir} +} + +addtask cleanup_hexfile before do_package after do_install diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_20.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_20.0.1.bb deleted file mode 100644 index c9e281504..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_20.0.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "A featureful, correct URL for Python" -HOMEPAGE = "https://github.com/python-hyper/hyperlink" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6dc5b4bd3d02faedf08461621aa2aeca" - -SRC_URI[sha256sum] = "47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af" -SRC_URI[md5sum] = "d7983e3d2625e5f7dffc8d12da8803ab" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-stringold ${PYTHON_PN}-netclient ${PYTHON_PN}-idna" - -PACKAGES =. "${PN}-test " - -FILES_${PN}-test += " \ - ${PYTHON_SITEPACKAGES_DIR}/hyperlinkt/test \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_21.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_21.0.0.bb new file mode 100644 index 000000000..5a8791dfb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_21.0.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "A featureful, correct URL for Python" +HOMEPAGE = "https://github.com/python-hyper/hyperlink" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6dc5b4bd3d02faedf08461621aa2aeca" + +SRC_URI[sha256sum] = "427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-stringold ${PYTHON_PN}-netclient ${PYTHON_PN}-idna" + +PACKAGES =. "${PN}-test " + +FILES_${PN}-test += " \ + ${PYTHON_SITEPACKAGES_DIR}/hyperlinkt/test \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb deleted file mode 100644 index 2e8276ec7..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Interval arithmetic for Python" -HOMEPAGE = "https://github.com/AlexandreDecan/python-intervals" -SECTION = "devel/python" - -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05f1e16a8e59ce3e9a979e881816c2ab" - -PYPI_PACKAGE := "python-intervals" - -SRC_URI += " \ - file://run-ptest \ -" - -inherit pypi setuptools3 ptest - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - cp -f ${S}/test_intervals.py ${D}${PTEST_PATH} - cp -f ${S}/README.md ${D}${PTEST_PATH} -} - -SRC_URI[md5sum] = "8955317ff4e42590c90ba6247b1caaed" -SRC_URI[sha256sum] = "0d26746eaed0be78a61dd289bb7a10721b08770bb3e807614835f490d514f2a5" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.post1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.post1.bb new file mode 100644 index 000000000..14bc9ad25 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.post1.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Interval arithmetic for Python" +HOMEPAGE = "https://github.com/AlexandreDecan/python-intervals" +SECTION = "devel/python" + +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05f1e16a8e59ce3e9a979e881816c2ab" + +PYPI_PACKAGE := "python-intervals" + +SRC_URI += " \ + file://run-ptest \ +" + +inherit pypi setuptools3 ptest + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + cp -f ${S}/test_intervals.py ${D}${PTEST_PATH} + cp -f ${S}/README.md ${D}${PTEST_PATH} +} + +SRC_URI[sha256sum] = "68a772dc2de6b2b2e83b457329ffa8f9286710994b8070db54348a05762515d2" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.00.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.00.bb deleted file mode 100644 index 14931546e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.00.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "IPy - class and tools for handling of IPv4 and IPv6 addresses and networks" -DESCRIPTION = "IPy is a Python module for handling IPv4 and IPv6 Addresses and Networks \ -in a fashion similar to perl's Net::IP and friends. The IP class allows \ -a comfortable parsing and handling for most notations in use for IPv4 \ -and IPv6 Addresses and Networks." -SECTION = "devel/python" -HOMEPAGE = "https://github.com/autocracy/python-ipy" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=848d24919845901b4f48bae5f13252e6" - -SRC_URI[md5sum] = "1a90c68174234672241a7e60c7ea0fb9" -SRC_URI[sha256sum] = "2f2bf658a858d43868d8a4352b3889cf78c66e2ce678b300dcf518c9149ba621" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/test/ - cp -rf ${S}/test/* ${D}${PTEST_PATH}/test -} - -PYPI_PACKAGE = "IPy" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.01.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.01.bb new file mode 100644 index 000000000..c141f6865 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.01.bb @@ -0,0 +1,32 @@ +SUMMARY = "IPy - class and tools for handling of IPv4 and IPv6 addresses and networks" +DESCRIPTION = "IPy is a Python module for handling IPv4 and IPv6 Addresses and Networks \ +in a fashion similar to perl's Net::IP and friends. The IP class allows \ +a comfortable parsing and handling for most notations in use for IPv4 \ +and IPv6 Addresses and Networks." +SECTION = "devel/python" +HOMEPAGE = "https://github.com/autocracy/python-ipy" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=848d24919845901b4f48bae5f13252e6" + +SRC_URI[md5sum] = "d6cf83e7f418ebbd23324ba1c658b907" +SRC_URI[sha256sum] = "edeca741dea2d54aca568fa23740288c3fe86c0f3ea700344571e9ef14a7cc1a" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test/ + cp -rf ${S}/test/* ${D}${PTEST_PATH}/test +} + +PYPI_PACKAGE = "IPy" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.6.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.6.4.bb deleted file mode 100644 index 66a5332be..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.6.4.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "A Python utility / library to sort Python imports." -HOMEPAGE = "https://pypi.python.org/pypi/isort" -LICENSE = "MIT" -SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148f94f483f3e1489" - -SRC_URI[md5sum] = "d2dfc32943b1d64311facec6a05c2f98" -SRC_URI[sha256sum] = "dcaeec1b5f0eca77faea2a35ab790b4f3680ff75590bfcb7145986905aab2f58" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.7.0.bb new file mode 100644 index 000000000..9f234ee46 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.7.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "A Python utility / library to sort Python imports." +HOMEPAGE = "https://pypi.python.org/pypi/isort" +LICENSE = "MIT" +SECTION = "devel/python" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148f94f483f3e1489" + +SRC_URI[sha256sum] = "c729845434366216d320e936b8ad6f9d681aab72dc7cbc2d51bedc3582f3ad1e" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-shell \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.17.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.17.2.bb deleted file mode 100644 index aa5e69874..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.17.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "An autocompletion tool for Python that can be used for text editors." -HOMEPAGE = "https://github.com/davidhalter/jedi" -AUTHOR = "David Halter " -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5ed06eebfcb244cd66ebf6cef9c23ab4" - -PYPI_PACKAGE = "jedi" - -SRC_URI[md5sum] = "f012668907d76cebe9c4766f3b806fcf" -SRC_URI[sha256sum] = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20" - -RDEPENDS_${PN} = "${PYTHON_PN}-parso" - -inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.18.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.18.0.bb new file mode 100644 index 000000000..6c857f09e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.18.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "An autocompletion tool for Python that can be used for text editors." +HOMEPAGE = "https://github.com/davidhalter/jedi" +AUTHOR = "David Halter " +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5ed06eebfcb244cd66ebf6cef9c23ab4" + +PYPI_PACKAGE = "jedi" + +SRC_URI[sha256sum] = "92550a404bad8afed881a137ec9a461fed49eca661414be45059329614ed0707" + +RDEPENDS_${PN} = "${PYTHON_PN}-parso" + +inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.3.bb deleted file mode 100644 index 75a0926f0..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.3.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Library to process JSON-RPC requests" -HOMEPAGE = "https://github.com/bcb/jsonrpcserver" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c89120516900f96f4c60d35fdc4c3f15" - -SRC_URI[md5sum] = "e73b0bd90e99115d3f9e0ac42882c5b7" -SRC_URI[sha256sum] = "649680c293facb6ae7c3f5c8028e4623c55195db5216847e9f25f85cba2d443a" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - python3-apply-defaults \ - python3-asyncio \ - python3-core \ - python3-json \ - python3-jsonschema \ - python3-logging \ - python3-netclient \ - python3-pkgutil \ -" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.2.0.bb new file mode 100644 index 000000000..53f01f622 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.2.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "Library to process JSON-RPC requests" +HOMEPAGE = "https://github.com/bcb/jsonrpcserver" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c89120516900f96f4c60d35fdc4c3f15" + +SRC_URI[sha256sum] = "0c9e5b9445621138521e912016ae39b3badadd2607140dcbb0c8062934ab4854" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + python3-apply-defaults \ + python3-asyncio \ + python3-core \ + python3-json \ + python3-jsonschema \ + python3-logging \ + python3-netclient \ + python3-pkgutil \ +" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jstyleson/LICENSE b/meta-openembedded/meta-python/recipes-devtools/python/python3-jstyleson/LICENSE new file mode 100644 index 000000000..807babd62 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jstyleson/LICENSE @@ -0,0 +1,8 @@ +The MIT License (MIT) +Copyright (c) 2016 linjackson + +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 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. \ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb new file mode 100644 index 000000000..e70ce33ef --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "Library to parse JSON with js-style comments." +HOMEPAGE = "https://github.com/linjackson78/jstyleson" + +SRC_URI += " file://LICENSE " + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d97b96c7337934ee448ffd4392f32079" + +PYPI_PACKAGE_EXT = "tar.gz" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "680003f3b15a2959e4e6a351f3b858e3c07dd3e073a0d54954e34d8ea5e1308e" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.1.bb deleted file mode 100644 index 4ba947923..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "A fast and thorough lazy object proxy" -HOMEPAGE = "https://python-lazy-object-proxy.readthedocs.io/" -LICENSE = "BSD-2-Clause" -SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9c5c2c74370826468065c5702b8a1fcf" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -SRC_URI[md5sum] = "c168cec73acdec25a49f6f467f5b1eaa" -SRC_URI[sha256sum] = "9723364577b79ad9958a68851fe2acb94da6fd25170c595516a8289e6a129043" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.2.bb new file mode 100644 index 000000000..3ff7a126e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "A fast and thorough lazy object proxy" +HOMEPAGE = "https://python-lazy-object-proxy.readthedocs.io/" +LICENSE = "BSD-2-Clause" +SECTION = "devel/python" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9c5c2c74370826468065c5702b8a1fcf" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +SRC_URI[sha256sum] = "5944a9b95e97de1980c65f03b79b356f30a43de48682b8bdd90aa5089f0ec1f4" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.1.bb deleted file mode 100644 index af012e630..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." -DESCRIPTION = "lxml is a Pythonic, mature binding for the libxml2 and \ -libxslt libraries. It provides safe and convenient access to these \ -libraries using the ElementTree API. It extends the ElementTree API \ -significantly to offer support for XPath, RelaxNG, XML Schema, XSLT, \ -C14N and much more." -HOMEPAGE = "http://codespeak.net/lxml" -SECTION = "devel/python" -LICENSE = "BSD & GPLv2 & MIT & PSF" -LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ - file://doc/licenses/elementtree.txt;md5=eb34d036a6e3d56314ee49a6852ac891 \ - file://doc/licenses/BSD.txt;md5=700a1fc17f4797d4f2d34970c8ee694b \ - file://doc/licenses/GPL.txt;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/lxml/isoschematron/resources/rng/iso-schematron.rng;beginline=2;endline=7;md5=fc85684a8dd5fa272c086bceb0d99e10 \ - file://src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl;beginline=2;endline=24;md5=cc86b7b2bbc678e13f58ea403eb9929b \ - file://src/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl;beginline=2;endline=7;md5=5b03236d293dc3784205542b409d2f53 \ - " - -DEPENDS += "libxml2 libxslt" - -SRC_URI[md5sum] = "10924ab543397a06cb4cfaf9bdf0b80f" -SRC_URI[sha256sum] = "c152b2e93b639d1f36ec5a8ca24cde4a8eefb2b6b83668fcd8e83a67badcb367" - -inherit pypi setuptools3 - -# {standard input}: Assembler messages: -# {standard input}:1488805: Error: branch out of range -DEBUG_OPTIMIZATION_remove_mips = " -Og" -DEBUG_OPTIMIZATION_append_mips = " -O" -BUILD_OPTIMIZATION_remove_mips = " -Og" -BUILD_OPTIMIZATION_append_mips = " -O" - -DEBUG_OPTIMIZATION_remove_mipsel = " -Og" -DEBUG_OPTIMIZATION_append_mipsel = " -O" -BUILD_OPTIMIZATION_remove_mipsel = " -Og" -BUILD_OPTIMIZATION_append_mipsel = " -O" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS_${PN} += "libxml2 libxslt ${PYTHON_PN}-compression" - -CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.2.bb new file mode 100644 index 000000000..f7aed6d77 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.2.bb @@ -0,0 +1,41 @@ +SUMMARY = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." +DESCRIPTION = "lxml is a Pythonic, mature binding for the libxml2 and \ +libxslt libraries. It provides safe and convenient access to these \ +libraries using the ElementTree API. It extends the ElementTree API \ +significantly to offer support for XPath, RelaxNG, XML Schema, XSLT, \ +C14N and much more." +HOMEPAGE = "http://codespeak.net/lxml" +SECTION = "devel/python" +LICENSE = "BSD & GPLv2 & MIT & PSF" +LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ + file://doc/licenses/elementtree.txt;md5=eb34d036a6e3d56314ee49a6852ac891 \ + file://doc/licenses/BSD.txt;md5=700a1fc17f4797d4f2d34970c8ee694b \ + file://doc/licenses/GPL.txt;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://src/lxml/isoschematron/resources/rng/iso-schematron.rng;beginline=2;endline=7;md5=fc85684a8dd5fa272c086bceb0d99e10 \ + file://src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl;beginline=2;endline=24;md5=cc86b7b2bbc678e13f58ea403eb9929b \ + file://src/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl;beginline=2;endline=7;md5=5b03236d293dc3784205542b409d2f53 \ + " + +DEPENDS += "libxml2 libxslt" + +SRC_URI[sha256sum] = "cd11c7e8d21af997ee8079037fff88f16fda188a9776eb4b81c7e4c9c0a7d7fc" + +inherit pypi setuptools3 + +# {standard input}: Assembler messages: +# {standard input}:1488805: Error: branch out of range +DEBUG_OPTIMIZATION_remove_mips = " -Og" +DEBUG_OPTIMIZATION_append_mips = " -O" +BUILD_OPTIMIZATION_remove_mips = " -Og" +BUILD_OPTIMIZATION_append_mips = " -O" + +DEBUG_OPTIMIZATION_remove_mipsel = " -Og" +DEBUG_OPTIMIZATION_append_mipsel = " -O" +BUILD_OPTIMIZATION_remove_mipsel = " -Og" +BUILD_OPTIMIZATION_append_mipsel = " -O" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN} += "libxml2 libxslt ${PYTHON_PN}-compression" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_3.1.0.bb deleted file mode 100644 index 06bf63159..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_3.1.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "python bindings for the lz4 compression library by Yann Collet" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6231efa4dd4811e62407314d90a57573" - -DEPENDS += " \ - ${PYTHON_PN}-setuptools-scm-native \ - ${PYTHON_PN}-pkgconfig-native \ -" - -SRC_URI[md5sum] = "1bf913acec3cb63893f522c222c8e3b1" -SRC_URI[sha256sum] = "debe75513db3eb9e5cdcd82a329ff38374b6316ab65b848b571e0404746c1e05" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_3.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_3.1.3.bb new file mode 100644 index 000000000..b14484b78 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_3.1.3.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "python bindings for the lz4 compression library by Yann Collet" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6231efa4dd4811e62407314d90a57573" + +DEPENDS += " \ + ${PYTHON_PN}-setuptools-scm-native \ + ${PYTHON_PN}-pkgconfig-native \ +" + +SRC_URI[sha256sum] = "081ef0a3b5941cb03127f314229a1c78bd70c9c220bb3f4dd80033e707feaa18" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.2.bb deleted file mode 100644 index 39ab6d01f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "A Python Mocking and Patching Library for Testing" -HOMEPAGE = "https://pypi.python.org/pypi/mock" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=de9dfbf780446b18aab11f00baaf5b7e" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-prettytable \ - ${PYTHON_PN}-cmd2 \ - ${PYTHON_PN}-pyparsing \ - ${PYTHON_PN}-mccabe \ - ${PYTHON_PN}-pep8 \ - ${PYTHON_PN}-pyflakes" - -SRC_URI[md5sum] = "6466619b89c2969dc57722ad73f85676" -SRC_URI[sha256sum] = "dd33eb70232b6118298d516bbcecd26704689c386594f0f3c4f13867b2c56f72" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.3.bb new file mode 100644 index 000000000..b34f25b93 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.3.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "A Python Mocking and Patching Library for Testing" +HOMEPAGE = "https://pypi.python.org/pypi/mock" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=de9dfbf780446b18aab11f00baaf5b7e" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-prettytable \ + ${PYTHON_PN}-cmd2 \ + ${PYTHON_PN}-pyparsing \ + ${PYTHON_PN}-mccabe \ + ${PYTHON_PN}-pep8 \ + ${PYTHON_PN}-pyflakes" + +SRC_URI[sha256sum] = "7d3fbbde18228f4ff2f1f119a45cdffa458b4c0dee32eb4d2bb2f82554bac7bc" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.0.bb deleted file mode 100644 index d744738a2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "MessagePack (de)serializer" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751" - -PYPI_PACKAGE = "msgpack" -inherit pypi setuptools3 ptest - -SRC_URI[md5sum] = "c35ee8f991dad3969884e9585e56ebba" -SRC_URI[sha256sum] = "9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0" - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-io \ -" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/test - cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.2.bb new file mode 100644 index 000000000..989a7ae3f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.2.bb @@ -0,0 +1,27 @@ +SUMMARY = "MessagePack (de)serializer" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751" + +PYPI_PACKAGE = "msgpack" +inherit pypi setuptools3 ptest + +SRC_URI[sha256sum] = "fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984" + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-io \ +" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy-extensions_0.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy-extensions_0.4.3.bb new file mode 100644 index 000000000..83ac5362d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy-extensions_0.4.3.bb @@ -0,0 +1,12 @@ +SUMMARY = "Experimental type system extensions for programs checked with the mypy typechecker" +HOMEPAGE = "https://github.com/python/mypy_extensions" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0fe3219e2470a78c0d1837019b8b426e" + +PYPI_PACKAGE = "mypy_extensions" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.800.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.800.bb new file mode 100644 index 000000000..0d019dfe1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.800.bb @@ -0,0 +1,18 @@ +SUMMARY = "Optional static typing for Python 3 and 2 (PEP 484)" +HOMEPAGE = "https://github.com/python/mypy" +LICENSE = "MIT & Python-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6afb7c151c4dedb5c3dc292cc120fadc" + +RDEPENDS_${PN} = " \ + ${PYTHON_PN}-mypy-extensions \ + ${PYTHON_PN}-typed-ast \ + ${PYTHON_PN}-typing-extensions \ +" + +PYPI_PACKAGE = "mypy" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "e0202e37756ed09daf4b0ba64ad2c245d357659e014c3f51d8cd0681ba66940a" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.1.0.bb deleted file mode 100644 index c890ae243..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.1.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Simple yet flexible natural sorting in Python." -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6a96e5ad780a0eea866ecccec4463517" - -PYPI_PACKAGE = "natsort" -SRC_URI[sha256sum] = "33f3f1003e2af4b4df20908fe62aa029999d136b966463746942efbfc821add3" - -inherit pypi setuptools3 - -RDEPENDS_${PN} = "python3-fastnumbers python3-icu" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.1.1.bb new file mode 100644 index 000000000..89df3dc38 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.1.1.bb @@ -0,0 +1,11 @@ +SUMMARY = "Simple yet flexible natural sorting in Python." +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6a96e5ad780a0eea866ecccec4463517" + +PYPI_PACKAGE = "natsort" +SRC_URI[sha256sum] = "00c603a42365830c4722a2eb7663a25919551217ec09a243d3399fa8dd4ac403" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "python3-fastnumbers python3-icu" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.4.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.4.8.bb deleted file mode 100644 index 2037d496a..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.4.8.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "python-nmap is a python library which helps in using nmap port scanner" -HOMEPAGE = "https://www.nmmapper.com/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -DEPENDS += "${PYTHON_PN}-wheel-native" - -PYPI_PACKAGE = "python3-nmap" - -SRC_URI[md5sum] = "e7904b39b64a8a44f275388862659a0d" -SRC_URI[sha256sum] = "8d7da78142bee665289a243f71c5f48407d8ab7e5a02ee672ded05f339044759" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "nmap ${PYTHON_PN}-requests" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.5.0.bb new file mode 100644 index 000000000..e6f093360 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.5.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "python-nmap is a python library which helps in using nmap port scanner" +HOMEPAGE = "https://www.nmmapper.com/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +DEPENDS += "${PYTHON_PN}-wheel-native" + +PYPI_PACKAGE = "python3-nmap" + +SRC_URI[md5sum] = "3a43dd0f56ade8c76c7c6f994604212d" +SRC_URI[sha256sum] = "b52744e0c9944c567733b8deb60d6363e17233ee40466edfb1b09a5780576f9a" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "nmap \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-simplejson \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.5.bb deleted file mode 100644 index 0aa9fb020..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.5.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "openpyxl is a Python library to read/write Excel 2010 xlsx/xlsm/xltx/xltm files" -DESCRIPTION = "It was born from lack of existing library to read/write natively \ -from Python the Office Open XML format. All kudos to the PHPExcel team as openpyxl \ -was initially based on PHPExcel." - -HOMEPAGE = "http://www.python-excel.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "526b7149538575d58e55df1bd37807c1" -SRC_URI[sha256sum] = "18e11f9a650128a12580a58e3daba14e00a11d9e907c554a17ea016bf1a2c71b" - -RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell ${PYTHON_PN}-jdcal ${PYTHON_PN}-et-xmlfile" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.6.bb new file mode 100644 index 000000000..d4781eeff --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.6.bb @@ -0,0 +1,14 @@ +SUMMARY = "openpyxl is a Python library to read/write Excel 2010 xlsx/xlsm/xltx/xltm files" +DESCRIPTION = "It was born from lack of existing library to read/write natively \ +from Python the Office Open XML format. All kudos to the PHPExcel team as openpyxl \ +was initially based on PHPExcel." + +HOMEPAGE = "http://www.python-excel.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "b229112b46e158b910a5d1b270b212c42773d39cab24e8db527f775b82afc041" + +RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell ${PYTHON_PN}-jdcal ${PYTHON_PN}-et-xmlfile" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pako_0.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pako_0.2.3.bb deleted file mode 100644 index 21c48fca6..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pako_0.2.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "The universal package manager library" -HOMEPAGE = "https://github.com/MycroftAI/pako" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa" - -SRC_URI[md5sum] = "8eb7077075091c50e4b8a9f939607277" -SRC_URI[sha256sum] = "6be55fd8c5a2a6f02974f37438c1c47a3d9e764ce81c9d0a1a8c9a1815a59778" - -inherit pypi setuptools3 - -do_install_append() { - rm -rf ${D}/usr/share -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pako_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pako_0.3.0.bb new file mode 100644 index 000000000..3eacd0bdd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pako_0.3.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "The universal package manager library" +HOMEPAGE = "https://github.com/MycroftAI/pako" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa" + +SRC_URI[sha256sum] = "eabd1c121d6701069d1a10132f197ee2b5f4e75a3d68a93b07f69214ab0ff9c7" + +inherit pypi setuptools3 + +do_install_append() { + rm -rf ${D}/usr/share +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.0.bb deleted file mode 100644 index 0cb631990..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "pandas library for high-performance data analysis tools" -DESCRIPTION = "pandas is an open source, BSD-licensed library providing \ -high-performance, easy-to-use data structures and data analysis tools for \ -the Python programming language." -HOMEPAGE = "http://pandas.pydata.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c2a8f987b2ce77c368c6b3e1b5b10774" - -SRC_URI[sha256sum] = "e03386615b970b8b41da6a68afe717626741bb2431cec993640685614c0680e4" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ -" - -CFLAGS_append_toolchain-clang = " -Wno-error=deprecated-declarations" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-numpy \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-pytz \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.1.bb new file mode 100644 index 000000000..ae8a55f84 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "pandas library for high-performance data analysis tools" +DESCRIPTION = "pandas is an open source, BSD-licensed library providing \ +high-performance, easy-to-use data structures and data analysis tools for \ +the Python programming language." +HOMEPAGE = "http://pandas.pydata.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c2a8f987b2ce77c368c6b3e1b5b10774" + +SRC_URI[sha256sum] = "5527c5475d955c0bc9689c56865aaa2a7b13c504d6c44f0aadbf57b565af5ebd" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ +" + +CFLAGS_append_toolchain-clang = " -Wno-error=deprecated-declarations" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-numpy \ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-pytz \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.18.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.18.0.bb deleted file mode 100644 index ed9204e3b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.18.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Parse strings using a specification based on the Python format() syntax" -HOMEPAGE = "https://github.com/r1chardj0n3s/parse" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8ab458ad281b60e6f1b39b3feafbfc05" - -SRC_URI[md5sum] = "42ea0002cf36bfd2bd74f3c05bf25f60" -SRC_URI[sha256sum] = "91666032d6723dc5905248417ef0dc9e4c51df9526aaeef271eacad6491f06a4" - -inherit pypi setuptools3 ptest - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-logging \ - " - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - cp -f ${S}/test_parse.py ${D}${PTEST_PATH}/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.19.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.19.0.bb new file mode 100644 index 000000000..b5e076954 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.19.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Parse strings using a specification based on the Python format() syntax" +HOMEPAGE = "https://github.com/r1chardj0n3s/parse" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8ab458ad281b60e6f1b39b3feafbfc05" + +SRC_URI[sha256sum] = "9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b" + +inherit pypi setuptools3 ptest + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-logging \ + " + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + cp -f ${S}/test_parse.py ${D}${PTEST_PATH}/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.0.bb deleted file mode 100644 index 507087909..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "A Python Parser" -HOMEPAGE = "https://github.com/davidhalter/parso" -AUTHOR = "David Halter " -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cbaa2675b2424d771451332a7a69503f" - -PYPI_PACKAGE = "parso" - -SRC_URI[md5sum] = "ee3592994bfc0d0843790544c1b2b702" -SRC_URI[sha256sum] = "2b6db14759c528d857eeb9eac559c2166b2554548af39f5198bdfb976f72aa64" - -inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.1.bb new file mode 100644 index 000000000..9e4ede529 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.1.bb @@ -0,0 +1,11 @@ +SUMMARY = "A Python Parser" +HOMEPAGE = "https://github.com/davidhalter/parso" +AUTHOR = "David Halter " +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cbaa2675b2424d771451332a7a69503f" + +PYPI_PACKAGE = "parso" + +SRC_URI[sha256sum] = "8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e" + +inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch index 6de19ad87..e4ba35b88 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch @@ -1,20 +1,21 @@ -From ae7c8d0336381dd4c10e809e9c8926f9deeafeb8 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Thu, 14 Mar 2019 03:48:10 -0400 +From cd09b6f68aa49c72e9a9bb0765e8c666238a7b7e Mon Sep 17 00:00:00 2001 +From: Leon Anavi +Date: Mon, 11 Jan 2021 13:25:12 +0000 Subject: [PATCH] support cross compiling Upstream-Status: Inappropriate [oe specific] -Signed-off-by: Hongxu Jia +Suggested-by: Hongxu Jia +Signed-off-by: Leon Anavi --- - setup.py | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) + setup.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py -index 5ceae344..07863340 100755 +index cbc2641c..302bc6e7 100755 --- a/setup.py +++ b/setup.py -@@ -105,7 +105,7 @@ _LIB_IMAGING = ( +@@ -123,7 +123,7 @@ _LIB_IMAGING = ( "codec_fd", ) @@ -23,39 +24,21 @@ index 5ceae344..07863340 100755 class DependencyException(Exception): -@@ -396,21 +396,16 @@ class pil_build_ext(build_ext): +@@ -408,12 +408,12 @@ class pil_build_ext(build_ext): _add_directory(library_dirs, match.group(1)) # include, rpath, if set as environment variables: - for k in ("C_INCLUDE_PATH", "CPATH", "INCLUDE"): -+ for k in ('C_INCLUDE_PATH', 'CPATH', 'INCLUDE', 'STAGING_INCDIR'): ++ for k in ("C_INCLUDE_PATH", "CPATH", "INCLUDE", "STAGING_INCDIR"): if k in os.environ: for d in os.environ[k].split(os.path.pathsep): _add_directory(include_dirs, d) - for k in ("LD_RUN_PATH", "LIBRARY_PATH", "LIB"): -+ for k in ('LD_RUN_PATH', 'LIBRARY_PATH', 'LIB', 'STAGING_LIBDIR'): ++ for k in ("LD_RUN_PATH", "LIBRARY_PATH", "LIB", "STAGING_LIBDIR"): if k in os.environ: for d in os.environ[k].split(os.path.pathsep): _add_directory(library_dirs, d) - -- prefix = sysconfig.get_config_var("prefix") -- if prefix: -- _add_directory(library_dirs, os.path.join(prefix, "lib")) -- _add_directory(include_dirs, os.path.join(prefix, "include")) -- - # - # add platform directories - -@@ -469,8 +464,6 @@ class pil_build_ext(build_ext): - or sys.platform.startswith("gnu") - or sys.platform.startswith("freebsd") - ): -- for dirname in _find_library_dirs_ldconfig(): -- _add_directory(library_dirs, dirname) - if sys.platform.startswith("linux") and os.environ.get( - "ANDROID_ROOT", None - ): -- -2.20.1 +2.17.1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_7.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_7.2.0.bb deleted file mode 100644 index 13cab4300..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_7.2.0.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Python Imaging Library (Fork). Pillow is the friendly PIL fork by Alex \ -Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and \ -Contributors." -HOMEPAGE = "https://pillow.readthedocs.io" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ea2dc3f5611e69058503d4b940049d03" - -SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=7.2.x \ - file://0001-support-cross-compiling.patch \ - file://0001-explicitly-set-compile-options.patch \ -" -SRCREV ?= "2bd74943fb9f320def6c066e732b701d1c15f677" - - -inherit setuptools3 - -DEPENDS += " \ - zlib \ - jpeg \ - tiff \ - freetype \ - lcms \ - openjpeg \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-numbers \ -" - -CVE_PRODUCT = "pillow" - -S = "${WORKDIR}/git" - -RPROVIDES_${PN} += "python3-imaging" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_8.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_8.1.0.bb new file mode 100644 index 000000000..63974590c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_8.1.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "Python Imaging Library (Fork). Pillow is the friendly PIL fork by Alex \ +Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and \ +Contributors." +HOMEPAGE = "https://pillow.readthedocs.io" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0337b116233da4616ae9fdb130bf6f1a" + +SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=8.1.x \ + file://0001-support-cross-compiling.patch \ + file://0001-explicitly-set-compile-options.patch \ +" +SRCREV ?= "fcc42e0d344146ee9d265d1f43c094ce5a0ec4cf" + +inherit setuptools3 + +DEPENDS += " \ + zlib \ + jpeg \ + tiff \ + freetype \ + lcms \ + openjpeg \ +" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-numbers \ +" + +CVE_PRODUCT = "pillow" + +S = "${WORKDIR}/git" + +RPROVIDES_${PN} += "python3-imaging" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.1.4.bb new file mode 100644 index 000000000..d08d3e725 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.1.4.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Python data structure and operations for intervals" +HOMEPAGE = "https://github.com/AlexandreDecan/portion" +SECTION = "devel/python" + +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05f1e16a8e59ce3e9a979e881816c2ab" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "58b2792e6e9837a2d55a97d459b940c90fb08b5fba774f524e9359727c80e7b4" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.11.bb new file mode 100644 index 000000000..0b832c064 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.11.bb @@ -0,0 +1,23 @@ +SUMMARY = "Library for building powerful interactive command lines in Python" +HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" + +SRC_URI[sha256sum] = "dc83e6368b0edd9ceabe17a055f2e22f6ed95b9aa39dbd59d0b4f3585bdfe9ed" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "prompt_toolkit" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-terminal \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-wcwidth \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-image \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.9.bb deleted file mode 100644 index 589d9398d..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.9.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Library for building powerful interactive command lines in Python" -HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" - -SRC_URI[sha256sum] = "c5eeab58dd31b541442825d7870777f2a2f764eb5fda03334d5219cd84b9722f" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "prompt_toolkit" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-wcwidth \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-image \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.6.0.bb deleted file mode 100644 index 87911e02e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.6.0.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Run a subprocess in a pseudo terminal" -HOMEPAGE = "http://ptyprocess.readthedocs.io/en/latest/" -SECTION = "devel/python" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cfdcd51fa7d5808da4e74346ee394490" - -SRCNAME = "ptyprocess" - -SRC_URI[md5sum] = "37402d69f3b50913d4d483587bffad8f" -SRC_URI[sha256sum] = "923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0" - -inherit pypi setuptools3 - -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/ptyprocess" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-resource \ -" - -BBCLASSEXTEND = "native nativesdk" - -inherit ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-resource \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb new file mode 100644 index 000000000..607c71946 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Run a subprocess in a pseudo terminal" +HOMEPAGE = "http://ptyprocess.readthedocs.io/en/latest/" +SECTION = "devel/python" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cfdcd51fa7d5808da4e74346ee394490" + +SRCNAME = "ptyprocess" + +SRC_URI[sha256sum] = "5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220" + +inherit pypi setuptools3 + +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/ptyprocess" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-fcntl \ + ${PYTHON_PN}-terminal \ + ${PYTHON_PN}-resource \ +" + +BBCLASSEXTEND = "native nativesdk" + +inherit ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-fcntl \ + ${PYTHON_PN}-terminal \ + ${PYTHON_PN}-resource \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.1.bb deleted file mode 100644 index ca55740ba..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." -HOMEPAGE = "https://github.com/balloob/pychromecast" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" - -SRC_URI[sha256sum] = "d6fd0382395303b3260ea7a89a850c8c9e5c83e7ce71a5fbd793bb157cf8ad26" - -PYPI_PACKAGE = "PyChromecast" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.2.bb new file mode 100644 index 000000000..c0ff58cfd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." +HOMEPAGE = "https://github.com/balloob/pychromecast" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" + +SRC_URI[sha256sum] = "aad4b145cb8c76b629c700877e49c418810aaabb26ace5035c49940f9657f2f0" + +PYPI_PACKAGE = "PyChromecast" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.7.1.bb deleted file mode 100644 index d2f7be46c..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.7.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "JSON Web Token implementation in Python" -DESCRIPTION = "A Python implementation of JSON Web Token draft 32.\ - Original implementation was written by https://github.com/progrium" -HOMEPAGE = "http://github.com/jpadilla/pyjwt" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=68626705a7b513ca8d5f44a3e200ed0c" - -SRC_URI[md5sum] = "a4712f980c008696e13e09504120b2a0" -SRC_URI[sha256sum] = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96" - -PYPI_PACKAGE = "PyJWT" -inherit pypi setuptools3 - -RDEPENDS_${PN} = "${PYTHON_PN}-cryptography" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.0.1.bb new file mode 100644 index 000000000..ed52da4d4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.0.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "JSON Web Token implementation in Python" +DESCRIPTION = "A Python implementation of JSON Web Token draft 32.\ + Original implementation was written by https://github.com/progrium" +HOMEPAGE = "http://github.com/jpadilla/pyjwt" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=68626705a7b513ca8d5f44a3e200ed0c" + +SRC_URI[sha256sum] = "a5c70a06e1f33d81ef25eecd50d50bd30e34de1ca8b2b9fa3fe0daaabcf69bf7" + +PYPI_PACKAGE = "PyJWT" +inherit pypi setuptools3 + +RDEPENDS_${PN} = "${PYTHON_PN}-cryptography" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify/0001-rule.py-fix-missing-comma.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify/0001-rule.py-fix-missing-comma.patch deleted file mode 100644 index 689355eea..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify/0001-rule.py-fix-missing-comma.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f96b76efb810d7d559254d0ec58de628e09f525a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= -Date: Mon, 13 Jan 2020 08:42:05 -0800 -Subject: [PATCH] rule.py: fix missing comma -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -A line in the defined_keywords list is missing a comma. Add it. - -Signed-off-by: Martí Bolívar - -Upstream-Status: Backport [https://github.com/Grokzen/pykwalify.git] -Signed-off-by: Hongxu Jia ---- - pykwalify/rule.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pykwalify/rule.py b/pykwalify/rule.py -index 7ac2c9e..f044b69 100644 ---- a/pykwalify/rule.py -+++ b/pykwalify/rule.py -@@ -340,7 +340,7 @@ class Rule(object): - ('matching', 'matching'), - ('matching_rule', 'matching_rule'), - ('name', 'name'), -- ('nullable', 'nullable') -+ ('nullable', 'nullable'), - ('parent', 'parent'), - ('pattern', 'pattern'), - ('pattern_regexp', 'pattern_regexp'), --- -2.18.2 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb deleted file mode 100644 index 2e1bff4f2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "YAML/JSON validation library" -DESCRIPTION = "pykwalify is a schema validator for YAML and JSON" -HOMEPAGE = "https://pypi.org/project/pykwalify/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a72ea5159364a2cd7f45c6dcbee37872" - -SRC_URI[md5sum] = "58357f1d0f77de976e73dbd3660af75b" -SRC_URI[sha256sum] = "7e8b39c5a3a10bc176682b3bd9a7422c39ca247482df198b402e8015defcceb2" - -SRC_URI += "file://0001-rule.py-fix-missing-comma.patch" - -PYPI_PACKAGE = "pykwalify" - -inherit setuptools3 pypi - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-docopt \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-pyyaml \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb new file mode 100644 index 000000000..aa14cdd4b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "YAML/JSON validation library" +DESCRIPTION = "pykwalify is a schema validator for YAML and JSON" +HOMEPAGE = "https://pypi.org/project/pykwalify/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4eaf57328ad29ea2e0ed31a57f0914dc" + +SRC_URI[sha256sum] = "796b2ad3ed4cb99b88308b533fb2f559c30fa6efb4fa9fda11347f483d245884" + +PYPI_PACKAGE = "pykwalify" + +inherit setuptools3 pypi + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-docopt \ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-pyyaml \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.133.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.133.bb deleted file mode 100644 index 28a24fed5..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.133.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Python API for MISP" -HOMEPAGE = "https://github.com/MISP/PyMISP" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" - -SRC_URI[md5sum] = "00e258da18f59845687f58389a2e8e12" -SRC_URI[sha256sum] = "4a2a8a4da78c6321550522d5cf1575c095773d0867c0a4f5157a658f6e1994d5" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-jsonschema \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-six \ -" - -# Fixes: python3-pymisp requires /bin/bash, but no -# providers found in RDEPENDS_python3-pymisp? [file-rdep -RDEPENDS_${PN} += "bash" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.137.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.137.1.bb new file mode 100644 index 000000000..9b2efa2cd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.137.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Python API for MISP" +HOMEPAGE = "https://github.com/MISP/PyMISP" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" + +SRC_URI = "git://github.com/MISP/PyMISP.git;protocol=https;branch=main" +SRCREV = "7b64c1c9a4fec8ed37c1522b31ab56f30b83f0e1" +S = "${WORKDIR}/git" + +inherit setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-jsonschema \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-six \ +" + +# Fixes: python3-pymisp requires /bin/bash, but no +# providers found in RDEPENDS_python3-pymisp? [file-rdep +RDEPENDS_${PN} += "bash" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.10.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.10.1.bb deleted file mode 100644 index 15ace44ac..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.10.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "A pure-Python MySQL client library" -DESCRIPTION = " \ - This package contains a pure-Python MySQL client library, based on PEP 249 \ - Most public APIs are compatible with mysqlclient and MySQLdb. \ - " -SECTION = "devel/python" -HOMEPAGE = "https://pymysql.readthedocs.io" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=528175c84163bb800d23ad835c7fa0fc" - -SRC_URI[md5sum] = "4a1fe973afbbdd78928650118ce8ff68" -SRC_URI[sha256sum] = "263040d2779a3b84930f7ac9da5132be0fefcd6f453a885756656103f8ee1fdd" - -PYPI_PACKAGE = "PyMySQL" -inherit pypi setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-cryptography" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.0.2.bb new file mode 100644 index 000000000..36e2921ae --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.0.2.bb @@ -0,0 +1,16 @@ +SUMMARY = "A pure-Python MySQL client library" +DESCRIPTION = " \ + This package contains a pure-Python MySQL client library, based on PEP 249 \ + Most public APIs are compatible with mysqlclient and MySQLdb. \ + " +SECTION = "devel/python" +HOMEPAGE = "https://pymysql.readthedocs.io" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=528175c84163bb800d23ad835c7fa0fc" + +SRC_URI[sha256sum] = "816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36" + +PYPI_PACKAGE = "PyMySQL" +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-cryptography" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_19.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_19.1.0.bb deleted file mode 100644 index da783ea29..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_19.1.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Simple Python wrapper around the OpenSSL library" -HOMEPAGE = "https://pyopenssl.org/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -DEPENDS += "openssl ${PYTHON_PN}-cryptography" - -SRC_URI[md5sum] = "d9804fedbd1eb0c7d9243397b1fbf972" -SRC_URI[sha256sum] = "9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507" - -PYPI_PACKAGE = "pyOpenSSL" -inherit pypi setuptools3 - -PACKAGES =+ "${PN}-tests" -FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test" - -RDEPENDS_${PN}_class-target = " \ - ${PYTHON_PN}-cryptography \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-threading \ -" -RDEPENDS_${PN}-tests = "${PN}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_20.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_20.0.1.bb new file mode 100644 index 000000000..e121ef844 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_20.0.1.bb @@ -0,0 +1,23 @@ +SUMMARY = "Simple Python wrapper around the OpenSSL library" +HOMEPAGE = "https://pyopenssl.org/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS += "openssl ${PYTHON_PN}-cryptography" + +SRC_URI[sha256sum] = "4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51" + +PYPI_PACKAGE = "pyOpenSSL" +inherit pypi setuptools3 + +PACKAGES =+ "${PN}-tests" +FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test" + +RDEPENDS_${PN}_class-target = " \ + ${PYTHON_PN}-cryptography \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-threading \ +" +RDEPENDS_${PN}-tests = "${PN}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.0.0.bb deleted file mode 100644 index 7ced7d017..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.0.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "A toolkit to write, run and analyze benchmarks" -DESCRIPTION = " \ -The Python pyperf module is a toolkit to write, run and analyze benchmarks. \ -Features: \ - * Simple API to run reliable benchmarks \ - * Automatically calibrate a benchmark for a time budget. \ - * Spawn multiple worker processes. \ - * Compute the mean and standard deviation. \ - * Detect if a benchmark result seems unstable. \ - * JSON format to store benchmark results. \ - * Support multiple units: seconds, bytes and integer. \ -" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=78bc2e6e87c8c61272937b879e6dc2f8" - -SRC_URI[md5sum] = "7f62d3f6fc5475138791d3d883fdf4cd" -SRC_URI[sha256sum] = "2189fbc4af08d519f85468e70e32c902eab0f1341b2c41028b94b2832d3169a7" - -DEPENDS += "${PYTHON_PN}-six-native" - -PYPI_PACKAGE = "pyperf" -inherit pypi setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-misc" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.1.0.bb new file mode 100644 index 000000000..b57ea16eb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.1.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "A toolkit to write, run and analyze benchmarks" +DESCRIPTION = " \ +The Python pyperf module is a toolkit to write, run and analyze benchmarks. \ +Features: \ + * Simple API to run reliable benchmarks \ + * Automatically calibrate a benchmark for a time budget. \ + * Spawn multiple worker processes. \ + * Compute the mean and standard deviation. \ + * Detect if a benchmark result seems unstable. \ + * JSON format to store benchmark results. \ + * Support multiple units: seconds, bytes and integer. \ +" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=78bc2e6e87c8c61272937b879e6dc2f8" + +SRC_URI[sha256sum] = "1257d673d89fdcdbaec8077afeb365e7a94739c1b263572b09403cac25708ad3" + +DEPENDS += "${PYTHON_PN}-six-native" + +PYPI_PACKAGE = "pyperf" +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-misc" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_3.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_3.2.3.bb deleted file mode 100644 index dbd222f54..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_3.2.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Python project template generator with batteries included" -DESCRIPTION = "PyScaffold package helps to setup a new Python project. \ -After installation, it provides a new command [putup], which could be \ -used to create template Projects." - -HOMEPAGE = "https://github.com/pyscaffold/pyscaffold" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "PyScaffold" - -SRC_URI[md5sum] = "6769d2a26a9d1f3038944b8fbfe728ff" -SRC_URI[sha256sum] = "96c3e7f5529df0b5b351e879a141e1e5c9f26211f30d493c23d8c09d9d610a6f" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_3.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_3.3.1.bb new file mode 100644 index 000000000..9bebcedd3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_3.3.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "Python project template generator with batteries included" +DESCRIPTION = "PyScaffold package helps to setup a new Python project. \ +After installation, it provides a new command [putup], which could be \ +used to create template Projects." + +HOMEPAGE = "https://github.com/pyscaffold/pyscaffold" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "PyScaffold" + +SRC_URI[sha256sum] = "1c3a2b76e60319b6ffc2a8b54e240382109c6241576bf0a47ea476c7194f6a69" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.4.bb deleted file mode 100644 index d65c9a88b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.4.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Serial Port Support for Python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d476d94926db6e0008a5b3860d1f5c0d" - -SRC_URI[md5sum] = "ed6183b15519a0ae96675e9c3330c69b" -SRC_URI[sha256sum] = "6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627" - -inherit pypi setuptools3 ptest - -do_install_append() { - rm -f ${D}${bindir}/miniterm.py - rmdir ${D}${bindir} -} - -PACKAGES =+ "${PN}-java ${PN}-osx ${PN}-win32 ${PN}-tools" - -FILES_${PN}-java = " \ - ${PYTHON_SITEPACKAGES_DIR}/serial/*java* \ - ${PYTHON_SITEPACKAGES_DIR}/serial/__pycache__/*java* \ -" - -FILES_${PN}-osx = " \ - ${PYTHON_SITEPACKAGES_DIR}/serial/tools/*osx* \ - ${PYTHON_SITEPACKAGES_DIR}/serial/tools/__pycache__/*osx* \ -" - -FILES_${PN}-win32 = " \ - ${PYTHON_SITEPACKAGES_DIR}/serial/*serialcli* \ - ${PYTHON_SITEPACKAGES_DIR}/serial/__pycache__/*serialcli* \ - ${PYTHON_SITEPACKAGES_DIR}/serial/*win32* \ - ${PYTHON_SITEPACKAGES_DIR}/serial/__pycache__/*win32* \ - ${PYTHON_SITEPACKAGES_DIR}/serial/tools/miniterm* \ - ${PYTHON_SITEPACKAGES_DIR}/serial/tools/__pycache__/miniterm* \ - ${PYTHON_SITEPACKAGES_DIR}/serial/tools/*windows* \ - ${PYTHON_SITEPACKAGES_DIR}/serial/tools/__pycache__/*windows* \ -" - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ -" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/test - cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.5.bb new file mode 100644 index 000000000..4be80e28c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.5.bb @@ -0,0 +1,62 @@ +SUMMARY = "Serial Port Support for Python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=520e45e59fc2cf94aa53850f46b86436" + +SRC_URI[sha256sum] = "3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb" + +inherit pypi setuptools3 ptest + +do_install_append() { + rm -f ${D}${bindir}/pyserial-miniterm + rm -f ${D}${bindir}/pyserial-ports + rmdir ${D}${bindir} +} + +PACKAGES =+ "${PN}-java ${PN}-osx ${PN}-win32 ${PN}-tools" + +FILES_${PN}-java = " \ + ${PYTHON_SITEPACKAGES_DIR}/serial/*java* \ + ${PYTHON_SITEPACKAGES_DIR}/serial/__pycache__/*java* \ +" + +FILES_${PN}-osx = " \ + ${PYTHON_SITEPACKAGES_DIR}/serial/tools/*osx* \ + ${PYTHON_SITEPACKAGES_DIR}/serial/tools/__pycache__/*osx* \ +" + +FILES_${PN}-win32 = " \ + ${PYTHON_SITEPACKAGES_DIR}/serial/*serialcli* \ + ${PYTHON_SITEPACKAGES_DIR}/serial/__pycache__/*serialcli* \ + ${PYTHON_SITEPACKAGES_DIR}/serial/*win32* \ + ${PYTHON_SITEPACKAGES_DIR}/serial/__pycache__/*win32* \ + ${PYTHON_SITEPACKAGES_DIR}/serial/tools/miniterm* \ + ${PYTHON_SITEPACKAGES_DIR}/serial/tools/__pycache__/miniterm* \ + ${PYTHON_SITEPACKAGES_DIR}/serial/tools/*windows* \ + ${PYTHON_SITEPACKAGES_DIR}/serial/tools/__pycache__/*windows* \ +" + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-fcntl \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-stringold \ + ${PYTHON_PN}-threading \ +" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.1.0.bb deleted file mode 100644 index 6b48d6a25..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.1.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "PyUSB provides USB access on the Python language" -HOMEPAGE = "http://pyusb.sourceforge.net/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c52a96fd9a0cadcb9270904c8eb5416c" -DEPENDS += "libusb1 ${PYTHON_PN}-setuptools-scm-native" - -SRC_URI[md5sum] = "3b2e38e9f697d2f90d86376bd10a9505" -SRC_URI[sha256sum] = "d69ed64bff0e2102da11b3f49567256867853b861178689671a163d30865c298" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.1.1.bb new file mode 100644 index 000000000..a8c7031b6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.1.1.bb @@ -0,0 +1,12 @@ +SUMMARY = "PyUSB provides USB access on the Python language" +HOMEPAGE = "http://pyusb.sourceforge.net/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e64a29fcd3c3dd356a24e235dfcb3905" + +DEPENDS += "libusb1 ${PYTHON_PN}-setuptools-scm-native" + +SRC_URI[sha256sum] = "7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb deleted file mode 100644 index 8cf909304..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Python support for YAML" -DEPENDS += "libyaml ${PYTHON_PN}-cython-native" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7bbd28caa69f81f5cd5f48647236663d" - -PYPI_PACKAGE = "PyYAML" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-netclient \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.4.1.bb new file mode 100644 index 000000000..c3025fdc6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.4.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "Python support for YAML" +DEPENDS += "libyaml ${PYTHON_PN}-cython-native" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6d8242660a8371add5fe547adf083079" + +PYPI_PACKAGE = "PyYAML" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-netclient \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_19.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_19.0.2.bb deleted file mode 100644 index 3c4e32b5e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_19.0.2.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Pyzmq provides Zero message queue access for the Python language" -HOMEPAGE = "http://zeromq.org/bindings:python" -LICENSE = "BSD & LGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \ - file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e" -DEPENDS = "zeromq" - -FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyzmq:" - -SRC_URI += "file://club-rpath-out.patch" -SRC_URI[md5sum] = "200abc1a75bdcfff7adf61304f46f55e" -SRC_URI[sha256sum] = "296540a065c8c21b26d63e3cea2d1d57902373b16e4256afe46422691903a438" - -inherit pypi pkgconfig setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-multiprocessing" - -FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/zmq/backend/cython/.debug" - -do_compile_prepend() { - echo [global] > ${S}/setup.cfg - echo zmq_prefix = ${STAGING_DIR_HOST} >> ${S}/setup.cfg - echo have_sys_un_h = True >> ${S}/setup.cfg - echo skip_check_zmq = True >> ${S}/setup.cfg - echo libzmq_extension = False >> ${S}/setup.cfg - echo no_libzmq_extension = True >> ${S}/setup.cfg -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_21.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_21.0.2.bb new file mode 100644 index 000000000..8bde98247 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_21.0.2.bb @@ -0,0 +1,26 @@ +SUMMARY = "Pyzmq provides Zero message queue access for the Python language" +HOMEPAGE = "http://zeromq.org/bindings:python" +LICENSE = "BSD & LGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \ + file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e" +DEPENDS = "zeromq" + +FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyzmq:" + +SRC_URI += "file://club-rpath-out.patch" +SRC_URI[sha256sum] = "098c13c6198913c2a0690235fa74d2e49161755f66b663beaec89651554cc79c" + +inherit pypi pkgconfig setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-multiprocessing" + +FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/zmq/backend/cython/.debug" + +do_compile_prepend() { + echo [global] > ${S}/setup.cfg + echo zmq_prefix = ${STAGING_DIR_HOST} >> ${S}/setup.cfg + echo have_sys_un_h = True >> ${S}/setup.cfg + echo skip_check_zmq = True >> ${S}/setup.cfg + echo libzmq_extension = False >> ${S}/setup.cfg + echo no_libzmq_extension = True >> ${S}/setup.cfg +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.28.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.28.bb deleted file mode 100644 index c3cddd8f1..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.28.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Alternative regular expression module, to replace re." -HOMEPAGE = "https://bitbucket.org/mrabarnett/mrab-regex/src" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=f0a3e4a2554ebb89c046c93d45d8e4bc" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "8150da7f676e73751b4e3c7b1ba79a34" -SRC_URI[sha256sum] = "dd3e6547ecf842a29cf25123fbf8d2461c53c8d37aa20d87ecee130c89b7079b" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.11.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.11.13.bb new file mode 100644 index 000000000..b5f714397 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.11.13.bb @@ -0,0 +1,10 @@ +SUMMARY = "Alternative regular expression module, to replace re." +HOMEPAGE = "https://bitbucket.org/mrabarnett/mrab-regex/src" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=f0a3e4a2554ebb89c046c93d45d8e4bc" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "83d6b356e116ca119db8e7c6fc2983289d87b27b3fac238cfe5dca529d884562" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.6.bb deleted file mode 100644 index d2b108635..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.6.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Pure-Python RSA implementation" -SECTION = "devel/python" -AUTHOR = "Sybren A. Stuvel" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c403f6882d4f97a9cd927df987d55634" - -SRC_URI[md5sum] = "bbf1c954865319bd542600ab07f92aca" -SRC_URI[sha256sum] = "109ea5a66744dd859bf16fe904b8d8b627adafb9408753161e766a92e7d681fa" - -inherit pypi setuptools3 update-alternatives - -ALTERNATIVE_${PN} = "\ - pyrsa-decrypt \ - pyrsa-encrypt \ - pyrsa-keygen \ - pyrsa-priv2pub \ - pyrsa-sign \ - pyrsa-verify \ -" - -ALTERNATIVE_LINK_NAME[pyrsa-decrypt] = "${bindir}/pyrsa-decrypt" -ALTERNATIVE_LINK_NAME[pyrsa-encrypt] = "${bindir}/pyrsa-encrypt" -ALTERNATIVE_LINK_NAME[pyrsa-keygen] = "${bindir}/pyrsa-keygen" -ALTERNATIVE_LINK_NAME[pyrsa-priv2pub] = "${bindir}/pyrsa-priv2pub" -ALTERNATIVE_LINK_NAME[pyrsa-sign] = "${bindir}/pyrsa-sign" -ALTERNATIVE_LINK_NAME[pyrsa-verify] = "${bindir}/pyrsa-verify" -ALTERNATIVE_PRIORITY = "30" - - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-pickle \ -" - -RDEPENDS_${PN} += "${PYTHON_PN}-pyasn1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.7.bb new file mode 100644 index 000000000..c4c36020f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.7.bb @@ -0,0 +1,40 @@ +SUMMARY = "Pure-Python RSA implementation" +SECTION = "devel/python" +AUTHOR = "Sybren A. Stuvel" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c403f6882d4f97a9cd927df987d55634" + +SRC_URI[sha256sum] = "69805d6b69f56eb05b62daea3a7dbd7aa44324ad1306445e05da8060232d00f4" + +inherit pypi setuptools3 update-alternatives + +ALTERNATIVE_${PN} = "\ + pyrsa-decrypt \ + pyrsa-encrypt \ + pyrsa-keygen \ + pyrsa-priv2pub \ + pyrsa-sign \ + pyrsa-verify \ +" + +ALTERNATIVE_LINK_NAME[pyrsa-decrypt] = "${bindir}/pyrsa-decrypt" +ALTERNATIVE_LINK_NAME[pyrsa-encrypt] = "${bindir}/pyrsa-encrypt" +ALTERNATIVE_LINK_NAME[pyrsa-keygen] = "${bindir}/pyrsa-keygen" +ALTERNATIVE_LINK_NAME[pyrsa-priv2pub] = "${bindir}/pyrsa-priv2pub" +ALTERNATIVE_LINK_NAME[pyrsa-sign] = "${bindir}/pyrsa-sign" +ALTERNATIVE_LINK_NAME[pyrsa-verify] = "${bindir}/pyrsa-verify" +ALTERNATIVE_PRIORITY = "30" + + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-pickle \ +" + +RDEPENDS_${PN} += "${PYTHON_PN}-pyasn1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.1.bb index c7b50c21a..89d5008e9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.1.bb @@ -18,7 +18,6 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-resource \ ${PYTHON_PN}-shell \ ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-tests \ ${PYTHON_PN}-threading \ ${PYTHON_PN}-unixadmin \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.0.bb deleted file mode 100644 index 1f6f61137..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Drop-in replacement for smbus-cffi/smbus-python in pure Python" -DESCRIPTION = "smbus2 is a drop-in replacement for smbus-cffi/smbus-python in pure Python" -HOMEPAGE = "https://github.com/kplindegaard/smbus2" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "1b5c690715e1efab39e41038147dfba75afc72a10f76b3f0310d783e9f8a83a6" - -CLEANBROKEN = "1" - -PYPI_PACKAGE = "smbus2" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-fcntl \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.1.bb new file mode 100644 index 000000000..fe0b8d1ef --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "Drop-in replacement for smbus-cffi/smbus-python in pure Python" +DESCRIPTION = "smbus2 is a drop-in replacement for smbus-cffi/smbus-python in pure Python" +HOMEPAGE = "https://github.com/kplindegaard/smbus2" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "6276eb599b76c4e74372f2582d2282f03b4398f0da16bc996608e4f21557ca9b" + +CLEANBROKEN = "1" + +PYPI_PACKAGE = "smbus2" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-fcntl \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.1.bb deleted file mode 100644 index 6b3364943..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Set of i2c tools for linux - Python module" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://smbusmodule.c;beginline=1;endline=18;md5=46e424fb045901ab25e0f92c28c80055" -PR = "r1" - -SRC_URI = "${KERNELORG_MIRROR}/software/utils/i2c-tools/i2c-tools-${PV}.tar.gz " -SRC_URI[md5sum] = "3536237a6b51fb10caacdc3b8a496237" -SRC_URI[sha256sum] = "ef8f77afc70e7dbfd1171bfeae87a8a7f10074829370ce8d9ccd585a014e0073" - -DEPENDS += "i2c-tools" - -S = "${WORKDIR}/i2c-tools-${PV}/py-smbus" -inherit distutils3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.2.bb new file mode 100644 index 000000000..862a547c0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "Set of i2c tools for linux - Python module" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://smbusmodule.c;beginline=1;endline=18;md5=46e424fb045901ab25e0f92c28c80055" +PR = "r1" + +SRC_URI = "${KERNELORG_MIRROR}/software/utils/i2c-tools/i2c-tools-${PV}.tar.gz " +SRC_URI[md5sum] = "d6861c89521f2a2773e19edadb2befee" +SRC_URI[sha256sum] = "7de18ed890e111fa54ab7ea896804d5faa4d1f0462a258aad9fbb7a8cc6b60cc" + +DEPENDS += "i2c-tools" + +S = "${WORKDIR}/i2c-tools-${PV}/py-smbus" +inherit distutils3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.5.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.5.4.bb deleted file mode 100644 index 1836473b8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.5.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Python library for the snappy compression library from Google" -DEPENDS += "snappy" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b3090152f53ee19f6a7b64b1a36384fb" - -SRC_URI[sha256sum] = "d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "python-snappy" - -RDEPENDS_${PN} += "snappy" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.0.bb new file mode 100644 index 000000000..64787feec --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Python library for the snappy compression library from Google" +DEPENDS += "snappy" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b3090152f53ee19f6a7b64b1a36384fb" + +SRC_URI[sha256sum] = "168a98d3f597b633cfeeae7fe1c78a8dfd81f018b866cf7ce9e4c56086af891a" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "python-snappy" + +RDEPENDS_${PN} += "snappy" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_4.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_4.6.0.bb deleted file mode 100644 index 7d96398e9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_4.6.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Socket.IO server" -HOMEPAGE = "https://github.com/miguelgrinberg/python-socketio/" -SECTION = "devel/python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=42d0a9e728978f0eeb759c3be91536b8" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "python-socketio" - -SRC_URI[md5sum] = "44bb7854234e144655ef9c34b0165704" -SRC_URI[sha256sum] = "358d8fbbc029c4538ea25bcaa283e47f375be0017fcba829de8a3a731c9df25a" - -PACKAGECONFIG ?= "asyncio_client client" -PACKAGECONFIG[asyncio_client] = ",,,${PYTHON_PN}-aiohttp ${PYTHON_PN}-websockets" -PACKAGECONFIG[client] = ",,,${PYTHON_PN}-requests ${PYTHON_PN}-websocket-client" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-engineio \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-attrs \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.0.4.bb new file mode 100644 index 000000000..70db342cc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.0.4.bb @@ -0,0 +1,27 @@ +SUMMARY = "Socket.IO server" +HOMEPAGE = "https://github.com/miguelgrinberg/python-socketio/" +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=42d0a9e728978f0eeb759c3be91536b8" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "python-socketio" + +SRC_URI[sha256sum] = "f53fd0d5bd9f75a70492062f4ae6195ab5d34d67a29024d740f25e468392893e" + +PACKAGECONFIG ?= "asyncio_client client" +PACKAGECONFIG[asyncio_client] = ",,,${PYTHON_PN}-aiohttp ${PYTHON_PN}-websockets" +PACKAGECONFIG[client] = ",,,${PYTHON_PN}-requests ${PYTHON_PN}-websocket-client" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-engineio \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-attrs \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typed-ast_1.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typed-ast_1.4.2.bb new file mode 100644 index 000000000..09f387ca6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typed-ast_1.4.2.bb @@ -0,0 +1,12 @@ +SUMMARY = "Modified fork of CPython's ast module that parses `# type:` comments" +HOMEPAGE = "https://github.com/python/typed_ast" +LICENSE = "Apache-2.0 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=97f1494e93daf66a5df47118407a4c4f" + +PYPI_PACKAGE = "typed_ast" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "9fc0b3cb5d1720e7141d103cf4819aea239f7d136acf9ee4a69b047b7986175a" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.1.bb deleted file mode 100644 index 2475306f9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Ultra fast JSON encoder and decoder for Python" -DESCRIPTION = "UltraJSON is an ultra fast JSON encoder and decoder written in pure C with bindings for Python 2.5+ and 3." - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=10fa10456417c0252bcb8a498e498ffe" - -SRC_URI[md5sum] = "c8030a62912c3be18ff99fa5b25258b8" -SRC_URI[sha256sum] = "26cf6241b36ff5ce4539ae687b6b02673109c5e3efc96148806a7873eaa229d3" - -inherit pypi ptest setuptools3 - -SRC_URI += " \ - file://run-ptest \ -" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-numbers \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytz \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.2.bb new file mode 100644 index 000000000..d79206fe6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.2.bb @@ -0,0 +1,31 @@ +SUMMARY = "Ultra fast JSON encoder and decoder for Python" +DESCRIPTION = "UltraJSON is an ultra fast JSON encoder and decoder written in pure C with bindings for Python 2.5+ and 3." + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=10fa10456417c0252bcb8a498e498ffe" + +SRC_URI[sha256sum] = "c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d" + +inherit pypi ptest setuptools3 + +SRC_URI += " \ + file://run-ptest \ +" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-numbers \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytz \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.35.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.35.1.bb deleted file mode 100644 index b4e77ea84..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.35.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "The official binary distribution format for Python " -HOMEPAGE = "https://github.com/pypa/wheel" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=8227180126797a0148f94f483f3e1489" - -SRC_URI[md5sum] = "7ec7c435cc73eefebd9f0af43c120044" -SRC_URI[sha256sum] = "99a22d87add3f634ff917310a3d87e499f19e663413a52eb9232c447aa646c9f" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.36.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.36.2.bb new file mode 100644 index 000000000..9d9a441c0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.36.2.bb @@ -0,0 +1,12 @@ +SUMMARY = "The official binary distribution format for Python " +HOMEPAGE = "https://github.com/pypa/wheel" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=8227180126797a0148f94f483f3e1489" + +SRC_URI[sha256sum] = "e11eefd162658ea59a60a0f6c7d493a7190ea4b9a85e335b33489d9f17e0245e" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.4.2.bb new file mode 100644 index 000000000..055a82d4c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.4.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "The xmlschema library is an implementation of XML Schema for Python (supports Python 3.6+)." +HOMEPAGE = "https://github.com/sissaschool/xmlschema" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=47489cb18c469474afeb259ed1d4832f" + +SRC_URI[sha256sum] = "f372005d08dfc231ce7f001c3a7a2c7f7ae138295349268bc551a9df3c700b82" + +PYPI_PACKAGE = "xmlschema" +inherit pypi setuptools3 + +DEPENDS += "\ + ${PYTHON_PN}-elementpath-native \ +" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-elementpath \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.0.bb deleted file mode 100644 index f87c3fb63..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Yet Another Python Profiler" -HOMEPAGE = "https://github.com/sumerc/yappi" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=71c208c9a4fd864385eb69ad4caa3bee" - -SRC_URI[md5sum] = "6dde41b116566cbe1575e41a1e376f74" -SRC_URI[sha256sum] = "a443240f4a776fa1be04430bf423dbf09615c05eba34f4a2a6af344a7ce8ff61" - -SRC_URI += " \ - file://run-ptest \ -" - -inherit pypi setuptools3 ptest - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-threading \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-profile \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - cp -f ${S}/yappi/yappi.py ${D}/${PTEST_PATH}/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.2.bb new file mode 100644 index 000000000..7c3f0fd4b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.2.bb @@ -0,0 +1,31 @@ +SUMMARY = "Yet Another Python Profiler" +HOMEPAGE = "https://github.com/sumerc/yappi" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=71c208c9a4fd864385eb69ad4caa3bee" + +SRC_URI[sha256sum] = "a51d3e6e5563cc74b5bb82ed6e7bd44a9c1a7eae3d97e4d52e9465edb3a8da8d" + +SRC_URI += " \ + file://run-ptest \ +" + +inherit pypi setuptools3 ptest + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-threading \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-profile \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + cp -f ${S}/yappi/yappi.py ${D}/${PTEST_PATH}/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_5.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_5.1.0.bb deleted file mode 100644 index a66735b8a..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_5.1.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Interface definitions for Zope products" -LICENSE = "ZPL-2.1" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e54fd776274c1b7423ec128974bd9d46" - -PYPI_PACKAGE = "zope.interface" - -inherit pypi setuptools3 -SRC_URI[sha256sum] = "40e4c42bd27ed3c11b2c983fecfb03356fae1209de10686d03c02c8696a1d90e" - -PACKAGES =. "${PN}-test " - -RPROVIDES_${PN} += "zope-interfaces" - -RDEPENDS_${PN}_class-target += "${PYTHON_PN}-datetime" -RDEPENDS_${PN}-test += "python3-unittest python3-doctest" - -FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*.egg/*/*/.debug" -FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/zope/interface/*.c" -FILES_${PN}-doc += "${PYTHON_SITEPACKAGES_DIR}/zope/interface/*.txt" -FILES_${PN}-test += " \ - ${PYTHON_SITEPACKAGES_DIR}/zope/interface/tests \ - ${PYTHON_SITEPACKAGES_DIR}/zope/interface/common/tests \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_5.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_5.2.0.bb new file mode 100644 index 000000000..48bb80d57 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_5.2.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "Interface definitions for Zope products" +LICENSE = "ZPL-2.1" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e54fd776274c1b7423ec128974bd9d46" + +PYPI_PACKAGE = "zope.interface" + +inherit pypi setuptools3 +SRC_URI[sha256sum] = "8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24" + +PACKAGES =. "${PN}-test " + +RPROVIDES_${PN} += "zope-interfaces" + +RDEPENDS_${PN}_class-target += "${PYTHON_PN}-datetime" +RDEPENDS_${PN}-test += "python3-unittest python3-doctest" + +FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*.egg/*/*/.debug" +FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/zope/interface/*.c" +FILES_${PN}-doc += "${PYTHON_SITEPACKAGES_DIR}/zope/interface/*.txt" +FILES_${PN}-test += " \ + ${PYTHON_SITEPACKAGES_DIR}/zope/interface/tests \ + ${PYTHON_SITEPACKAGES_DIR}/zope/interface/common/tests \ +" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_3.7.7.0.bb b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_3.7.7.0.bb deleted file mode 100644 index 38b3c0a4f..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_3.7.7.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "PyEphem astronomical calculations" -HOMEPAGE = "http://rhodesmill.org/pyephem/" - -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=f288303760f6e5ceaafe3aaa32186ab1" - -SRC_URI[md5sum] = "46c035b4a903ff26e0d8ad0f1fe6cc35" -SRC_URI[sha256sum] = "607148429f85412915e32265779c0cf6d09f73aa97cf1ff0d101ac22c69c4436" - -PYPI_PACKAGE = "ephem" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-math \ - " diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_3.7.7.1.bb b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_3.7.7.1.bb new file mode 100644 index 000000000..5949a55fa --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_3.7.7.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "PyEphem astronomical calculations" +HOMEPAGE = "http://rhodesmill.org/pyephem/" + +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=f288303760f6e5ceaafe3aaa32186ab1" + +SRC_URI[sha256sum] = "36b51a8dc7cfdeb456dd6b8ab811accab8341b2d562ee3c6f4c86f6d3dbb984e" + +PYPI_PACKAGE = "ephem" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-math \ + " diff --git a/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.5.0.bb b/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.5.0.bb new file mode 100644 index 000000000..d906c0b9e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.5.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Send file to trash natively under Mac OS X, Windows and Linux" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=05faa35ba1ca10b723f19d286c9d5237" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "60001cc07d707fe247c94f74ca6ac0d3255aabcb930529690897ca2a39db28b2" + +PYPI_PACKAGE = "Send2Trash" diff --git a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.13.bb b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.13.bb deleted file mode 100644 index 01a36e1fc..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.13.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Catfish is a handy file searching tool for linux and unix" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" - -inherit xfce-app distutils3 gtk-icon-cache mime-xdg - -DEPENDS += "python3-distutils-extra-native" - -B = "${S}" - -SRC_URI[md5sum] = "750b65401c9445e185e71c808d7509a4" -SRC_URI[sha256sum] = "58c0ea06e5f286019295545fbfd1dbca23aea74c625762bbb4c89a6f484ae839" - -FILES_${PN} += "${datadir}/metainfo" - -RDEPENDS_${PN} += "python3-pygobject" diff --git a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.0.bb new file mode 100644 index 000000000..f0391cb23 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Catfish is a handy file searching tool for linux and unix" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" + +inherit xfce-app distutils3 gtk-icon-cache mime-xdg + +DEPENDS += "python3-distutils-extra-native" + +SRC_URI[sha256sum] = "1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47" + +FILES_${PN} += "${datadir}/metainfo" + +RDEPENDS_${PN} += "python3-pygobject" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch new file mode 100644 index 000000000..9738f1a8c --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch @@ -0,0 +1,56 @@ +Makefile.in.in: remove bashisms + +The brace expansion is bash specific and fails with dash. + +Upstream-Status: Pending [No permission to folk repo and create pull request] + +https://gitlab.xfce.org/apps/xfce4-panel-profiles + +Signed-off-by: Kai Kang +--- + Makefile.in.in | 15 ++++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in.in b/Makefile.in.in +index 73338f4..e08b218 100644 +--- a/Makefile.in.in ++++ b/Makefile.in.in +@@ -73,8 +73,11 @@ install: all xfce4-panel-profiles.1 + + install -d $(DESTDIR)/$(MANDIR)/man1 + install xfce4-panel-profiles.1 $(DESTDIR)/$(MANDIR)/man1 +- +- install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/{128x128,48x48,16x16,scalable}/apps ++ ++ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps ++ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps ++ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps ++ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps + install data/icons/128x128/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps + install data/icons/48x48/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps + install data/icons/16x16/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps +@@ -86,7 +89,9 @@ uninstall: + rm -rf $(DESTDIR)/$(DOCDIR) + # FIXME: Uninstall locales + rm -f $(DESTDIR)/$(PREFIX)/bin/$(APPNAME) +- rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/{128x128,48x48,16x16}/apps/org.xfce.PanelProfiles.png ++ rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps ++ rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps ++ rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps + rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps/org.xfce.PanelProfiles.svg + + distcheck: all +@@ -106,7 +112,9 @@ clean: + rm -f bin/$(APPNAME) + rm -f data/metainfo/org.xfce.PanelProfiles.appdata.xml + rm -f data/layouts/*.tar.bz2 +- rm -f data/icons/{128x128,48x48,16x16}/org.xfce.panelprofiles.png ++ rm -f data/icons/128x128/org.xfce.panelprofiles.png ++ rm -f data/icons/48x48/org.xfce.panelprofiles.png ++ rm -f data/icons/16x16/org.xfce.panelprofiles.png + rm -f data/icons/scalable/org.xfce.panelprofiles.svg + rm -f org.xfce.PanelProfiles.desktop + rm -f Makefile.in +-- +2.25.1 + diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb index 1fcb7edc0..34162d3cc 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb @@ -11,6 +11,7 @@ DEPENDS += "intltool-native" SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BP}.tar.bz2 \ file://not-create-link-to-locale.patch \ + file://0001-Makefile.in.in-remove-bashisms.patch \ " SRC_URI[sha256sum] = "246e459d2d2f3f524968440ed7fddb2a891567ebc05f10a800f7f5821b3452a7" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb index 9e2497d43..dbd7a0b40 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" SECTION = "x11/application" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" +DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" inherit xfce-app diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch deleted file mode 100644 index 2b5eda0d1..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f39bcd5af79aa3efe2cecb2212793c5b596890a8 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 18 Feb 2016 17:40:45 +0200 -Subject: [PATCH] Makefile.am: use $(LIBTOOL) instead of hardcoded libtool name - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - unique/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/unique/Makefile.am b/unique/Makefile.am -index 6475a87..734f431 100644 ---- a/unique/Makefile.am -+++ b/unique/Makefile.am -@@ -114,7 +114,7 @@ Unique-1.0.gir: $(INTROSPECTION_SCANNER) libunique-1.0.la - --include=GObject-2.0 \ - --include=Gtk-2.0 \ - --library=libunique-1.0.la \ -- --libtool="$(top_builddir)/libtool" \ -+ --libtool="$(LIBTOOL)" \ - --pkg gobject-2.0 \ - --pkg gtk+-2.0 \ - --output $@ \ --- -2.7.0 - diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch deleted file mode 100644 index 7f9fdf397..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 37632aca00d48c53e91f08bc7435c721ba81b2cd Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 30 Mar 2017 14:32:55 -0700 -Subject: [PATCH] test-unique: Add format qualifier %s for string - -Fixes potential security issues that compiler flags - -Signed-off-by: Khem Raj ---- - tests/test-unique.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/test-unique.c b/tests/test-unique.c -index b7cde45..82ee81b 100644 ---- a/tests/test-unique.c -+++ b/tests/test-unique.c -@@ -82,10 +82,10 @@ app_message_cb (UniqueApp *app, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, - GTK_BUTTONS_CLOSE, -- title); -+ "%s",title); - if (message) - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), -- message); -+ "%s",message); - - gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE); - --- -2.12.1 - diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch deleted file mode 100644 index 46a5c62e4..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch +++ /dev/null @@ -1,421 +0,0 @@ -Upstream-Status: Backport [http://git.gnome.org/browse/unique/commit/?h=unique-1.1&id=f75ca2d7aad7d27686acca6090c1c569a79d7e63] -Signed-off-By: Ross Burton - -From f75ca2d7aad7d27686acca6090c1c569a79d7e63 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Sat, 08 May 2010 11:17:21 +0000 -Subject: build: Update the build environment - -Require autoconf 2.63, automake 1.11 and libtool 2.2.6 to remove Shave. - -Also bump up the requirement for gobject-introspection to 0.6.7. ---- -diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am -index 5f35b85..b78428f 100644 ---- a/build/autotools/Makefile.am -+++ b/build/autotools/Makefile.am -@@ -1,7 +1,4 @@ - EXTRA_DIST = \ -- shave-libtool.in \ -- shave.in \ -- shave.m4 \ - as-compiler-flag.m4 \ - introspection.m4 \ - Makefile.am.enums \ -diff --git a/build/autotools/Makefile.am.silent b/build/autotools/Makefile.am.silent -index 249f6af..8576846 100644 ---- a/build/autotools/Makefile.am.silent -+++ b/build/autotools/Makefile.am.silent -@@ -1,10 +1,5 @@ - # custom rules for quiet builds - --if USE_SHAVE --QUIET_GEN = $(Q:@=@echo ' GEN '$@;) --QUIET_LN = $(Q:@=@echo ' LN '$@;) --QUIET_RM = $(Q:@=@echo ' RM '$@;) --else - QUIET_GEN = $(AM_V_GEN) - - QUIET_LN = $(QUIET_LN_$(V)) -@@ -14,4 +9,3 @@ QUIET_LN_0 = @echo ' LN '$@; - QUIET_RM = $(QUIET_RM_$(V)) - QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY)) - QUIET_RM_0 = @echo ' RM '$@; --endif # USE_SHAVE -diff --git a/build/autotools/introspection.m4 b/build/autotools/introspection.m4 -index f9ce49c..589721c 100644 ---- a/build/autotools/introspection.m4 -+++ b/build/autotools/introspection.m4 -@@ -59,12 +59,18 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) -+ AC_SUBST(INTROSPECTION_CFLAGS) -+ AC_SUBST(INTROSPECTION_LIBS) -+ AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") - ]) -diff --git a/build/autotools/shave-libtool.in b/build/autotools/shave-libtool.in -deleted file mode 100644 -index 1f3a720..0000000 ---- a/build/autotools/shave-libtool.in -+++ b/dev/null -@@ -1,69 +0,0 @@ --#!/bin/sh -- --# we need sed --SED=@SED@ --if test -z "$SED" ; then --SED=sed --fi -- --lt_unmangle () --{ -- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` --} -- --# the real libtool to use --LIBTOOL="$1" --shift -- --# if 1, don't print anything, the underlaying wrapper will do it --pass_though=0 -- --# scan the arguments, keep the right ones for libtool, and discover the mode --preserved_args= --while test "$#" -gt 0; do -- opt="$1" -- shift -- -- case $opt in -- --mode=*) -- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` -- preserved_args="$preserved_args $opt" -- ;; -- -o) -- lt_output="$1" -- preserved_args="$preserved_args $opt" -- ;; -- *) -- preserved_args="$preserved_args $opt" -- ;; -- esac --done -- --case "$mode" in --compile) -- # shave will be called and print the actual CC/CXX/LINK line -- preserved_args="$preserved_args --shave-mode=$mode" -- pass_though=1 -- ;; --link) -- preserved_args="$preserved_args --shave-mode=$mode" -- Q=" LINK " -- ;; --*) -- # let's u -- # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" -- ;; --esac -- --lt_unmangle "$lt_output" --output=$last_result -- --if test -z $V; then -- if test $pass_though -eq 0; then -- echo "$Q$output" -- fi -- $LIBTOOL --silent $preserved_args --else -- echo $LIBTOOL $preserved_args -- $LIBTOOL $preserved_args --fi -diff --git a/build/autotools/shave.in b/build/autotools/shave.in -deleted file mode 100644 -index 5c16f27..0000000 ---- a/build/autotools/shave.in -+++ b/dev/null -@@ -1,79 +0,0 @@ --#!/bin/sh -- --# we need sed --SED=@SED@ --if test -z "$SED" ; then --SED=sed --fi -- --lt_unmangle () --{ -- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` --} -- --# the tool to wrap (cc, cxx, ar, ranlib, ..) --tool="$1" --shift -- --# the reel tool (to call) --REEL_TOOL="$1" --shift -- --pass_through=0 --preserved_args= --while test "$#" -gt 0; do -- opt="$1" -- shift -- -- case $opt in -- --shave-mode=*) -- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` -- ;; -- -o) -- lt_output="$1" -- preserved_args="$preserved_args $opt" -- ;; -- *) -- preserved_args="$preserved_args $opt" -- ;; -- esac --done -- --# mode=link is handled in the libtool wrapper --case "$mode,$tool" in --link,*) -- pass_through=1 -- ;; --*,cxx) -- Q=" CXX " -- ;; --*,cc) -- Q=" CC " -- ;; --*,fc) -- Q=" FC " -- ;; --*,f77) -- Q=" F77 " -- ;; --*,objc) -- Q=" OBJC " -- ;; --*,*) -- # should not happen -- Q=" CC " -- ;; --esac -- --lt_unmangle "$lt_output" --output=$last_result -- --if test -z $V; then -- if test $pass_through -eq 0; then -- echo "$Q$output" -- fi -- $REEL_TOOL $preserved_args --else -- echo $REEL_TOOL $preserved_args -- $REEL_TOOL $preserved_args --fi -diff --git a/build/autotools/shave.m4 b/build/autotools/shave.m4 -deleted file mode 100644 -index 0a3509e..0000000 ---- a/build/autotools/shave.m4 -+++ b/dev/null -@@ -1,77 +0,0 @@ --dnl Make automake/libtool output more friendly to humans --dnl Damien Lespiau --dnl --dnl SHAVE_INIT([shavedir],[default_mode]) --dnl --dnl shavedir: the directory where the shave scripts are, it defaults to --dnl $(top_builddir) --dnl default_mode: (enable|disable) default shave mode. This parameter --dnl controls shave's behaviour when no option has been --dnl given to configure. It defaults to disable. --dnl --dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just --dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and --dnl LIBTOOL, you don't want the configure tests to have these variables --dnl re-defined. --dnl * This macro requires GNU make's -s option. -- --AC_DEFUN([_SHAVE_ARG_ENABLE], --[ -- AC_ARG_ENABLE([shave], -- AS_HELP_STRING( -- [--enable-shave], -- [use shave to make the build pretty [[default=$1]]]),, -- [enable_shave=$1] -- ) --]) -- --AC_DEFUN([SHAVE_INIT], --[ -- dnl you can tweak the default value of enable_shave -- m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) -- -- if test x"$enable_shave" = xyes; then -- dnl where can we find the shave scripts? -- m4_if([$1],, -- [shavedir="$ac_pwd"], -- [shavedir="$ac_pwd/$1"]) -- AC_SUBST(shavedir) -- -- dnl make is now quiet -- AC_SUBST([MAKEFLAGS], [-s]) -- AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) -- -- dnl we need sed -- AC_CHECK_PROG(SED,sed,sed,false) -- -- dnl substitute libtool -- SHAVE_SAVED_LIBTOOL=$LIBTOOL -- LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" -- AC_SUBST(LIBTOOL) -- -- dnl substitute cc/cxx -- SHAVE_SAVED_CC=$CC -- SHAVE_SAVED_CXX=$CXX -- SHAVE_SAVED_FC=$FC -- SHAVE_SAVED_F77=$F77 -- SHAVE_SAVED_OBJC=$OBJC -- CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" -- CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" -- FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" -- F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" -- OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" -- AC_SUBST(CC) -- AC_SUBST(CXX) -- AC_SUBST(FC) -- AC_SUBST(F77) -- AC_SUBST(OBJC) -- -- V=@ -- else -- V=1 -- fi -- Q='$(V:1=)' -- AC_SUBST(V) -- AC_SUBST(Q) --]) -- -diff --git a/configure.ac b/configure.ac -index a3ed3ee..bc3163a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,7 @@ m4_define([unique_api_version], [1.0]) - # This is the X.Y used in the protocol negotiation - m4_define([unique_protocol_version], [1.0]) - --AC_PREREQ([2.59]) -+AC_PREREQ([2.63]) - - AC_INIT([unique], [unique_version], - [http://bugzilla.gnome.org/enter_bug.cgi?product=libunique], -@@ -23,9 +23,21 @@ AC_INIT([unique], [unique_version], - AC_CONFIG_SRCDIR([unique/unique.h]) - AC_CONFIG_MACRO_DIR([build/autotools]) - --AM_INIT_AUTOMAKE([1.10]) -+AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability dist-bzip2]) - AM_CONFIG_HEADER([config.h]) - -+AM_SILENT_RULES([yes]) -+ -+AC_PROG_CC_C_O -+ -+AM_PATH_GLIB_2_0 -+ -+LT_PREREQ([2.2.6]) -+LT_INIT([disable-static]) -+ -+# Honor aclocal flags -+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -+ - # version symbols - UNIQUE_MAJOR_VERSION=unique_major_version - UNIQUE_MINOR_VERSION=unique_minor_version -@@ -49,21 +61,6 @@ UNIQUE_LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age) - AC_SUBST(UNIQUE_LT_VERSION_INFO) - AC_SUBST(UNIQUE_LT_CURRENT_MINUS_AGE) - --AC_ISC_POSIX --AC_PROG_CC --AC_PROG_INSTALL --AC_PROG_MAKE_SET --AC_C_CONST --AC_PROG_LIBTOOL --AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums]) --AC_PATH_PROG(GLIB_GENMARSHAL, [glib-genmarshal]) -- --AM_SANITY_CHECK --AM_PROG_CC_STDC -- --# Honor aclocal flags --ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -- - m4_define([glib_required], [2.12.0]) - m4_define([gtk_required], [2.11.0]) - m4_define([dbus_required], [0.70]) -@@ -122,7 +119,6 @@ AM_CONDITIONAL([HAVE_DBUS], [test "x$have_dbus" = "xyes"]) - dnl Bacon backend - dnl This is the fallback backend, so we *need* these headers and functions - dnl even if we end up using D-Bus --dnl D-Bus backend dependencies - m4_define([have_bacon_default], [yes]) - AC_ARG_ENABLE([bacon], - [AC_HELP_STRING([--enable-bacon=@<:@yes/no@:>@], -@@ -178,9 +174,9 @@ AC_ARG_ENABLE([maintainer-flags], - AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"], - [ - AS_COMPILER_FLAGS([MAINTAINER_CFLAGS], -- ["-Werror -Wall -Wshadow -Wcast-align -- -Wno-uninitialized -Wempty-body -Wformat-security -- -Winit-self"]) -+ ["-Wall -Wshadow -Wcast-align -+ -Wno-uninitialized -Wempty-body -+ -Wformat-security -Winit-self"]) - ] - ) - -@@ -230,27 +226,10 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], - AM_GLIB_DEFINE_LOCALEDIR(UNIQUE_LOCALEDIR) - - # introspection --GOBJECT_INTROSPECTION_CHECK([0.6.3]) -+GOBJECT_INTROSPECTION_CHECK([0.6.7]) - - # gtk-doc --GTK_DOC_CHECK([1.11]) -- --# nice builds --m4_ifdef([AM_SILENT_RULES], -- [ -- AM_SILENT_RULES([yes]) -- use_shave=no -- ], -- [ -- SHAVE_INIT([build/autotools], [enable]) -- AC_CONFIG_FILES([ -- build/autotools/shave-libtool -- build/autotools/shave -- ]) -- use_shave=yes -- ]) -- --AM_CONDITIONAL([USE_SHAVE], [test "x$use_shave" = "xyes"]) -+GTK_DOC_CHECK([1.13]) - - AC_CONFIG_FILES([ - Makefile --- -cgit v0.9.0.2 diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch deleted file mode 100644 index d75de93fc..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Pending - -Fix Following compilation errors with gcc 4.6.0 - -Nitin A Kamble 2011/05/10 - -| uniquebackend-dbus.c: In function 'unique_backend_dbus_request_name': -| uniquebackend-dbus.c:87:22: error: variable 'backend_dbus' set but not used [-Werror=unused-but-set-variable] -| uniquebackend-dbus.c: In function 'unique_backend_dbus_send_message': -| uniquebackend-dbus.c:189:12: error: variable 'res' set but not used [-Werror=unused-but-set-variable] -| cc1: all warnings being treated as errors -| -| make[5]: *** [libunique_dbus_la-uniquebackend-dbus.lo] Error 1 - -Index: libunique-1.1.6/unique/dbus/uniquebackend-dbus.c -=================================================================== ---- libunique-1.1.6.orig/unique/dbus/uniquebackend-dbus.c -+++ libunique-1.1.6/unique/dbus/uniquebackend-dbus.c -@@ -84,7 +84,7 @@ unique_backend_dbus_register_proxy (Uniq - static gboolean - unique_backend_dbus_request_name (UniqueBackend *backend) - { -- UniqueBackendDBus *backend_dbus; -+ UniqueBackendDBus __attribute__((__unused__)) *backend_dbus; - const gchar *name; - DBusGConnection *connection; - DBusGProxy *proxy; -@@ -186,7 +186,7 @@ unique_backend_dbus_send_message (Unique - GValueArray *data; - gchar *cmd; - gchar *resp; -- gboolean res; -+ gboolean __attribute__((__unused__)) res; - GError *error; - UniqueResponse response; - diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch deleted file mode 100644 index 2cc03473c..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch +++ /dev/null @@ -1,130 +0,0 @@ -G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid -build failures. - -RP 2011/10/12 - -Upstream-Status: Pending - -Index: libunique-1.1.6/unique/uniqueapp.c -=================================================================== ---- libunique-1.1.6.orig/unique/uniqueapp.c 2011-10-12 01:21:25.842046488 +0100 -+++ libunique-1.1.6/unique/uniqueapp.c 2011-10-12 01:21:55.062046796 +0100 -@@ -781,7 +781,7 @@ - } - - --G_CONST_RETURN gchar * -+const gchar * - unique_command_to_string (UniqueApp *app, - gint command) - { -@@ -863,7 +863,7 @@ - return retval; - } - --G_CONST_RETURN gchar * -+const gchar * - unique_response_to_string (UniqueResponse response) - { - GEnumClass *enum_class; -Index: libunique-1.1.6/unique/uniquebackend.c -=================================================================== ---- libunique-1.1.6.orig/unique/uniquebackend.c 2011-10-12 01:21:25.742046323 +0100 -+++ libunique-1.1.6/unique/uniquebackend.c 2011-10-12 01:21:55.062046796 +0100 -@@ -111,7 +111,7 @@ - * - * Return value: FIXME - */ --G_CONST_RETURN gchar * -+const gchar * - unique_backend_get_name (UniqueBackend *backend) - { - g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); -@@ -154,7 +154,7 @@ - * - * Return value: FIXME - */ --G_CONST_RETURN gchar * -+const gchar * - unique_backend_get_startup_id (UniqueBackend *backend) - { - g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); -Index: libunique-1.1.6/unique/uniquebackend.h -=================================================================== ---- libunique-1.1.6.orig/unique/uniquebackend.h 2011-10-12 01:21:25.992046521 +0100 -+++ libunique-1.1.6/unique/uniquebackend.h 2011-10-12 01:21:56.512047875 +0100 -@@ -94,10 +94,10 @@ - - UniqueBackend * unique_backend_create (void); - --G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); -+const gchar *unique_backend_get_name (UniqueBackend *backend); - void unique_backend_set_name (UniqueBackend *backend, - const gchar *name); --G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); -+const gchar *unique_backend_get_startup_id (UniqueBackend *backend); - void unique_backend_set_startup_id (UniqueBackend *backend, - const gchar *startup_id); - GdkScreen * unique_backend_get_screen (UniqueBackend *backend); -Index: libunique-1.1.6/unique/uniqueinternals.h -=================================================================== ---- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-10-12 01:21:25.892046532 +0100 -+++ libunique-1.1.6/unique/uniqueinternals.h 2011-10-12 01:21:56.512047875 +0100 -@@ -44,11 +44,11 @@ - * and then back into an id - */ - UniqueResponse unique_response_from_string (const gchar *response); --G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); -+const gchar *unique_response_to_string (UniqueResponse response); - - gint unique_command_from_string (UniqueApp *app, - const gchar *command); --G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, -+const gchar *unique_command_to_string (UniqueApp *app, - gint command); - - G_END_DECLS -Index: libunique-1.1.6/unique/uniquemessage.c -=================================================================== ---- libunique-1.1.6.orig/unique/uniquemessage.c 2011-10-12 01:21:25.942046524 +0100 -+++ libunique-1.1.6/unique/uniquemessage.c 2011-10-12 01:21:55.072046595 +0100 -@@ -185,7 +185,7 @@ - * - * Since: 1.0.2 - */ --G_CONST_RETURN guchar * -+const guchar * - unique_message_data_get (UniqueMessageData *message_data, - gsize *length) - { -@@ -525,7 +525,7 @@ - * owned by the #UniqueMessageData structure and should not be - * modified or freed - */ --G_CONST_RETURN gchar * -+const gchar * - unique_message_data_get_startup_id (UniqueMessageData *message_data) - { - g_return_val_if_fail (message_data != NULL, NULL); -Index: libunique-1.1.6/unique/uniquemessage.h -=================================================================== ---- libunique-1.1.6.orig/unique/uniquemessage.h 2011-10-12 01:21:25.792046596 +0100 -+++ libunique-1.1.6/unique/uniquemessage.h 2011-10-12 01:21:56.512047875 +0100 -@@ -48,7 +48,7 @@ - void unique_message_data_set (UniqueMessageData *message_data, - const guchar *data, - gsize length); --G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, -+const guchar *unique_message_data_get (UniqueMessageData *message_data, - gsize *length); - - gboolean unique_message_data_set_text (UniqueMessageData *message_data, -@@ -63,7 +63,7 @@ - gchar * unique_message_data_get_filename (UniqueMessageData *message_data); - - GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); --G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); -+const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); - guint unique_message_data_get_workspace (UniqueMessageData *message_data); - - G_END_DECLS diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb deleted file mode 100644 index a6d335a2e..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Library for supporting single instance GTK+ applications" -DESCRIPTION = "Unique is a library for writing single instance GTK+ applications. If you launch a single instance application twice, the second instance will either just quit or will send a message to the running instance." -HOMEPAGE = "https://wiki.gnome.org/Attic/LibUnique" -BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique" - -SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \ - file://fix_for_compile_with_gcc-4.6.0.patch \ - file://noconst.patch \ - file://build.patch \ - file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ - file://0001-test-unique-Add-format-qualifier-s-for-string.patch \ - " - -SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" -SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" - -PR = "r7" - -DEPENDS = "dbus-glib-native glib-2.0 gtk+" - -PACKAGECONFIG ??= "dbus" -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - - -inherit autotools pkgconfig gobject-introspection features_check gtk-doc - -REQUIRED_DISTRO_FEATURES = "x11" - -do_install_append () { - rmdir --ignore-fail-on-non-empty ${D}${datadir} -} diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.5.bb b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.5.bb deleted file mode 100644 index f55b19459..000000000 --- a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.5.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Parole is a modern simple media player based on the GStreamer framework" -HOMEPAGE = "https://docs.xfce.org/apps/parole/start" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit xfce-app gtk-doc mime mime-xdg - -DEPENDS += " \ - dbus-glib \ - xfce4-dev-tools-native \ - libxfce4util \ - libxfce4ui \ - xfconf \ - \ - gstreamer1.0-plugins-base \ - taglib \ -" - -SRC_URI[md5sum] = "74fcde5da018c011e5febd9649817c05" -SRC_URI[sha256sum] = "1adb4bd96c4cc4b4a79eeafe1316e170f506426e3737e8ba8898f7ea6bec572a" - -RDEPENDS_${PN} += "gstreamer1.0-plugins-good" - -EXTRA_OECONF = "--disable-gtk-doc" - -PACKAGECONFIG ??= "notify" -PACKAGECONFIG[clutter] = "--enable-clutter, --disable-clutter, clutter" -PACKAGECONFIG[notify] = "--enable-notify-plugin, --disable-notify-plugin, libnotify" - -FILES_${PN} += " \ - ${datadir}/metainfo \ - ${libdir}/parole-0/*.so \ -" diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_4.16.0.bb new file mode 100644 index 000000000..136e3baa5 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_4.16.0.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Parole is a modern simple media player based on the GStreamer framework" +HOMEPAGE = "https://docs.xfce.org/apps/parole/start" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-app gtk-doc mime mime-xdg + +DEPENDS += " \ + dbus-glib \ + xfce4-dev-tools-native \ + libxfce4util \ + libxfce4ui \ + xfconf \ + \ + gstreamer1.0-plugins-base \ + taglib \ +" + +SRC_URI[sha256sum] = "0d305ad8ccd3974d6b632f74325b1b8a39304c905c6b405b70f52c4cfd55a7e7" + +RDEPENDS_${PN} += "gstreamer1.0-plugins-good" + +EXTRA_OECONF = "--disable-gtk-doc" + +PACKAGECONFIG ??= "notify" +PACKAGECONFIG[clutter] = "--enable-clutter, --disable-clutter, clutter" +PACKAGECONFIG[notify] = "--enable-notify-plugin, --disable-notify-plugin, libnotify" + +FILES_${PN} += " \ + ${datadir}/metainfo \ + ${libdir}/parole-0/*.so \ +" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb deleted file mode 100644 index 6077fdfc6..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "An alternate menu for the Xfce desktop environment" -HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit xfce-panel-plugin cmake - -SRC_URI[sha256sum] = "b2074f8a9caa766e2d97f0b960ef2f4d1e20dd804497229bc1f0157791896925" - -RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.2.bb new file mode 100644 index 000000000..366597731 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.2.bb @@ -0,0 +1,10 @@ +SUMMARY = "An alternate menu for the Xfce desktop environment" +HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin cmake + +SRC_URI[sha256sum] = "a6f7070afd1c9020257d8ed7483872643a6cddd76d5d73de107c7fbd981fc515" + +RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb deleted file mode 100644 index bbaa6fd6f..000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Xfce Menu Library" -SECTION = "x11/libs" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" -DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" - -inherit xfce gtk-doc gobject-introspection features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" -SRC_URI[sha256sum] = "4811d89ee5bc48dbdeffd69fc3eec6c112bbf01fde98a9e848335b374a4aa1bb" - -EXTRA_OECONF = "--disable-gtk-doc" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/garcon/.libs" -} - -FILES_${PN} += "${datadir}/desktop-directories" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb new file mode 100644 index 000000000..3e596323d --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Xfce Menu Library" +SECTION = "x11/libs" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" +DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" + +inherit xfce gtk-doc gobject-introspection features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" +SRC_URI[sha256sum] = "84914927a2c1fda167f67af26a6640630a744a22940df508aa6c752cdbd3d21d" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/garcon/.libs" +} + +FILES_${PN} += "${datadir}/desktop-directories" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch deleted file mode 100644 index 616142761..000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 708e59caaf1c0c271a96a4d1fe46b122aff45e34 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 27 Aug 2012 09:16:29 +0200 -Subject: [PATCH] libxfce4kbd-private/xfce4-keyboard-shortcuts.xml: fix xfwm4 - crash on first start -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending -Signed-off-by: Andreas Müller - ---- - libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -index 723a10d..e6502f3 100644 ---- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -+++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -@@ -75,4 +75,8 @@ - - - -+ -+ -+ -+ - --- -1.7.6.5 - diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch new file mode 100644 index 000000000..616142761 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch @@ -0,0 +1,32 @@ +From 708e59caaf1c0c271a96a4d1fe46b122aff45e34 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 27 Aug 2012 09:16:29 +0200 +Subject: [PATCH] libxfce4kbd-private/xfce4-keyboard-shortcuts.xml: fix xfwm4 + crash on first start +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending +Signed-off-by: Andreas Müller + +--- + libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +index 723a10d..e6502f3 100644 +--- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml ++++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +@@ -75,4 +75,8 @@ + + + ++ ++ ++ ++ + +-- +1.7.6.5 + diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch new file mode 100644 index 000000000..cd6ca32d0 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch @@ -0,0 +1,44 @@ +From fb7bd8511d55cf0d24f6f93768f51773cf434a59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 8 Jan 2021 21:59:45 +0100 +Subject: [PATCH] Remove GTK2 leftovers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It seems that these cause install performed twice causing natsy races - +see [1] and search for 'TOPDIR/build/tmpfs/hosttools/install -c -m 644 +../../libxfce4ui-4.16.0/libxfce4ui/libxfce4ui.h' + +[1] https://errors.yoctoproject.org/Errors/Details/540832/ + +Upstream-Status: Submitted [https://gitlab.xfce.org/xfce/libxfce4ui/-/merge_requests/29] + +Signed-off-by: Andreas Müller +--- + libxfce4ui/Makefile.am | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am +index 935eece..bc5afac 100644 +--- a/libxfce4ui/Makefile.am ++++ b/libxfce4ui/Makefile.am +@@ -51,15 +51,6 @@ libxfce4ui_sources = \ + xfce-filename-input.c \ + xfce-titled-dialog.c + +-libxfce4ui_includedir = \ +- $(includedir)/xfce4/libxfce4ui-$(LIBXFCE4UI_VERSION_API)/libxfce4ui +- +-libxfce4ui_include_HEADERS = \ +- $(libxfce4ui_headers) +- +- +- +- + ## + ## GTK+ 3 support library + ## +-- +2.26.2 + diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb index 7a269ad66..6fbf1cf25 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb @@ -8,8 +8,11 @@ inherit xfce gtk-doc gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "x11" -# TODO: Check if this can go -SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" +# TODO: Check if 0001-... can go +SRC_URI += " \ + file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ + file://0002-Remove-GTK2-leftovers.patch \ +" SRC_URI[sha256sum] = "8b06c9e94f4be88a9d87c47592411b6cbc32073e7af9cbd64c7b2924ec90ceaa" EXTRA_OECONF += "--with-vendor-info=${DISTRO}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb deleted file mode 100644 index ae05f867f..000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "File manager for the Xfce Desktop Environment" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo gdk-pixbuf libxfce4ui libsm startup-notification libnotify xfce4-panel udev" - -inherit xfce gobject-introspection features_check mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[sha256sum] = "6277c448116a91ebfa564972645d8d79ef69864992a02bb164b7b13f98fdfd9b" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" - -FILES_${PN} += " \ - ${libdir}/thunarx-3/* \ - ${libdir}/xfce4/panel/plugins/* \ - ${libdir}/Thunar/[Tt]hunar* \ - ${systemd_user_unitdir} \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/polkit-1 \ - ${datadir}/Thunar \ - ${datadir}/xfce4/panel/plugins/* \ -" - -RRECOMMENDS_${PN} = "gvfs gvfsd-trash" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb new file mode 100644 index 000000000..6b1a6b482 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb @@ -0,0 +1,28 @@ +SUMMARY = "File manager for the Xfce Desktop Environment" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "exo gdk-pixbuf libxfce4ui libsm startup-notification libnotify xfce4-panel udev" + +inherit xfce gobject-introspection features_check mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "67a90b98c436192f9aa6cd18a22a089e713007864aebfa65f36f121c86ba7add" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" + +FILES_${PN} += " \ + ${libdir}/thunarx-3/* \ + ${libdir}/xfce4/panel/plugins/* \ + ${libdir}/Thunar/[Tt]hunar* \ + ${systemd_user_unitdir} \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/polkit-1 \ + ${datadir}/Thunar \ + ${datadir}/xfce4/panel/plugins/* \ +" + +RRECOMMENDS_${PN} = "gvfs gvfsd-trash" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb deleted file mode 100644 index 3f64365f0..000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Xfce4 Window Manager" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama" - -inherit xfce update-alternatives features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[sha256sum] = "1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3" - -PACKAGECONFIG ?= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ - xpresent \ - startup-notification \ -" - -PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy" -PACKAGECONFIG[xpresent] = "--enable-xpresent,--disable-xpresent,libxpresent" -PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" - -python populate_packages_prepend () { - themedir = d.expand('${datadir}/themes') - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} - -PACKAGES_DYNAMIC += "^xfwm4-theme-.*" - -ALTERNATIVE_${PN} = "x-window-manager" -ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" -ALTERNATIVE_PRIORITY[x-window-manager] = "30" - -RDEPENDS_${PN} = "xfwm4-theme-default" -FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ - ${datadir}/xfwm4/defaults \ -" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb new file mode 100644 index 000000000..2cbfdadd5 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Xfce4 Window Manager" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama" + +inherit xfce update-alternatives features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "b5b24ca04bd73c642db0a4b4df81d262381d758f01b51108257d48b391b8718c" + +PACKAGECONFIG ?= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ + xpresent \ + startup-notification \ +" + +PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy" +PACKAGECONFIG[xpresent] = "--enable-xpresent,--disable-xpresent,libxpresent" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" + +python populate_packages_prepend () { + themedir = d.expand('${datadir}/themes') + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +PACKAGES_DYNAMIC += "^xfwm4-theme-.*" + +ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" +ALTERNATIVE_PRIORITY[x-window-manager] = "30" + +RDEPENDS_${PN} = "xfwm4-theme-default" +FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ + ${datadir}/xfwm4/defaults \ +" -- cgit v1.2.3 From cf285424e1a4e22535a3fc1259f78252be1709d2 Mon Sep 17 00:00:00 2001 From: Ryan Sie Date: Wed, 27 Jan 2021 13:43:03 +0800 Subject: Initial commit to support Supermicro X11SPI platform Signed-off-by: Ryan Sie Change-Id: I7b69a9315a709e296eacd949c8226ac83ba09466 --- meta-supermicro/COPYING.MIT | 17 ++ meta-supermicro/COPYING.apache-2.0 | 175 ++++++++++++++++ meta-supermicro/LICENSE | 12 ++ meta-supermicro/MAINTAINERS | 47 +++++ meta-supermicro/conf/layer.conf | 11 + .../conf/machine/include/supermicro.inc | 22 ++ .../recipes-kernel/linux/linux-aspeed/smci.cfg | 83 ++++++++ .../recipes-kernel/linux/linux-aspeed_%.bbappend | 3 + .../packagegroups/packagegroup-supermicro-apps.bb | 46 +++++ .../meta-x11spi/conf/bblayers.conf.sample | 20 ++ meta-supermicro/meta-x11spi/conf/conf-notes.txt | 4 + meta-supermicro/meta-x11spi/conf/layer.conf | 11 + meta-supermicro/meta-x11spi/conf/local.conf.sample | 223 +++++++++++++++++++++ .../meta-x11spi/conf/machine/x11spi.conf | 12 ++ 14 files changed, 686 insertions(+) create mode 100644 meta-supermicro/COPYING.MIT create mode 100644 meta-supermicro/COPYING.apache-2.0 create mode 100644 meta-supermicro/LICENSE create mode 100644 meta-supermicro/MAINTAINERS create mode 100644 meta-supermicro/conf/layer.conf create mode 100644 meta-supermicro/conf/machine/include/supermicro.inc create mode 100644 meta-supermicro/meta-common/recipes-kernel/linux/linux-aspeed/smci.cfg create mode 100644 meta-supermicro/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend create mode 100644 meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb create mode 100644 meta-supermicro/meta-x11spi/conf/bblayers.conf.sample create mode 100644 meta-supermicro/meta-x11spi/conf/conf-notes.txt create mode 100644 meta-supermicro/meta-x11spi/conf/layer.conf create mode 100644 meta-supermicro/meta-x11spi/conf/local.conf.sample create mode 100644 meta-supermicro/meta-x11spi/conf/machine/x11spi.conf diff --git a/meta-supermicro/COPYING.MIT b/meta-supermicro/COPYING.MIT new file mode 100644 index 000000000..89de35479 --- /dev/null +++ b/meta-supermicro/COPYING.MIT @@ -0,0 +1,17 @@ +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 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. diff --git a/meta-supermicro/COPYING.apache-2.0 b/meta-supermicro/COPYING.apache-2.0 new file mode 100644 index 000000000..67db85882 --- /dev/null +++ b/meta-supermicro/COPYING.apache-2.0 @@ -0,0 +1,175 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. diff --git a/meta-supermicro/LICENSE b/meta-supermicro/LICENSE new file mode 100644 index 000000000..67570ae61 --- /dev/null +++ b/meta-supermicro/LICENSE @@ -0,0 +1,12 @@ +Different components of meta-supermicro are under different licenses (a mix +of MIT and Apache-2.0). Please see: + +COPYING.Apache-2.0 +COPYING.MIT (MIT) + +All metadata is MIT licensed unless otherwise stated. Source code +included in tree for individual recipes is under the LICENSE stated in +the associated recipe (.bb file) unless otherwise stated. + +License information for any other files is either explicitly stated +or defaults to Apache-2.0. diff --git a/meta-supermicro/MAINTAINERS b/meta-supermicro/MAINTAINERS new file mode 100644 index 000000000..27d89886b --- /dev/null +++ b/meta-supermicro/MAINTAINERS @@ -0,0 +1,47 @@ +How to use this list: + Find the most specific section entry (described below) that matches where + your change lives and add the reviewers (R) and maintainers (M) as + reviewers. You can use the same method to track down who knows a particular + code base best. + + Your change/query may span multiple entries; that is okay. + + If you do not find an entry that describes your request at all, someone + forgot to update this list; please at least file an issue or send an email + to a maintainer, but preferably you should just update this document. + +Description of section entries: + + Section entries are structured according to the following scheme: + + X: NAME + X: ... + . + . + . + + Where REPO_NAME is the name of the repository within the OpenBMC GitHub + organization; FILE_PATH is a file path within the repository, possibly with + wildcards; X is a tag of one of the following types: + + M: Denotes maintainer; has fields NAME ; + if omitted from an entry, assume one of the maintainers from the + MAINTAINERS entry. + R: Denotes reviewer; has fields NAME ; + these people are to be added as reviewers for a change matching the repo + path. + F: Denotes forked from an external repository; has fields URL. + + Line comments are to be denoted "# SOME COMMENT" (typical shell style + comment); it is important to follow the correct syntax and semantics as we + may want to use automated tools with this file in the future. + + A change cannot be added to an OpenBMC repository without a MAINTAINER's + approval; thus, a MAINTAINER should always be listed as a reviewer. + +START OF MAINTAINERS LIST +------------------------- + +M: Ryan Sie +M: Ryan Zhou +M: Kevin Cheng diff --git a/meta-supermicro/conf/layer.conf b/meta-supermicro/conf/layer.conf new file mode 100644 index 000000000..23b7406ba --- /dev/null +++ b/meta-supermicro/conf/layer.conf @@ -0,0 +1,11 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ + ${LAYERDIR}/meta-common/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "supermicro-layer" +BBFILE_PATTERN_supermicro-layer := "^${LAYERDIR}/" +LAYERSERIES_COMPAT_supermicro-layer := "dunfell gatesgarth" + diff --git a/meta-supermicro/conf/machine/include/supermicro.inc b/meta-supermicro/conf/machine/include/supermicro.inc new file mode 100644 index 000000000..f7f37be98 --- /dev/null +++ b/meta-supermicro/conf/machine/include/supermicro.inc @@ -0,0 +1,22 @@ +OBMC_MACHINE_FEATURES += "\ + obmc-bmc-state-mgmt \ + obmc-chassis-state-mgmt \ + obmc-host-ipmi \ + obmc-host-state-mgmt \ + obmc-phosphor-chassis-mgmt \ + obmc-phosphor-fan-mgmt \ + obmc-phosphor-flash-mgmt \ + " + +VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" +VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" +VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" + +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-supermicro-apps" +PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-supermicro-apps" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-supermicro-apps" +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" +PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-supermicro-apps" + +OVERRIDES .= ":supermicro" diff --git a/meta-supermicro/meta-common/recipes-kernel/linux/linux-aspeed/smci.cfg b/meta-supermicro/meta-common/recipes-kernel/linux/linux-aspeed/smci.cfg new file mode 100644 index 000000000..d566e2d6d --- /dev/null +++ b/meta-supermicro/meta-common/recipes-kernel/linux/linux-aspeed/smci.cfg @@ -0,0 +1,83 @@ +CONFIG_BLK_DEV_RAM=y +CONFIG_HWMON=y +CONFIG_SPI=y +CONFIG_SPI_MASTER=y +CONFIG_IIO=y +CONFIG_SENSORS_IIO_HWMON=y +CONFIG_ASPEED_ADC=y +CONFIG_SGPIO_ASPEED=y +CONFIG_CRC8=y +CONFIG_PECI=y +CONFIG_PECI_CHARDEV=y +CONFIG_PECI_ASPEED=y +CONFIG_SENSORS_PECI_CPUTEMP=y +CONFIG_SENSORS_PECI_DIMMTEMP=y +CONFIG_SENSORS_PECI_CPUPOWER=y +CONFIG_SENSORS_PECI_DIMMPOWER=y +CONFIG_SENSORS_PECI_PLATFORMPOWER=y +CONFIG_CONFIGFS_FS=y +CONFIG_BLK_DEV_RAM_SIZE=49152 +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_ASPEED_ESPI_SLAVE=y +CONFIG_ASPEED_KCS_IPMI_BMC=y +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_MQUEUE=y +CONFIG_I2C_SLAVE_MQUEUE_MESSAGE_SIZE=256 +CONFIG_I2C_SLAVE_MQUEUE_QUEUE_SIZE=32 +CONFIG_ASPEED_BT_IPMI_BMC=n +CONFIG_ASPEED_LPC_CTRL=n +CONFIG_ASPEED_LPC_MBOX=y +CONFIG_ASPEED_LPC_SIO=y +CONFIG_JTAG=y +CONFIG_JTAG_ASPEED=y +CONFIG_FRAME_VECTOR=y +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_ASPEED=y +CONFIG_VIDEOBUF2_CORE=y +CONFIG_VIDEOBUF2_V4L2=y +CONFIG_VIDEOBUF2_MEMOPS=y +CONFIG_VIDEOBUF2_DMA_CONTIG=y +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +CONFIG_USB_LIBCOMPOSITE=y +CONFIG_USB_F_HID=y +CONFIG_USB_GADGET=y +CONFIG_U_SERIAL_CONSOLE=y +CONFIG_USB_ASPEED_VHUB=y +CONFIG_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_ASPEED_UART_ROUTING=y +CONFIG_ASPEED_VGA_SHAREDMEM=y +CONFIG_PWM=y +CONFIG_PWM_FTTMR010=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PWM_BEEPER=y +CONFIG_VFAT_FS=y +CONFIG_NLS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_UTF8=y +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_CIFS=y +CONFIG_CIFS_XATTR=y +CONFIG_PSTORE=y +CONFIG_PSTORE_ZLIB_COMPRESS=y +CONFIG_PSTORE_RAM=y +CONFIG_FSI=n +CONFIG_FSI_MASTER_HUB=n +CONFIG_FSI_MASTER_ASPEED=n +CONFIG_FSI_SCOM=n +CONFIG_FSI_SBEFIFO=n +CONFIG_FSI_OCC=n +CONFIG_ASPEED_P2A_CTRL=n +CONFIG_IPMB_DEVICE_INTERFACE=y diff --git a/meta-supermicro/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-supermicro/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..540aadcad --- /dev/null +++ b/meta-supermicro/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " file://smci.cfg" diff --git a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb new file mode 100644 index 000000000..2373cec9f --- /dev/null +++ b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb @@ -0,0 +1,46 @@ +SUMMARY = "OpenBMC for Supermicro - Applications" +PR = "r1" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = " \ + ${PN}-chassis \ + ${PN}-fans \ + ${PN}-flash \ + ${PN}-system \ + " + +PROVIDES += "virtual/obmc-chassis-mgmt" +PROVIDES += "virtual/obmc-fan-mgmt" +PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" + +RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" + +SUMMARY_${PN}-chassis = "Supermicro Chassis" +RDEPENDS_${PN}-chassis = " \ + x86-power-control \ + " + +SUMMARY_${PN}-fans = "Supermicro Fans" +RDEPENDS_${PN}-fans = " \ + phosphor-pid-control \ + " + +SUMMARY_${PN}-flash = "Supermicro Flash" +RDEPENDS_${PN}-flash = " \ + phosphor-software-manager \ + " + +SUMMARY_${PN}-system = "Supermicro System" +RDEPENDS_${PN}-system = " \ + bmcweb \ + entity-manager \ + dbus-sensors \ + phosphor-webui \ + ipmitool \ + " diff --git a/meta-supermicro/meta-x11spi/conf/bblayers.conf.sample b/meta-supermicro/meta-x11spi/conf/bblayers.conf.sample new file mode 100644 index 000000000..fc7b62316 --- /dev/null +++ b/meta-supermicro/meta-x11spi/conf/bblayers.conf.sample @@ -0,0 +1,20 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-supermicro \ + ##OEROOT##/meta-supermicro/meta-x11spi \ +" diff --git a/meta-supermicro/meta-x11spi/conf/conf-notes.txt b/meta-supermicro/meta-x11spi/conf/conf-notes.txt new file mode 100644 index 000000000..5314bf4e6 --- /dev/null +++ b/meta-supermicro/meta-x11spi/conf/conf-notes.txt @@ -0,0 +1,4 @@ +Common targets are: + obmc-phosphor-image + virtual/kernel + phosphor-ipmi-host diff --git a/meta-supermicro/meta-x11spi/conf/layer.conf b/meta-supermicro/meta-x11spi/conf/layer.conf new file mode 100644 index 000000000..86e0a91d6 --- /dev/null +++ b/meta-supermicro/meta-x11spi/conf/layer.conf @@ -0,0 +1,11 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "x11spi" +BBFILE_PATTERN_x11spi = "" + +LAYERSERIES_COMPAT_x11spi = "dunfell gatesgarth" diff --git a/meta-supermicro/meta-x11spi/conf/local.conf.sample b/meta-supermicro/meta-x11spi/conf/local.conf.sample new file mode 100644 index 000000000..17c9945bf --- /dev/null +++ b/meta-supermicro/meta-x11spi/conf/local.conf.sample @@ -0,0 +1,223 @@ +# +# This file is your local configuration file and is where all local user settings +# are placed. The comments in this file give some guide to the options a new user +# to the system might want to change but pretty much any configuration option can +# be set in this file. +# +# Lines starting with the '#' character are commented out and in some cases the +# default values are provided as comments to show people example syntax. Enabling +# the option is a question of removing the # character and making any change to the +# variable as required. + +# +# Machine Selection +# +MACHINE ??= "x11spi" + +# +# Where to place downloads +# +# During a first build the system will download many different source code tarballs +# from various upstream projects. This can take a while, particularly if your network +# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you +# can preserve this directory to speed up this part of subsequent builds. This directory +# is safe to share between multiple builds on the same machine too. +# +# The default is a downloads directory under TOPDIR which is the build directory. +# +#DL_DIR ?= "${TOPDIR}/downloads" + +# +# Where to place shared-state files +# +# BitBake has the capability to accelerate builds based on previously built output. +# This is done using "shared state" files which can be thought of as cache objects +# and this option determines where those files are placed. +# +# You can wipe out TMPDIR leaving this directory intact and the build would regenerate +# from these files if no changes were made to the configuration. If changes were made +# to the configuration, only shared state files where the state was still valid would +# be used (done using checksums). +# +# The default is a sstate-cache directory under TOPDIR. +# +#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" + +# +# Where to place the build output +# +# This option specifies where the bulk of the building work should be done and +# where BitBake should place its temporary files and output. Keep in mind that +# this includes the extraction and compilation of many applications and the toolchain +# which can use Gigabytes of hard disk space. +# +# The default is a tmp directory under TOPDIR. +# +#TMPDIR = "${TOPDIR}/tmp" + +# +# Default policy config +# +# The distribution setting controls which policy settings are used as defaults. +# The default value is fine for general Yocto project use, at least initially. +# Ultimately when creating custom policy, people will likely end up subclassing +# these defaults. +# +DISTRO ?= "openbmc-phosphor" +# As an example of a subclass there is a "bleeding" edge policy configuration +# where many versions are set to the absolute latest code from the upstream +# source control systems. This is just mentioned here as an example, its not +# useful to most new users. +# DISTRO ?= "poky-bleeding" + +# +# Package Management configuration +# +# This variable lists which packaging formats to enable. Multiple package backends +# can be enabled at once and the first item listed in the variable will be used +# to generate the root filesystems. +# Options are: +# - 'package_deb' for debian style deb files +# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) +# - 'package_rpm' for rpm style packages +# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" +# We default to rpm: +PACKAGE_CLASSES ?= "package_rpm" + +# +# SDK/ADT target architecture +# +# This variable specifies the architecture to build SDK/ADT items for and means +# you can build the SDK packages for architectures other than the machine you are +# running the build on (i.e. building i686 packages on an x86_64 host). +# Supported values are i686 and x86_64 +#SDKMACHINE ?= "i686" + +SANITY_TESTED_DISTROS_append ?= " *" + +# +# Extra image configuration defaults +# +# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated +# images. Some of these options are added to certain image types automatically. The +# variable can contain the following options: +# "dbg-pkgs" - add -dbg packages for all installed packages +# (adds symbol information for debugging/profiling) +# "dev-pkgs" - add -dev packages for all installed packages +# (useful if you want to develop against libs in the image) +# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages +# (useful if you want to run the package test suites) +# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) +# "tools-debug" - add debugging tools (gdb, strace) +# "eclipse-debug" - add Eclipse remote debugging support +# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) +# "debug-tweaks" - make an image suitable for development +# e.g. ssh root access has a blank password +# 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" + +# +# Additional image features +# +# The following is a list of additional classes to use when building images which +# enable extra features. Some available options which can be included in this variable +# are: +# - 'buildstats' collect build statistics +# - 'image-mklibs' to reduce shared library files size for an image +# - 'image-prelink' in order to prelink the filesystem image +# - 'image-swab' to perform host system intrusion detection +# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink +# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +USER_CLASSES ?= "buildstats image-mklibs image-prelink" + +# +# Runtime testing of images +# +# The build system can test booting virtual machine images under qemu (an emulator) +# after any root filesystems are created and run tests against those images. To +# enable this uncomment this line. See classes/testimage(-auto).bbclass for +# further details. +#TEST_IMAGE = "1" +# +# Interactive shell configuration +# +# Under certain circumstances the system may need input from you and to do this it +# can launch an interactive shell. It needs to do this since the build is +# multithreaded and needs to be able to handle the case where more than one parallel +# process may require the user's attention. The default is iterate over the available +# terminal types to find one that works. +# +# Examples of the occasions this may happen are when resolving patches which cannot +# be applied, to use the devshell or the kernel menuconfig +# +# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none +# Note: currently, Konsole support only works for KDE 3.x due to the way +# newer Konsole versions behave +#OE_TERMINAL = "auto" +# By default disable interactive patch resolution (tasks will just fail instead): +PATCHRESOLVE = "noop" + +# +# Disk Space Monitoring during the build +# +# Monitor the disk space during the build. If there is less that 1GB of space or less +# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully +# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# of the build. The reason for this is that running completely out of space can corrupt +# files and damages the build in ways which may not be easily recoverable. +# It's necessary to monitor /tmp, if there is no space left the build will fail +# with very exotic errors. +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" + +# +# Shared-state files from other locations +# +# As mentioned above, shared state files are prebuilt cache data objects which can +# used to accelerate build time. This variable can be used to configure the system +# to search other mirror locations for these objects before it builds the data itself. +# +# This can be a filesystem directory, or a remote url such as http or ftp. These +# would contain the sstate-cache results from previous builds (possibly from other +# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the +# cache locations to check for the shared objects. +# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH +# at the end as shown in the examples below. This will be substituted with the +# correct path within the directory structure. +#SSTATE_MIRRORS ?= "\ +#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* file:///some/local/dir/sstate/PATH" + + +# +# Qemu configuration +# +# By default qemu will build with a builtin VNC server where graphical output can be +# seen. The two lines below enable the SDL backend too. This assumes there is a +# libsdl library available on your build system. +#PACKAGECONFIG_append_pn-qemu-native = " sdl" +#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +#ASSUME_PROVIDED += "libsdl-native" + + +# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to +# track the version of this file when it was generated. This can safely be ignored if +# this doesn't mean anything to you. +CONF_VERSION = "1" + +# Set the root password to '0penBmc' +INHERIT += "extrausers" + +EXTRA_USERS_PARAMS = " \ + usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ + " diff --git a/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf b/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf new file mode 100644 index 000000000..55b07b057 --- /dev/null +++ b/meta-supermicro/meta-x11spi/conf/machine/x11spi.conf @@ -0,0 +1,12 @@ +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "aspeed-bmc-supermicro-x11spi.dtb" + +require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/supermicro.inc + +UBOOT_MACHINE = "ast_g5_phy_config" + +FLASH_SIZE = "32768" + +VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" -- cgit v1.2.3 From 59099335a6ac2861fb664df34c3ac4b4bf39467d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 28 Jan 2021 18:42:26 -0600 Subject: Revert "run soft off in quiesce" This reverts commit 284d56bb877be545f59cf10883d28a37f306fc5b. Testing has uncovered some corner cases where the host is in a good enough state to respond to the initial shutdown request, but not in a good enough state to actually shut itself down. This results in the quiesce operation hitting the 2 hour timeout that is used in this scenario. 2 hours to reach a quiesce state is not acceptable. This is going to take some more design and discussion. Signed-off-by: Andrew Geissler Change-Id: I45a39879da6e7af8c573a1d1d2577f98579df6ee --- meta-phosphor/recipes-phosphor/pldm/pldm_git.bb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb index e6ac942bd..1c07ad59d 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb +++ b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb @@ -32,11 +32,6 @@ pkg_postinst_${PN} () { TARGET="../pldmSoftPowerOff.service" ln -s $TARGET $LINK - mkdir -p $D$systemd_system_unitdir/obmc-host-quiesce@0.target.wants - LINK="$D$systemd_system_unitdir/obmc-host-quiesce@0.target.wants/pldmSoftPowerOff.service" - TARGET="../pldmSoftPowerOff.service" - ln -s $TARGET $LINK - mkdir -p $D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/pldmSoftPowerOff.service" TARGET="../pldmSoftPowerOff.service" @@ -48,9 +43,6 @@ pkg_prerm_${PN} () { LINK="$D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires/pldmSoftPowerOff.service" rm $LINK - LINK="$D$systemd_system_unitdir/obmc-host-quiesce@0.target.wants/pldmSoftPowerOff.service" - rm $LINK - LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/pldmSoftPowerOff.service" rm $LINK } -- cgit v1.2.3 From e9defc0d3e666b934bbcae70ab09f15d782963c1 Mon Sep 17 00:00:00 2001 From: "Wludzik, Jozef" Date: Thu, 28 Jan 2021 09:36:34 +0100 Subject: meta-phosphor: obmc-apps: Add telemetry Added telemetry package to obmc package groups. Added telemetry to image features for easy opt-out. Change-Id: I66be3a545a1ce1cfb2c2c241629168c5b8d56c0d Signed-off-by: Wludzik, Jozef --- meta-phosphor/classes/obmc-phosphor-image.bbclass | 4 +++- meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb | 1 + .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 7a213e513..0a07fc6f4 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -8,6 +8,7 @@ # - obmc-chassis-state-mgmt - OpenBMC chassis state management # - obmc-console - OpenBMC serial over LAN # - obmc-dbus-monitor - OpenBMC dbus monitoring +# - obmc-debug-collector - OpenBMC debug collector # - obmc-devtools - OpenBMC development and debugging tools # - obmc-fan-control - OpenBMC fan management # - obmc-fan-mgmt - Deprecated - use obmc-fan-control instead @@ -27,9 +28,9 @@ # - obmc-settings-mgmt - OpenBMC settings management # - obmc-software - OpenBMC software management # - obmc-system-mgmt - OpenBMC system management +# - obmc-telemetry - OpenBMC telemetry solution # - obmc-user-mgmt - OpenBMC user management # - obmc-user-mgmt-ldap - OpenBMC LDAP users -# - obmc-debug-collector - OpenBMC debug collector inherit core-image inherit obmc-phosphor-utils @@ -62,6 +63,7 @@ FEATURE_PACKAGES_obmc-system-mgmt ?= "${@bb.utils.contains('DISTRO_FEATURES', 'o FEATURE_PACKAGES_obmc-debug-collector ?= "packagegroup-obmc-apps-debug-collector" FEATURE_PACKAGES_obmc-settings-mgmt ?= "packagegroup-obmc-apps-settings" FEATURE_PACKAGES_obmc-network-mgmt ?= "packagegroup-obmc-apps-network" +FEATURE_PACKAGES_obmc-telemetry ?= "packagegroup-obmc-apps-telemetry" FEATURE_PACKAGES_obmc-user-mgmt ?= "packagegroup-obmc-apps-user-mgmt" FEATURE_PACKAGES_obmc-user-mgmt-ldap ?= "packagegroup-obmc-apps-user-mgmt-ldap" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index 76515fae0..e4f955f6e 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -38,6 +38,7 @@ IMAGE_FEATURES += " \ obmc-debug-collector \ obmc-network-mgmt \ obmc-settings-mgmt \ + obmc-telemetry \ " LICENSE = "Apache-2.0" diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index e080ff635..bff21e53c 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -28,6 +28,7 @@ PACKAGES = " \ ${PN}-debug-collector \ ${PN}-settings \ ${PN}-network \ + ${PN}-telemetry \ ${PN}-user-mgmt \ ${PN}-user-mgmt-ldap \ " @@ -175,6 +176,11 @@ RDEPENDS_${PN}-network = " \ ${VIRTUAL-RUNTIME_obmc-network-manager} \ " +SUMMARY_${PN}-telemetry = "Telemetry solution" +RDEPENDS_${PN}-telemetry = " \ + telemetry \ + " + SUMMARY_${PN}-user-mgmt = "User management applications" RDEPENDS_${PN}-user-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-user-mgmt} \ -- cgit v1.2.3 From 737a9486ac03752ef198ba756ec1b13b225e25b3 Mon Sep 17 00:00:00 2001 From: Klaus Heinrich Kiwi Date: Mon, 25 Jan 2021 17:44:15 +0000 Subject: meta-ibm: Add meta-security layer There are some machines (Witherspoon-Tacoma and Rainier) that have a TPM device, which will be used eventually. We need access to the recipes in this layer. Signed-off-by: Klaus Heinrich Kiwi Change-Id: I3b10ee4d39a69e651a790ae3238e39c45e21ce72 --- meta-ibm/conf/bblayers.conf.sample | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-ibm/conf/bblayers.conf.sample b/meta-ibm/conf/bblayers.conf.sample index 771bfb8a7..4c665d1bb 100644 --- a/meta-ibm/conf/bblayers.conf.sample +++ b/meta-ibm/conf/bblayers.conf.sample @@ -11,6 +11,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-networking \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security/meta-tpm \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-openpower \ @@ -22,6 +23,7 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta-openembedded/meta-networking \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security/meta-tpm \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-openpower \ -- cgit v1.2.3 From 7edf23a8adbce355a0e410b87dddb91578313de6 Mon Sep 17 00:00:00 2001 From: Klaus Heinrich Kiwi Date: Mon, 11 Jan 2021 20:26:30 +0000 Subject: meta-phosphor: Add ibmtpm2tss recipe to rainier and witherspoon-tacoma The ibmtpm2tss tools are required to use the Nuvoton NPCT750A TPM from userland. The ibmtpm2tss package also required OpenSSL camellia support, so remove the override disabling that for those two machines. Signed-off-by: Klaus Heinrich Kiwi Change-Id: Ifc0afc58f4a31ea4b6d1750d470738d0d0e82754 --- meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend | 3 ++- meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index 4bcaf7544..433d58d68 100644 --- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,5 +1,6 @@ OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-hostname" -OBMC_IMAGE_EXTRA_INSTALL_append_rainier = " mboxd" +OBMC_IMAGE_EXTRA_INSTALL_append_rainier = " mboxd ibmtpm2tss" +OBMC_IMAGE_EXTRA_INSTALL_append_witherspoon-tacoma = " ibmtpm2tss" OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller " # remove so things fit in available flash space diff --git a/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend b/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend new file mode 100644 index 000000000..6ffe5db6c --- /dev/null +++ b/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend @@ -0,0 +1,4 @@ +# Rainier needs ibmtpm2tss which needs ibmswtpm2 which needs openssl +# camellia support +EXTRA_OECONF_remove_witherspoon-tacoma = " no-camellia" +EXTRA_OECONF_remove_rainier = " no-camellia" -- cgit v1.2.3 From b994e524553fa31f3bb04543c0766b934cd9c375 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 30 Jan 2021 14:10:40 +0000 Subject: phosphor-dbus-interfaces: srcrev bump 6f8ebc58eb..1b4a98af49 Matt Spinler (1): thresholds: Add PerformanceLoss threshold Change-Id: I8b243908d127563eba1c931b01c72eb4b7038f0b Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index ca72fadc8..d266d1c99 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "6f8ebc58ebe13e97522a7d1740690dde1adadaa8" +SRCREV = "1b4a98af49059da61695c41469e4b7b134c1bf68" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true -- cgit v1.2.3 From 72edbb43e0c08bcaefb0a0df166112b11a05df5a Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Fri, 29 Jan 2021 17:57:38 +0300 Subject: obmc-yadro-backup: srcrev bump dd29c8bd..1cb990bb Artem Senichev (1): Add handling of unused result values Change-Id: I9420560b36ecaf2ad854cdb36719625dad60c721 Signed-off-by: Alexander Filippov --- meta-yadro/recipes-phosphor/cli/obmc-yadro-backup_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-backup_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-backup_git.bb index c101d837c..ae167e3bf 100644 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-backup_git.bb +++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-backup_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" # Source code repository S = "${WORKDIR}/git" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-backup.git" -SRCREV = "dd29c8bdc222de004284faba37d278f8c443b531" +SRCREV = "1cb990bb16708ad488980d907387bd3e4d37eb3a" -- cgit v1.2.3 From dd68b8bdc0cedd29bffa97b7dc6d0bce3a0ffb1e Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Tue, 22 Dec 2020 03:33:40 +0000 Subject: meta-ampere:mtjade:u-boot: Enable FANs to run at full speed on reset When BMC is reseting, FANs do not run at all. This might cause heating issue in case the Host CPU is in high load. To protect the hardware, it is safe to set FANs run at full speed when BMC is booting. After it boots complete, phosphor-fan service will take control on FANs to make them work at the right speed. This commit adds patch to configure all PWM function pins to input GPIO mode to make FANs run at full speed. Tested: 1. Boot BMC to Linux. 2. Turn on Host by "ipmitool chassis power on" command 3. Reboot BMC and check if FAN speed is maximum at u-boot. Signed-off-by: Thang Q. Nguyen Change-Id: I38f1433a576a1700938347dc89eddacf3fb3bf60 --- ...eed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch | 87 ++++++++++++++++++++++ .../recipes-bsp/u-boot/u-boot-aspeed_%.bbappend | 5 ++ 2 files changed, 92 insertions(+) create mode 100644 meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch create mode 100644 meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch new file mode 100644 index 000000000..b714be4c6 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch @@ -0,0 +1,87 @@ +From 03dcf584823b8b7db7d437257dbb45bd4b7f95b4 Mon Sep 17 00:00:00 2001 +From: Chanh Nguyen +Date: Mon, 21 Dec 2020 07:01:14 +0000 +Subject: [PATCH] aspeed/scu : Switch PWM pin to GPIO input mode + +In hardware design, the PWM pins will be at a high level if they are +configured in GPIO Input mode. This commit configures all PWM function +pins to input GPIO mode. This will allow fans to run at full speed when BMC resets or in U-boot. + +Signed-off-by: Chanh Nguyen +--- + arch/arm/include/asm/arch-aspeed/ast_scu.h | 1 + + arch/arm/mach-aspeed/ast-scu.c | 12 ++++++++++++ + board/aspeed/ast-g5/ast-g5.c | 10 ++++++++++ + include/configs/ast-g5-phy.h | 3 +++ + 4 files changed, 26 insertions(+) + +diff --git a/arch/arm/include/asm/arch-aspeed/ast_scu.h b/arch/arm/include/asm/arch-aspeed/ast_scu.h +index dcbc6730d4..d2c010a0dc 100644 +--- a/arch/arm/include/asm/arch-aspeed/ast_scu.h ++++ b/arch/arm/include/asm/arch-aspeed/ast_scu.h +@@ -45,5 +45,6 @@ extern u32 ast_scu_get_vga_memsize(void); + extern void ast_scu_init_eth(u8 num); + extern void ast_scu_multi_func_eth(u8 num); + extern void ast_scu_multi_func_romcs(u8 num); ++extern void ast_scu_switch_pwm_to_gpio_mode(void); + + #endif +diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c +index 12de9b8036..ef90ef3805 100644 +--- a/arch/arm/mach-aspeed/ast-scu.c ++++ b/arch/arm/mach-aspeed/ast-scu.c +@@ -443,6 +443,18 @@ void ast_scu_multi_func_eth(u8 num) + } + } + ++void ast_scu_switch_pwm_to_gpio_mode(void) ++{ ++ ast_scu_write(ast_scu_read(AST_SCU_FUN_PIN_CTRL3) & ++ ~SCU_FUN_PIN_VPIG2 & ++ ~SCU_FUN_PIN_VPIG3 & ++ ~SCU_FUN_PIN_VPIG4 & ++ ~SCU_FUN_PIN_VPIG5 & ++ ~SCU_FUN_PIN_VPIG6 & ++ ~SCU_FUN_PIN_VPIG7, ++ AST_SCU_FUN_PIN_CTRL3); ++} ++ + void ast_scu_multi_func_romcs(u8 num) + { + ast_scu_write(ast_scu_read(AST_SCU_FUN_PIN_CTRL3) | +diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c +index e67a4bf8b2..fba22a728e 100644 +--- a/board/aspeed/ast-g5/ast-g5.c ++++ b/board/aspeed/ast-g5/ast-g5.c +@@ -24,6 +24,16 @@ int board_init(void) + return 0; + } + ++#ifdef CONFIG_BOARD_LATE_INIT ++int board_late_init(void) ++{ ++ /* Switch PWM to GPIO mode to make FAN run in max speed */ ++ ast_scu_switch_pwm_to_gpio_mode(); ++ ++ return 0; ++} ++#endif ++ + int dram_init(void) + { + u32 vga = ast_scu_get_vga_memsize(); +diff --git a/include/configs/ast-g5-phy.h b/include/configs/ast-g5-phy.h +index 62ddb841e5..5443a26cab 100644 +--- a/include/configs/ast-g5-phy.h ++++ b/include/configs/ast-g5-phy.h +@@ -30,4 +30,7 @@ + /* platform.S */ + #define CONFIG_DRAM_ECC_SIZE 0x10000000 + ++/* Call board_late_init */ ++#define CONFIG_BOARD_LATE_INIT 1 ++ + #endif /* __AST_G5_PHY_CONFIG_H */ +-- +2.25.1 + diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend new file mode 100644 index 000000000..983dc2400 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch \ + " -- cgit v1.2.3 From 8f221bfb0979fa018f6c16b5af153c1549448e7d Mon Sep 17 00:00:00 2001 From: Tung Nguyen Date: Wed, 16 Dec 2020 05:52:18 +0000 Subject: meta-ampere: Support Ampere power control Implement the Ampere power control requirements for Altra system. Tested: - Check the ipmi commands: ipmi power on/off/soft/reset/cycle - Check the redfish commands: On, Off, ForceOn, ForceOff, GracefulShutdown, GracefulRestart, ForceRestart, PowerCycle Signed-off-by: Tung Nguyen Change-Id: Id0c64c1284a6338ce47ca720d0ef75e99d21aa3c --- .../recipes-ac01/host/ampere-hostctrl.bb | 85 ++++++++++++++++ .../ampere-chassis-poweroff.service | 11 +++ .../ampere-hostctrl/ampere-chassis-poweron.service | 9 ++ .../ampere-host-force-reset.service | 11 +++ .../ampere-host-power-cycle.service | 10 ++ .../ampere-hostctrl/ampere-host-reset-ack.service | 10 ++ .../host/ampere-hostctrl/ampere-host-reset.service | 9 ++ .../ampere-hostctrl/ampere-host-shutdown.service | 10 ++ .../recipes-ac01/host/files/ampere_power_util.sh | 109 +++++++++++++++++++++ .../recipes-ac01/host/files/obmc/gpio/reboot_ack | 4 + .../recipes-ac01/host/files/obmc/gpio/shutdown_ack | 4 + .../packagegroups/packagegroup-ampere-apps.bb | 27 +++++ .../state/phosphor-state-manager/resetreason.conf | 2 + .../state/phosphor-state-manager_%.bbappend | 24 +++++ 14 files changed, 325 insertions(+) create mode 100644 meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb create mode 100644 meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-chassis-poweroff.service create mode 100644 meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-chassis-poweron.service create mode 100644 meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-force-reset.service create mode 100644 meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-power-cycle.service create mode 100644 meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-reset-ack.service create mode 100644 meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-reset.service create mode 100644 meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-shutdown.service create mode 100644 meta-ampere/meta-common/recipes-ac01/host/files/ampere_power_util.sh create mode 100644 meta-ampere/meta-common/recipes-ac01/host/files/obmc/gpio/reboot_ack create mode 100644 meta-ampere/meta-common/recipes-ac01/host/files/obmc/gpio/shutdown_ack create mode 100644 meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb create mode 100644 meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager/resetreason.conf create mode 100644 meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb new file mode 100644 index 000000000..e7c3cc160 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb @@ -0,0 +1,85 @@ +SUMMARY = "Ampere Computing LLC Host Control Implementation" +DESCRIPTION = "A host control implementation suitable for Ampere Computing LLC's systems" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd +inherit obmc-phosphor-systemd + +# For now, monitoring shutdown_ack and reboot_ack are the only usecases +OBMC_HOST_MONITOR_INSTANCES = "shutdown_ack reboot_ack" +SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/shutdown_ack obmc/gpio/reboot_ack" + +S = "${WORKDIR}" + +SRC_URI = "file://ampere-host-shutdown.service \ + file://ampere-host-reset.service \ + file://ampere_power_util.sh \ + file://ampere-chassis-poweroff.service \ + file://ampere-chassis-poweron.service \ + file://ampere-host-reset-ack.service \ + file://ampere-host-force-reset.service \ + file://ampere-host-power-cycle.service \ + " + +DEPENDS = "systemd virtual/obmc-gpio-monitor" +RDEPENDS_${PN} = "bash virtual/obmc-gpio-monitor" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = " \ + ampere-host-shutdown.service \ + ampere-host-reset.service \ + ampere-chassis-poweroff.service \ + ampere-chassis-poweron.service \ + ampere-host-reset-ack.service \ + ampere-host-force-reset.service \ + ampere-host-power-cycle.service \ + " +# host power control +# overwrite the host shutdown to graceful shutdown +HOST_SHUTDOWN_TMPL = "ampere-host-shutdown.service" +HOST_SHUTDOWN_TGTFMT = "obmc-host-shutdown@{0}.target" +HOST_SHUTDOWN_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_SHUTDOWN_TGTFMT}.requires/${HOST_SHUTDOWN_TMPL}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}" + +# Force the power cycle target to run the ampere power cycle +HOST_REBOOT_SVC = "ampere-host-power-cycle.service" +HOST_REBOOT_SVC_TGTFMT = "obmc-host-reboot@{0}.target" +HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_SVC_TGTFMT}.requires/${HOST_REBOOT_SVC}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" + +# overwrite the host reset to graceful reset +HOST_WARM_REBOOT_SOFT_SVC = "ampere-host-reset.service" +HOST_WARM_REBOOT_TGTFMT = "obmc-host-warm-reboot@{0}.target" +HOST_WARM_REBOOT_SOFT_SVC_FMT = "../${HOST_WARM_REBOOT_SOFT_SVC}:${HOST_WARM_REBOOT_TGTFMT}.requires/${HOST_WARM_REBOOT_SOFT_SVC}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" + +# overwrite force reboot +HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset.service" +HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" +HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_TGT}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" + +# chassis power control +CHASSIS_POWERON_SVC = "ampere-chassis-poweron.service" +CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" +CHASSIS_POWERON_FMT = "../${CHASSIS_POWERON_SVC}:${CHASSIS_POWERON_TGTFMT}.requires/${CHASSIS_POWERON_SVC}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" + +CHASSIS_POWEROFF_SVC = "ampere-chassis-poweroff.service" +CHASSIS_POWEROFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" +CHASSIS_POWEROFF_FMT = "../${CHASSIS_POWEROFF_SVC}:${CHASSIS_POWEROFF_TGTFMT}.requires/${CHASSIS_POWEROFF_SVC}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" + +TMPL = "phosphor-gpio-monitor@.service" +INSTFMT = "phosphor-gpio-monitor@{0}.service" +TGT = "multi-user.target" +FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}" + +do_install() { + install -d ${D}/usr/sbin + install -m 0755 ${WORKDIR}/ampere_power_util.sh ${D}/${sbindir}/ampere_power_util.sh +} + diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-chassis-poweroff.service b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-chassis-poweroff.service new file mode 100644 index 000000000..b0a1af785 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-chassis-poweroff.service @@ -0,0 +1,11 @@ +[Unit] +Description=Ampere Computing LLC Power OFF Chassis +Requires=op-wait-power-off@%i.service +Before=op-wait-power-off@%i.service +Conflicts=obmc-chassis-poweron@0.target + +[Service] +RemainAfterExit=no +Type=oneshot +ExecStart=/usr/bin/env ampere_power_util.sh mb off +SyslogIdentifier=ampere_power_util.sh diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-chassis-poweron.service b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-chassis-poweron.service new file mode 100644 index 000000000..76ceb8856 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-chassis-poweron.service @@ -0,0 +1,9 @@ +[Unit] +Description=Ampere Computing LLC Power ON Chassis +Conflicts=obmc-chassis-poweroff@0.target + +[Service] +RemainAfterExit=yes +Type=oneshot +ExecStart=/usr/bin/env ampere_power_util.sh mb on +SyslogIdentifier=ampere_power_util.sh diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-force-reset.service b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-force-reset.service new file mode 100644 index 000000000..8a40baf7b --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-force-reset.service @@ -0,0 +1,11 @@ +[Unit] +Description=Ampere Computing LLC force reset host +Conflicts=obmc-chassis-poweroff@0.target +OnFailure=obmc-chassis-powerreset@0.target + +[Service] +RemainAfterExit=no +Type=oneshot +ExecStart=/usr/bin/env ampere_power_util.sh mb force_reset +SyslogIdentifier=ampere_power_util.sh + diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-power-cycle.service b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-power-cycle.service new file mode 100644 index 000000000..2fb03effb --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-power-cycle.service @@ -0,0 +1,10 @@ +[Unit] +Description=Ampere Computing LLC power cycle service +Conflicts=obmc-host-start@0.target +OnFailure=obmc-chassis-powerreset@0.target + +[Service] +RemainAfterExit=no +Type=oneshot +ExecStart=/usr/bin/env ampere_power_util.sh mb cycle +SyslogIdentifier=ampere_power_util.sh diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-reset-ack.service b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-reset-ack.service new file mode 100644 index 000000000..504186ec6 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-reset-ack.service @@ -0,0 +1,10 @@ +[Unit] +Description=Ampere Computing LLC triggering reset ACK +Conflicts=obmc-host-start@0.target +OnFailure=obmc-chassis-powerreset@0.target + +[Service] +RemainAfterExit=no +Type=oneshot +ExecStart=/usr/bin/env ampere_power_util.sh mb force_reset +SyslogIdentifier=ampere_power_util.sh diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-reset.service b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-reset.service new file mode 100644 index 000000000..ac7618ad0 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-reset.service @@ -0,0 +1,9 @@ +[Unit] +Description=Ampere Computing LLC warm reset host +Conflicts=obmc-chassis-poweroff@0.target + +[Service] +RemainAfterExit=no +Type=oneshot +ExecStart=/usr/bin/env ampere_power_util.sh mb graceful_reset +SyslogIdentifier=ampere_power_util.sh diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-shutdown.service b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-shutdown.service new file mode 100644 index 000000000..be4d45260 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-shutdown.service @@ -0,0 +1,10 @@ +[Unit] +Description=Ampere Computing LLC graceful shutdown host +Conflicts=obmc-host-start@0.target +OnFailure=obmc-chassis-poweroff@0.target + +[Service] +RemainAfterExit=no +Type=oneshot +ExecStart=/usr/bin/env ampere_power_util.sh mb graceful_shutdown +SyslogIdentifier=ampere_power_util.sh diff --git a/meta-ampere/meta-common/recipes-ac01/host/files/ampere_power_util.sh b/meta-ampere/meta-common/recipes-ac01/host/files/ampere_power_util.sh new file mode 100644 index 000000000..8bab9a370 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/files/ampere_power_util.sh @@ -0,0 +1,109 @@ +#!/bin/bash +# Usage of this utility +function usage() { + echo "usage: power-util mb [on|off|status|cycle|reset|graceful_shutdown|graceful_reset|force_reset]"; +} + +power_off() { + echo "Shutting down Server $2" + busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off +} + +power_on() { + echo "Powering on Server $2" + busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.On +} + +power_status() { + st=$(busctl get-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis CurrentPowerState | cut -d"." -f6) + if [ "$st" == "On\"" ]; then + echo "on" + else + echo "off" + fi +} + +power_reset() { + echo "Reset on server $2" + busctl set-property xyz.openbmc_project.State.Host /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s xyz.openbmc_project.State.Host.Transition.Reboot +} + +graceful_shutdown() { + if [ -f "/run/openbmc/host@0-request" ]; then + echo "shutdown host immediately" + power_off + else + echo "Triggering graceful shutdown" + gpioset -l 0 49=1 + sleep 1 + gpioset -l 0 49=0 + sleep 30s + fi +} + +force_reset() { + echo "Triggering sysreset pin" + gpioset -l 0 91=1 + sleep 1 + gpioset -l 0 91=0 +} + +if [ $# -lt 2 ]; then + echo "Total number of parameter=$#" + echo "Insufficient parameter" + usage; + exit 0; +fi + +if [ $1 != "mb" ]; then + echo "Invalid parameter1=$1" + usage; + exit 0; +fi + +if [ $2 = "on" ]; then + if [ $(power_status) == "off" ]; then + power_on + fi +elif [ $2 = "off" ]; then + if [ $(power_status) == "on" ]; then + power_off + fi + # If any request of graceful reset, need to power on + if [ -f "/run/openbmc/host@0-graceful-reset" ]; then + sleep 20s + power_on + rm -f "/run/openbmc/host@0-graceful-reset" + fi +elif [ $2 == "cycle" ]; then + if [ $(power_status) == "on" ]; then + echo "Powering off server" + power_off + sleep 20s + power_on + else + echo "Host is already off, do nothing" + fi +elif [ $2 == "reset" ]; then + if [ $(power_status) == "on" ]; then + power_reset + else + echo "ERROR: Server not powered on" + fi +elif [[ $2 == "graceful_shutdown" ]]; then + graceful_shutdown +elif [ $2 == "graceful_reset" ]; then + mkdir -p "/run/openbmc/" + touch "/run/openbmc/host@0-graceful-reset" + graceful_shutdown + sleep 20s +elif [ $2 == "status" ]; then + power_status +elif [ $2 == "force_reset" ]; then + force_reset +else + echo "Invalid parameter2=$2" + usage; +fi + +exit 0; diff --git a/meta-ampere/meta-common/recipes-ac01/host/files/obmc/gpio/reboot_ack b/meta-ampere/meta-common/recipes-ac01/host/files/obmc/gpio/reboot_ack new file mode 100644 index 000000000..0436d32da --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/files/obmc/gpio/reboot_ack @@ -0,0 +1,4 @@ +DEVPATH=/dev/input/event0 +KEY=75 +POLARITY=1 +TARGET=ampere-host-reset-ack.service diff --git a/meta-ampere/meta-common/recipes-ac01/host/files/obmc/gpio/shutdown_ack b/meta-ampere/meta-common/recipes-ac01/host/files/obmc/gpio/shutdown_ack new file mode 100644 index 000000000..a0e857fac --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/files/obmc/gpio/shutdown_ack @@ -0,0 +1,4 @@ +DEVPATH=/dev/input/event0 +KEY=50 +POLARITY=1 +TARGET=ampere-chassis-poweroff.service diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb new file mode 100644 index 000000000..2990d8ec0 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb @@ -0,0 +1,27 @@ +SUMMARY = "OpenBMC for Ampere - Applications" +PR = "r1" + +inherit packagegroup +inherit obmc-phosphor-utils + +PROVIDES = "${PACKAGES}" +PACKAGES = " \ + ${PN}-chassis \ + ${PN}-system \ + " + +PROVIDES += "virtual/obmc-chassis-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" + +RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" + +SUMMARY_${PN}-chassis = "Ampere Chassis" +RDEPENDS_${PN}-chassis = " \ + obmc-op-control-power \ + ampere-hostctrl \ + " + +SUMMARY_${PN}-system = "Ampere System" +RDEPENDS_${PN}-system = " \ + " diff --git a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager/resetreason.conf b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager/resetreason.conf new file mode 100644 index 000000000..828d98b8e --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager/resetreason.conf @@ -0,0 +1,2 @@ +[Unit] +ConditionKernelCommandLine=resetreason=power diff --git a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend new file mode 100644 index 000000000..d54407ba3 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -0,0 +1,24 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +DEPS_CFG = "resetreason.conf" +DEPS_TGT = "phosphor-discover-system-state@.service" +SYSTEMD_OVERRIDE_${PN}-discover_append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" + +# We don't want the obmc-host-shutdown (softoff) to require +# obmc-chassis-poweroff. obmc-chassis-poweroff will be activated once +# the Shutdown ACK pin is toggled (monitored by phosphor-gpio-monitor) +HOST_STOP_FMT = "" +HOST_REBOOT_FMT = "" + +pkg_postinst_${PN}-obmc-targets_append() { + rm "$D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires/obmc-chassis-poweroff@0.target" + + rm "$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service" + rm "$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/obmc-host-force-warm-reboot@0.target" + + rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/phosphor-reboot-host@0.service" + rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/obmc-host-shutdown@0.target" + + rm "$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/obmc-host-stop@0.target" + rm "$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/phosphor-reboot-host@0.service" +} -- cgit v1.2.3 From d76c413d1c8430cb26a5365988521815112e45f5 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Wed, 23 Dec 2020 04:45:53 +0000 Subject: meta-ampere: u-boot: Disable internal PD resistors for GPIOs Configure SCU8C - Multi-function pin control 4 to disable internal pull down resistors for GPIOJ, GPIOG/GPIOAB, GPIOD/GPIOY, GPIOC/GPIOS as external resistors are already installed. Tested: scan I2C4 and check devices on the bus are detected Signed-off-by: Thinh Pham Signed-off-by: Thang Q. Nguyen Change-Id: I5a4b682310b5243830bd9c7a66889b0a52c4770c --- ...d-Disable-internal-PD-resistors-for-GPIOs.patch | 45 ++++++++++++++++++++++ .../recipes-bsp/u-boot/u-boot-aspeed_%.bbappend | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch new file mode 100644 index 000000000..249d4398f --- /dev/null +++ b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch @@ -0,0 +1,45 @@ +From c6e0470d82417b79b23f218c6db1099eb6e160af Mon Sep 17 00:00:00 2001 +From: "Thang Q. Nguyen" +Date: Wed, 23 Dec 2020 04:42:21 +0000 +Subject: [PATCH] aspeed: Disable internal PD resistors for GPIOs + +Configure SCU8C - Multi-function pin control 4 to disable internal pull +down resistors for GPIOJ, GPIOG/GPIOAB, GPIOD/GPIOY, GPIOC/GPIOS as +external resistors are already installed. + +Signed-off-by: Thang Q. Nguyen +--- + board/aspeed/ast-g5/ast-g5.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c +index fba22a728e..9bf6c905fe 100644 +--- a/board/aspeed/ast-g5/ast-g5.c ++++ b/board/aspeed/ast-g5/ast-g5.c +@@ -27,9 +27,23 @@ int board_init(void) + #ifdef CONFIG_BOARD_LATE_INIT + int board_late_init(void) + { ++ u32 val; ++ + /* Switch PWM to GPIO mode to make FAN run in max speed */ + ast_scu_switch_pwm_to_gpio_mode(); + ++ /* ++ * Disable internal pull down resistor for GPIOJ, ++ * GPIOG/GPIOAB, GPIOD/GPIOY, GPIOC/GPIOS as external pull up/down ++ * resistors are installed already. Unlock SCU regs before writing. ++ */ ++ writel(SCU_PROTECT_UNLOCK, AST_SCU_BASE); ++ val = readl(AST_SCU_BASE + AST_SCU_FUN_PIN_CTRL4) | 0x024C0000; ++ writel(val, AST_SCU_BASE + AST_SCU_FUN_PIN_CTRL4); ++#ifdef CONFIG_AST_SCU_LOCK ++ writel(0xaa, AST_SCU_BASE); ++#endif ++ + return 0; + } + #endif +-- +2.25.1 + diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index 983dc2400..c40bfcd02 100644 --- a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -2,4 +2,5 @@ FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch \ + file://0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch \ " -- cgit v1.2.3 From ac0d2b843d4ad4e3a92ac5b427021aaa43dd2612 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Thu, 24 Dec 2020 02:22:46 +0000 Subject: meta-ampere: Support virtual Ethernet over USB device Implement systemd service to create an Ethernet over USB interface for communication between CPU and BMC. Tested: 1. Check usb0 ethernet interface in BMC console root@mtjade:~# ifconfig usb0 usb0 Link encap:Ethernet HWaddr DA:F7:E9:A3:5A:0C inet addr:192.168.0.10 Bcast:192.168.255.255 Mask:255.255.0.0 UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:2 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:0 (0.0 B) TX bytes:412 (412.0 B) 2. Check USB Ethernet device on Host Linux $ lsusb | grep Ethernet Bus 001 Device 004: ID 1d6b:0103 Linux Foundation NCM (Ethernet) Gadget Signed-off-by: Chanh Nguyen Signed-off-by: Thang Q. Nguyen Change-Id: Icb7c096df426233e8f2ee7318f2a1805f07ab3a7 --- .../recipes-ac01/usbnet/ampere-usbnet.bb | 30 +++++++ .../usbnet/ampere-usbnet/00-bmc-usb0.network | 7 ++ .../ampere-usbnet/ampere_add_usbnet_gadget.service | 13 +++ .../ampere-usbnet/ampere_add_usbnet_gadget.sh | 93 ++++++++++++++++++++++ meta-ampere/meta-jade/conf/machine/mtjade.conf | 4 + .../recipes-kernel/linux/linux-aspeed/mtjade.cfg | 6 ++ 6 files changed, 153 insertions(+) create mode 100644 meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet.bb create mode 100644 meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/00-bmc-usb0.network create mode 100644 meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.service create mode 100644 meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.sh diff --git a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet.bb b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet.bb new file mode 100644 index 000000000..f683f8015 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet.bb @@ -0,0 +1,30 @@ +SUMMARY = "Ampere Computing LLC Add Ethernet over USB gadget device" +DESCRIPTION = "Add Ethernet over USB gadget device for Ampere systems" +PR = "r1" + +LICENSE = "Apache-2.0" +S = "${WORKDIR}" + +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd +inherit obmc-phosphor-systemd + +DEPENDS = "systemd" +RDEPENDS_${PN} = "bash" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = " \ + ampere_add_usbnet_gadget.service \ + " + +SRC_URI += "file://00-bmc-usb0.network" +SRC_URI += "file://ampere_add_usbnet_gadget.sh" + +do_install_append() { + install -d ${D}${sbindir} + install -d ${D}/etc/systemd/network + install -m 744 ${WORKDIR}/ampere_add_usbnet_gadget.sh ${D}${sbindir}/ + install -m 644 ${WORKDIR}/00-bmc-usb0.network \ + ${D}/etc/systemd/network/ +} diff --git a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/00-bmc-usb0.network b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/00-bmc-usb0.network new file mode 100644 index 000000000..640fe04b9 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/00-bmc-usb0.network @@ -0,0 +1,7 @@ +[Match] +Name=usb0 +[Address] +Address=192.168.0.10/16 +[Network] +LinkLocalAddressing=no +IPv6AcceptRA=no diff --git a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.service b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.service new file mode 100644 index 000000000..428263a89 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.service @@ -0,0 +1,13 @@ +[Unit] +Description=Ampere adds Ethernet over USB gadget device +Wants=systemd-networkd.service +Before=systemd-networkd.service +After=phosphor-ipmi-host.service + +[Service] +ExecStart=/usr/bin/env ampere_add_usbnet_gadget.sh +SyslogIdentifier=ampere_add_usbnet_gadget.sh +Type=oneshot + +[Install] +WantedBy=systemd-networkd.service diff --git a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.sh b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.sh new file mode 100644 index 000000000..c4c2c273f --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.sh @@ -0,0 +1,93 @@ +#!/bin/sh + +# Add an Ethernet over USB gadget device and connect to a port of Aspeed USB +# virtual hub. If can't find any free port on virtual hub, exit with failure. +# If can't find the virtual hub, exit with failure. + +# Author: Thinh Hung Pham +# Signed-off-by: Chanh Nguyen + +UDC_SYSPATH=/sys/class/udc +VHUB_DEVICE=1e6a0000.usb-vhub:p +GADGET_CONFIG_SYSPATH=/sys/kernel/config/usb_gadget +USBNET=usbnet +# The number of port on AST2500 USB virtual hub +NUM_PORT_USB_HUB=5 +# idVendor = 0x1d6b: Linux Foundation +VENDORID=0x1d6b +# idProduct = 0x0103: NCM (Ethernet) Gadget +PRODUCTID=0x0103 +# Language code = 0x409: English – United States +LANGUAGEID=0x409 +SERIALNUMBER=cafecafe +MANUFACTURER=Aspeed +FUNCTION=ecm.usb0 + +if [ ! -d ${GADGET_CONFIG_SYSPATH} ]; then + # GADGET_CONFIG_SYSPATH is not exist + # Return 1 so that systemd knows the service failed to start + echo "ERROR: ${GADGET_CONFIG_SYSPATH} : doesn't exist!" + exit 1 +fi + +find_free_vhub_port(){ + for ((i=1;i<=${NUM_PORT_USB_HUB};i++)) + do + state=$(cat ${UDC_SYSPATH}/${VHUB_DEVICE}${i}/state) + func=$(cat ${UDC_SYSPATH}/${VHUB_DEVICE}${i}/function) + if [ "${state}" == "not attached" -a "${func}" == "" ]; then + FREEUDC=${VHUB_DEVICE}${i} + break + fi + done + if [ ${i} -eq 6 ]; then + # Can't find a free port + # Return 1 so that systemd knows the service failed to start + echo "ERROR: Can't find a free port !" + exit 1 + fi +} + +if [ -d ${GADGET_CONFIG_SYSPATH}/${USBNET} ]; then + cd ${GADGET_CONFIG_SYSPATH}/${USBNET} +else + # Create the gadget + mkdir ${GADGET_CONFIG_SYSPATH}/${USBNET} + cd ${GADGET_CONFIG_SYSPATH}/${USBNET} + + # Configure the gadget + echo ${VENDORID} > idVendor + echo ${PRODUCTID} > idProduct + mkdir strings/${LANGUAGEID} + echo ${SERIALNUMBER} > strings/${LANGUAGEID}/serialnumber + echo ${MANUFACTURER} > strings/${LANGUAGEID}/manufacturer + echo ${USBNET} > strings/${LANGUAGEID}/product + + # Create the configuration + mkdir configs/c.1 + mkdir configs/c.1/strings/${LANGUAGEID} + + # Create the function + mkdir functions/${FUNCTION} + + # Associate the function with its configuration + ln -s functions/${FUNCTION} configs/c.1 +fi + +# Find an available virtual hub port +find_free_vhub_port + +# Enable the gadget +echo ${FREEUDC} > UDC + +if [[ $? -ne 0 ]]; then + # End + cd - > /dev/null + # Virtual HUB is not available + # Return 1 so that systemd knows the service failed to start + exit 1 +fi + +# End +cd - > /dev/null + diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index c7bf92bfe..5999392f4 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -7,3 +7,7 @@ require conf/machine/include/obmc-bsp-common.inc require conf/distro/include/phosphor-isolation.inc VOLATILE_LOG_DIR = "no" + +OBMC_IMAGE_EXTRA_INSTALL_append = "\ + ampere-usbnet \ + " diff --git a/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/mtjade.cfg b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/mtjade.cfg index 9afe14af8..fdda06d3e 100644 --- a/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/mtjade.cfg +++ b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/mtjade.cfg @@ -14,3 +14,9 @@ CONFIG_ASPEED_ADC=y CONFIG_SENSORS_LM75=y CONFIG_I2C_SLAVE=y CONFIG_SENSORS_ASPEED=y + +CONFIG_USB_PHY=y +CONFIG_USB_GADGET=y +CONFIG_USB_CONFIGFS=y +CONFIG_USB_ASPEED_VHUB=y +CONFIG_USB_CONFIGFS_ECM=y -- cgit v1.2.3 From dd776e61bd1dfc932c7f6dda125426beea495e12 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Mon, 28 Dec 2020 03:09:45 +0000 Subject: meta-ampere: ipmi: Add device ID config Add device ID configuration for IPMI mc info command. Tested: ran command `ipmitool mc info` and got responses Device ID : 32 Device Revision : 1 Firmware Revision : 0.00 IPMI Version : 2.0 Manufacturer ID : 52538 Manufacturer Name : Unknown (0xCD3A) Product ID : 130 (0x0082) Product Name : Unknown (0x82) Signed-off-by: Thang Q. Nguyen Change-Id: I32a1e8443b0f202cbe2133cb048d66f08e866744 --- .../meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend | 1 + .../meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend create mode 100644 meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend new file mode 100644 index 000000000..83a929746 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:" diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json new file mode 100644 index 000000000..5d8510ee6 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json @@ -0,0 +1,2 @@ +{"id": 32, "revision": 1, "addn_dev_support": 141, + "manuf_id": 52538, "prod_id": 130, "aux": 0} -- cgit v1.2.3 From b73f730d756c2129902b73d17639bd948ca5b171 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Mon, 28 Dec 2020 05:43:35 +0000 Subject: meta-ampere: remove Mt.Jade dts patch As the Mt.Jade device tree file was picked up to openbmc/linux repository, need to remove the dts patch file to avoid conflict Tested: compile Mt.Jade OpenBMC successfully Signed-off-by: Thang Q. Nguyen Change-Id: I518888feb64bc2b806cbae113cded4d69135611b --- ...eed-Add-device-tree-for-Ampere-s-Mt.-Jade.patch | 599 --------------------- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 1 - 2 files changed, 600 deletions(-) delete mode 100644 meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-device-tree-for-Ampere-s-Mt.-Jade.patch diff --git a/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-device-tree-for-Ampere-s-Mt.-Jade.patch b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-device-tree-for-Ampere-s-Mt.-Jade.patch deleted file mode 100644 index b517fd1d0..000000000 --- a/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-device-tree-for-Ampere-s-Mt.-Jade.patch +++ /dev/null @@ -1,599 +0,0 @@ -From 5c45537b1d74c22cd95c196bf261b3ee3aa4856f Mon Sep 17 00:00:00 2001 -From: Quan Nguyen -Date: Thu, 12 Nov 2020 13:42:43 +0700 -Subject: [PATCH 2/2] ARM: dts: aspeed: Add device tree for Ampere's Mt. Jade - BMC - -The Mt. Jade BMC is an ASPEED AST2500-based BMC for the Mt. Jade -hardware reference platform with Ampere's Altra Processor Family. - -Reviewed-by: Andrew Jeffery -Reviewed-by: Joel Stanley -Signed-off-by: Quan Nguyen -Signed-off-by: Phong Vo -Signed-off-by: Thang Q. Nguyen ---- - arch/arm/boot/dts/Makefile | 1 + - .../arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 558 ++++++++++++++++++ - 2 files changed, 559 insertions(+) - create mode 100644 arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 9f9f3e49132a..5da5e8f93554 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -1398,6 +1398,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ - aspeed-ast2500-evb.dtb \ - aspeed-ast2600-evb.dtb \ - aspeed-bmc-amd-ethanolx.dtb \ -+ aspeed-bmc-ampere-mtjade.dtb \ - aspeed-bmc-arm-centriq2400-rep.dtb \ - aspeed-bmc-arm-stardragon4800-rep2.dtb \ - aspeed-bmc-bytedance-g220a.dtb \ -diff --git a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts -new file mode 100644 -index 000000000000..8f5ec22e51c2 ---- /dev/null -+++ b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts -@@ -0,0 +1,558 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/dts-v1/; -+#include "aspeed-g5.dtsi" -+#include -+ -+/ { -+ model = "Ampere Mt. Jade BMC"; -+ compatible = "ampere,mtjade-bmc", "aspeed,ast2500"; -+ -+ chosen { -+ stdout-path = &uart5; -+ bootargs = "console=ttyS4,115200 earlyprintk"; -+ }; -+ -+ memory@80000000 { -+ reg = <0x80000000 0x20000000>; -+ }; -+ -+ reserved-memory { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ ranges; -+ -+ vga_memory: framebuffer@9f000000 { -+ no-map; -+ reg = <0x9f000000 0x01000000>; /* 16M */ -+ }; -+ -+ gfx_memory: framebuffer { -+ size = <0x01000000>; -+ alignment = <0x01000000>; -+ compatible = "shared-dma-pool"; -+ reusable; -+ }; -+ -+ video_engine_memory: jpegbuffer { -+ size = <0x02000000>; /* 32M */ -+ alignment = <0x01000000>; -+ compatible = "shared-dma-pool"; -+ reusable; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ fault { -+ gpios = <&gpio ASPEED_GPIO(B, 6) GPIO_ACTIVE_HIGH>; -+ }; -+ -+ identify { -+ gpios = <&gpio ASPEED_GPIO(Q, 6) GPIO_ACTIVE_HIGH>; -+ }; -+ }; -+ -+ gpio-keys { -+ compatible = "gpio-keys"; -+ -+ shutdown_ack { -+ label = "SHUTDOWN_ACK"; -+ gpios = <&gpio ASPEED_GPIO(G, 2) GPIO_ACTIVE_LOW>; -+ linux,code = ; -+ }; -+ -+ reboot_ack { -+ label = "REBOOT_ACK"; -+ gpios = <&gpio ASPEED_GPIO(J, 3) GPIO_ACTIVE_LOW>; -+ linux,code = ; -+ }; -+ -+ S0_overtemp { -+ label = "S0_OVERTEMP"; -+ gpios = <&gpio ASPEED_GPIO(G, 3) GPIO_ACTIVE_LOW>; -+ linux,code = ; -+ }; -+ -+ S0_hightemp { -+ label = "S0_HIGHTEMP"; -+ gpios = <&gpio ASPEED_GPIO(J, 0) GPIO_ACTIVE_LOW>; -+ linux,code = ; -+ }; -+ -+ S0_cpu_fault { -+ label = "S0_CPU_FAULT"; -+ gpios = <&gpio ASPEED_GPIO(J, 1) GPIO_ACTIVE_HIGH>; -+ linux,code = ; -+ }; -+ -+ S1_overtemp { -+ label = "S1_OVERTEMP"; -+ gpios = <&gpio ASPEED_GPIO(Z, 6) GPIO_ACTIVE_LOW>; -+ linux,code = ; -+ }; -+ -+ S1_hightemp { -+ label = "S1_HIGHTEMP"; -+ gpios = <&gpio ASPEED_GPIO(AB, 0) GPIO_ACTIVE_LOW>; -+ linux,code = ; -+ }; -+ -+ S1_cpu_fault { -+ label = "S1_CPU_FAULT"; -+ gpios = <&gpio ASPEED_GPIO(Z, 1) GPIO_ACTIVE_HIGH>; -+ linux,code = ; -+ }; -+ -+ id_button { -+ label = "ID_BUTTON"; -+ gpios = <&gpio ASPEED_GPIO(Q, 5) GPIO_ACTIVE_LOW>; -+ linux,code = ; -+ }; -+ -+ }; -+ -+ gpioA0mux: mux-controller { -+ compatible = "gpio-mux"; -+ #mux-control-cells = <0>; -+ mux-gpios = <&gpio ASPEED_GPIO(A, 0) GPIO_ACTIVE_LOW>; -+ }; -+ -+ adc0mux: adc0mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 0>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc1mux: adc1mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 1>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc2mux: adc2mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 2>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc3mux: adc3mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 3>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc4mux: adc4mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 4>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc5mux: adc5mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 5>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc6mux: adc6mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 6>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc7mux: adc7mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 7>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc8mux: adc8mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 8>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc9mux: adc9mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 9>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc10mux: adc10mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 10>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc11mux: adc11mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 11>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc12mux: adc12mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 12>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ adc13mux: adc13mux { -+ compatible = "io-channel-mux"; -+ io-channels = <&adc 13>; -+ #io-channel-cells = <1>; -+ io-channel-names = "parent"; -+ mux-controls = <&gpioA0mux>; -+ channels = "s0", "s1"; -+ }; -+ -+ iio-hwmon { -+ compatible = "iio-hwmon"; -+ io-channels = <&adc0mux 0>, <&adc0mux 1>, -+ <&adc1mux 0>, <&adc1mux 1>, -+ <&adc2mux 0>, <&adc2mux 1>, -+ <&adc3mux 0>, <&adc3mux 1>, -+ <&adc4mux 0>, <&adc4mux 1>, -+ <&adc5mux 0>, <&adc5mux 1>, -+ <&adc6mux 0>, <&adc6mux 1>, -+ <&adc7mux 0>, <&adc7mux 1>, -+ <&adc8mux 0>, <&adc8mux 1>, -+ <&adc9mux 0>, <&adc9mux 1>, -+ <&adc10mux 0>, <&adc10mux 1>, -+ <&adc11mux 0>, <&adc11mux 1>, -+ <&adc12mux 0>, <&adc12mux 1>, -+ <&adc13mux 0>, <&adc13mux 1>; -+ }; -+ -+ iio-hwmon-adc14 { -+ compatible = "iio-hwmon"; -+ io-channels = <&adc 14>; -+ }; -+ -+ iio-hwmon-battery { -+ compatible = "iio-hwmon"; -+ io-channels = <&adc 15>; -+ }; -+}; -+ -+&fmc { -+ status = "okay"; -+ flash@0 { -+ status = "okay"; -+ m25p,fast-read; -+ label = "bmc"; -+ /* spi-max-frequency = <50000000>; */ -+#include "openbmc-flash-layout.dtsi" -+ }; -+}; -+ -+&spi1 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_spi1_default>; -+ -+ flash@0 { -+ status = "okay"; -+ m25p,fast-read; -+ label = "pnor"; -+ /* spi-max-frequency = <100000000>; */ -+ }; -+}; -+ -+&uart1 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_txd1_default -+ &pinctrl_rxd1_default -+ &pinctrl_ncts1_default -+ &pinctrl_nrts1_default>; -+}; -+ -+&uart2 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_txd2_default -+ &pinctrl_rxd2_default>; -+}; -+ -+&uart3 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_txd3_default -+ &pinctrl_rxd3_default>; -+}; -+ -+&uart4 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_txd4_default -+ &pinctrl_rxd4_default>; -+}; -+ -+/* The BMC's uart */ -+&uart5 { -+ status = "okay"; -+}; -+ -+&mac1 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; -+}; -+ -+&i2c0 { -+ status = "okay"; -+}; -+ -+&i2c1 { -+ status = "okay"; -+}; -+ -+&i2c2 { -+ status = "okay"; -+}; -+ -+&i2c3 { -+ status = "okay"; -+ eeprom@50 { -+ compatible = "microchip,24c64", "atmel,24c64"; -+ reg = <0x50>; -+ pagesize = <32>; -+ }; -+ -+ inlet_mem2: tmp175@28 { -+ compatible = "ti,tmp175"; -+ reg = <0x28>; -+ }; -+ -+ inlet_cpu: tmp175@29 { -+ compatible = "ti,tmp175"; -+ reg = <0x29>; -+ }; -+ -+ inlet_mem1: tmp175@2a { -+ compatible = "ti,tmp175"; -+ reg = <0x2a>; -+ }; -+ -+ outlet_cpu: tmp175@2b { -+ compatible = "ti,tmp175"; -+ reg = <0x2b>; -+ }; -+ -+ outlet1: tmp175@2c { -+ compatible = "ti,tmp175"; -+ reg = <0x2c>; -+ }; -+ -+ outlet2: tmp175@2d { -+ compatible = "ti,tmp175"; -+ reg = <0x2d>; -+ }; -+}; -+ -+&i2c4 { -+ status = "okay"; -+ rtc@51 { -+ compatible = "nxp,pcf85063a"; -+ reg = <0x51>; -+ }; -+}; -+ -+&i2c5 { -+ status = "okay"; -+}; -+ -+&i2c6 { -+ status = "okay"; -+ psu@58 { -+ compatible = "pmbus"; -+ reg = <0x58>; -+ }; -+ -+ psu@59 { -+ compatible = "pmbus"; -+ reg = <0x59>; -+ }; -+}; -+ -+&i2c7 { -+ status = "okay"; -+}; -+ -+&i2c8 { -+ status = "okay"; -+}; -+ -+&i2c9 { -+ status = "okay"; -+}; -+ -+&gfx { -+ status = "okay"; -+ memory-region = <&gfx_memory>; -+}; -+ -+&pinctrl { -+ aspeed,external-nodes = <&gfx &lhc>; -+}; -+ -+&pwm_tacho { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_pwm2_default &pinctrl_pwm3_default -+ &pinctrl_pwm4_default &pinctrl_pwm5_default -+ &pinctrl_pwm6_default &pinctrl_pwm7_default>; -+ -+ fan@0 { -+ reg = <0x02>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x04>; -+ }; -+ -+ fan@1 { -+ reg = <0x02>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x05>; -+ }; -+ -+ fan@2 { -+ reg = <0x03>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x06>; -+ }; -+ -+ fan@3 { -+ reg = <0x03>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x07>; -+ }; -+ -+ fan@4 { -+ reg = <0x04>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x08>; -+ }; -+ -+ fan@5 { -+ reg = <0x04>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x09>; -+ }; -+ -+ fan@6 { -+ reg = <0x05>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x0a>; -+ }; -+ -+ fan@7 { -+ reg = <0x05>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x0b>; -+ }; -+ -+ fan@8 { -+ reg = <0x06>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x0c>; -+ }; -+ -+ fan@9 { -+ reg = <0x06>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x0d>; -+ }; -+ -+ fan@10 { -+ reg = <0x07>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x0e>; -+ }; -+ -+ fan@11 { -+ reg = <0x07>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x0f>; -+ }; -+ -+}; -+ -+&vhub { -+ status = "okay"; -+}; -+ -+&adc { -+ status = "okay"; -+}; -+ -+&video { -+ status = "okay"; -+ memory-region = <&video_engine_memory>; -+}; -+ -+&gpio { -+ gpio-line-names = -+ /*A0-A7*/ "","","","S0_BMC_SPECIAL_BOOT","","","","", -+ /*B0-B7*/ "BMC_SELECT_EEPROM","","","", -+ "POWER_BUTTON","","","", -+ /*C0-C7*/ "","","","","","","","", -+ /*D0-D7*/ "","","","","","","","", -+ /*E0-E7*/ "","","","","","","","", -+ /*F0-F7*/ "","","BMC_SYS_PSON_L","S0_DDR_SAVE","PGOOD", -+ "S1_DDR_SAVE","","", -+ /*G0-G7*/ "S0_FW_BOOT_OK","SHD_REQ_L","","S0_OVERTEMP_L","","", -+ "","", -+ /*H0-H7*/ "","","","","","","","", -+ /*I0-I7*/ "","","S1_BMC_SPECIAL_BOOT","","","","","", -+ /*J0-J7*/ "S0_HIGHTEMP_L","S0_FAULT_L","S0_SCP_AUTH_FAIL_L","", -+ "","","","", -+ /*K0-K7*/ "","","","","","","","", -+ /*L0-L7*/ "","","","BMC_SYSRESET_L","SPI_AUTH_FAIL_L","","","", -+ /*M0-M7*/ "","","","","","","","", -+ /*N0-N7*/ "","","","","","","","", -+ /*O0-O7*/ "","","","","","","","", -+ /*P0-P7*/ "","","","","","","","", -+ /*Q0-Q7*/ "","","","","","UID_BUTTON","","", -+ /*R0-R7*/ "","","BMC_EXT_HIGHTEMP_L","","","RESET_BUTTON","","", -+ /*S0-S7*/ "","","","","","","","", -+ /*T0-T7*/ "","","","","","","","", -+ /*U0-U7*/ "","","","","","","","", -+ /*V0-V7*/ "","","","","","","","", -+ /*W0-W7*/ "","","","","","","","", -+ /*X0-X7*/ "","","","","","","","", -+ /*Y0-Y7*/ "","","","","","","","", -+ /*Z0-Z7*/ "S0_BMC_PLIMIT","S1_FAULT_L","S1_FW_BOOT_OK","","", -+ "S1_SCP_AUTH_FAIL_L","S1_OVERTEMP_L","", -+ /*AA0-AA7*/ "","","","","","","","", -+ /*AB0-AB7*/ "S1_HIGHTEMP_L","S1_BMC_PLIMIT","S0_BMC_DDR_ADDR", -+ "S1_BMC_DDR_ADR","","","","", -+ /*AC0-AC7*/ "SYS_PWR_GD","","","","","BMC_READY","SLAVE_PRESENT_L", -+ "BMC_OCP_PG"; -+}; --- -2.28.0 - diff --git a/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend index 109cc0721..d95f27602 100644 --- a/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -2,6 +2,5 @@ FILESEXTRAPATHS_prepend_mtjade := "${THISDIR}/${PN}:" SRC_URI += " \ file://${MACHINE}.cfg \ - file://0001-ARM-dts-aspeed-Add-device-tree-for-Ampere-s-Mt.-Jade.patch \ " -- cgit v1.2.3 From e37d98b766a26c073d78af823915d4c8b0381559 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Mon, 28 Dec 2020 07:46:59 +0000 Subject: meta-ampere: mtjade: Add on-board sensors Support for Mt. Jade on-board sensors including fans, battery, PSUs, voltage and temperature sensors. Tested: check sensor reading from WebUI. All on-board sensors are displayed with reasonable values. Signed-off-by: Thu Nguyen Signed-off-by: Thang Q. Nguyen Change-Id: I60abc8ae946ef95c09903ebc5d95d15db6161c1a --- .../apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf | 5 + .../apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf | 5 + .../apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf | 5 + .../apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf | 5 + .../apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf | 5 + .../apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf | 5 + .../ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf | 15 ++ .../ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf | 15 ++ .../ahb/apb/pwm-tacho-controller@1e786000.conf | 84 ++++++++++ .../obmc/mtjade/hwmon/iio-hwmon-adc14.conf | 6 + .../obmc/mtjade/hwmon/iio-hwmon-battery.conf | 13 ++ .../obmc/mtjade/hwmon/iio-hwmon.conf | 179 +++++++++++++++++++++ .../sensors/phosphor-hwmon_%.bbappend | 31 ++++ 13 files changed, 373 insertions(+) create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf new file mode 100644 index 000000000..2ea76ae96 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf @@ -0,0 +1,5 @@ +LABEL_temp1=TS1_Temp +CRITHI_temp1=50000 +CRITLO_temp1=1000 +WARNHI_temp1=48000 +WARNLO_temp1=3000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf new file mode 100644 index 000000000..186ae09d7 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf @@ -0,0 +1,5 @@ +LABEL_temp1=TS2_Temp +CRITHI_temp1=50000 +CRITLO_temp1=1000 +WARNHI_temp1=48000 +WARNLO_temp1=3000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf new file mode 100644 index 000000000..f87872b84 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf @@ -0,0 +1,5 @@ +LABEL_temp1=TS3_Temp +CRITHI_temp1=50000 +CRITLO_temp1=1000 +WARNHI_temp1=48000 +WARNLO_temp1=3000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf new file mode 100644 index 000000000..a2229ece9 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf @@ -0,0 +1,5 @@ +LABEL_temp1=TS4_Temp +CRITHI_temp1=50000 +CRITLO_temp1=1000 +WARNHI_temp1=48000 +WARNLO_temp1=3000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf new file mode 100644 index 000000000..4cd5b1bfc --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf @@ -0,0 +1,5 @@ +LABEL_temp1=TS5_Temp +CRITHI_temp1=50000 +CRITLO_temp1=1000 +WARNHI_temp1=48000 +WARNLO_temp1=3000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf new file mode 100644 index 000000000..6f72d2a21 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf @@ -0,0 +1,5 @@ +LABEL_temp1=TS6_Temp +CRITHI_temp1=50000 +CRITLO_temp1=1000 +WARNHI_temp1=48000 +WARNLO_temp1=3000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf new file mode 100644 index 000000000..a1ff27801 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf @@ -0,0 +1,15 @@ +LABEL_temp1= "PSU0_TEMP" +CRITHI_temp1=64000 +CRITLO_temp1=1000 +WARNHI_temp1=62000 +WARNLO_temp1=3000 + +LABEL_power2= "PSU0_POUT" + +LABEL_fan1="PSU0_fan1" +CRITHI_fan1=20300 +CRITLO_fan1=500 +WARNHI_fan1=19300 +WARNLO_fan1=600 + +INTERVAL=10000000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf new file mode 100644 index 000000000..f1e722241 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf @@ -0,0 +1,15 @@ +LABEL_temp1 = "PSU1_TEMP" +CRITHI_temp1=64000 +CRITLO_temp1=1000 +WARNHI_temp1=62000 +WARNLO_temp1=3000 + +LABEL_power2 = "PSU1_POUT" + +LABEL_fan1 = "PSU1_fan1" +CRITHI_fan1=20300 +CRITLO_fan1=500 +WARNHI_fan1=19300 +WARNLO_fan1=600 + +INTERVAL=10000000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf new file mode 100644 index 000000000..6448c37c5 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf @@ -0,0 +1,84 @@ +LABEL_fan5 = "FAN3_1" +CRITLO_fan5=500 +CRITHI_fan5=23100 +WARNLO_fan5=1600 +WARNHI_fan5=22000 + +LABEL_fan6 = "FAN3_2" +CRITLO_fan6=500 +CRITHI_fan6=23100 +WARNLO_fan6=1600 +WARNHI_fan6=22000 + +LABEL_fan7 = "FAN4_1" +CRITLO_fan7=500 +CRITHI_fan7=23100 +WARNLO_fan7=1600 +WARNHI_fan7=22000 + +LABEL_fan8 = "FAN4_2" +CRITLO_fan8=500 +CRITHI_fan8=23100 +WARNLO_fan8=1600 +WARNHI_fan8=22000 + +LABEL_fan9 = "FAN5_1" +CRITLO_fan9=500 +CRITHI_fan9=23100 +WARNLO_fan9=1600 +WARNHI_fan9=22000 + +LABEL_fan10 = "FAN5_2" +CRITLO_fan10=500 +CRITHI_fan10=23100 +WARNLO_fan10=1600 +WARNHI_fan10=22000 + +LABEL_fan11 = "FAN6_1" +CRITLO_fan11=500 +CRITHI_fan11=23100 +WARNLO_fan11=1600 +WARNHI_fan11=22000 + +LABEL_fan12 = "FAN6_2" +CRITLO_fan12=500 +CRITHI_fan12=23100 +WARNLO_fan12=1600 +WARNHI_fan12=22000 + +LABEL_fan13 = "FAN7_1" +CRITLO_fan13=500 +CRITHI_fan13=23100 +WARNLO_fan13=1600 +WARNHI_fan13=22000 + +LABEL_fan14 = "FAN7_2" +CRITLO_fan14=500 +CRITHI_fan14=23100 +WARNLO_fan14=1600 +WARNHI_fan14=22000 + +LABEL_fan15 = "FAN8_1" +CRITLO_fan15=500 +CRITHI_fan15=23100 +WARNLO_fan15=1600 +WARNHI_fan15=22000 + +LABEL_fan16 = "FAN8_2" +CRITLO_fan16=500 +CRITHI_fan16=23100 +WARNLO_fan16=1600 +WARNHI_fan16=22000 + +PWM_TARGET_fan5 = "3" +PWM_TARGET_fan6 = "3" +PWM_TARGET_fan7 = "4" +PWM_TARGET_fan8 = "4" +PWM_TARGET_fan9 = "5" +PWM_TARGET_fan10 = "5" +PWM_TARGET_fan11 = "6" +PWM_TARGET_fan12 = "6" +PWM_TARGET_fan13 = "7" +PWM_TARGET_fan14 = "7" +PWM_TARGET_fan15 = "8" +PWM_TARGET_fan16 = "8" diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf new file mode 100644 index 000000000..d144cfd28 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf @@ -0,0 +1,6 @@ +LABEL_in1=3V3_SB +GAIN_in1=3 +CRITHI_in1=3960 +CRITLO_in1=2320 +WARNHI_in1=3920 +WARNLO_in1=2360 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf new file mode 100644 index 000000000..50a45e3b4 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf @@ -0,0 +1,13 @@ +LABEL_in1=VBAT_RTC +GAIN_in1=3 +CRITHI_in1=3564 +CRITLO_in1=2106 +WARNHI_in1=3528 +WARNLO_in1=2142 + +# GPIOS4 needs to be pulled high for battery voltage reading +GPIOCHIP_in1=0 +GPIO_in1=148 + +# Read it every day so it does not impact battery life +INTERVAL=86400000000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf new file mode 100644 index 000000000..46b975d7c --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf @@ -0,0 +1,179 @@ +LABEL_in1=S0_0V8_VDDC_SOC +CRITHI_in1=960 +CRITLO_in1=560 +WARNHI_in1=950 +WARNLO_in1=570 + +LABEL_in2=S1_0V8_VDDC_SOC +CRITHI_in2=960 +CRITLO_in2=560 +WARNHI_in2=950 +WARNLO_in2=570 + +LABEL_in3=S0_0V75_PCP +CRITHI_in3=1323 +CRITLO_in3=504 +WARNHI_in3=1295 +WARNLO_in3=532 + +LABEL_in4=S1_0V75_PCP +CRITHI_in4=1323 +CRITLO_in4=504 +WARNHI_in4=1295 +WARNLO_in4=532 + +LABEL_in5=S0_1V2_VDDQ0123 +CRITHI_in5=1442 +CRITLO_in5=840 +WARNHI_in5=1330 +WARNLO_in5=854 + +LABEL_in6=S1_1V2_VDDQ0123 +CRITHI_in6=1442 +CRITLO_in6=840 +WARNHI_in6=1330 +WARNLO_in6=854 + +LABEL_in7=S0_0V6_VTT0123 +CRITHI_in7=720 +CRITLO_in7=420 +WARNHI_in7=712 +WARNLO_in7=428 + +LABEL_in8=S1_0V6_VTT0123 +CRITHI_in8=720 +CRITLO_in8=420 +WARNHI_in8=648 +WARNLO_in8=460 + +LABEL_in9=S0_2V5_VPP0123 +GAIN_in9=2 +CRITHI_in9=3000 +CRITLO_in9=1755 +WARNHI_in9=2970 +WARNLO_in9=1785 + +LABEL_in10=S1_2V5_VPP0123 +GAIN_in10=2 +CRITHI_in10=3000 +CRITLO_in10=1755 +WARNHI_in10=2970 +WARNLO_in10=1785 + +LABEL_in11=S0_1V2_VDDQ4567 +CRITHI_in11=1442 +CRITLO_in11=840 +WARNHI_in11=1330 +WARNLO_in11=854 + +LABEL_in12=S1_1V2_VDDQ4567 +CRITHI_in12=1442 +CRITLO_in12=840 +WARNHI_in12=1330 +WARNLO_in12=854 + +LABEL_in13=S0_0V6_VTT4567 +CRITHI_in13=720 +CRITLO_in13=420 +WARNHI_in13=712 +WARNLO_in13=428 + +LABEL_in14=S1_0V6_VTT4567 +CRITHI_in14=720 +CRITLO_in14=420 +WARNHI_in14=712 +WARNLO_in14=428 + +LABEL_in15=S0_2V5_VPP4567 +GAIN_in15=2 +CRITHI_in15=3000 +CRITLO_in15=1755 +WARNHI_in15=2970 +WARNLO_in15=1785 + +LABEL_in16=S1_2V5_VPP4567 +GAIN_in16=2 +CRITHI_in16=3000 +CRITLO_in16=1755 +WARNHI_in16=2970 +WARNLO_in16=1785 + +LABEL_in17=S0_0V85_RCA +CRITHI_in17=1020 +CRITLO_in17=595 +WARNHI_in17=1005 +WARNLO_in17=610 + +LABEL_in18=S1_0V85_RCA +CRITHI_in18=1020 +CRITLO_in18=595 +WARNHI_in18=1005 +WARNLO_in18=610 + +LABEL_in19=S0_1V8_VDDH +GAIN_in19=2 +CRITHI_in19=2156 +CRITLO_in19=1265 +WARNHI_in19=2134 +WARNLO_in19=1287 + +LABEL_in20=S1_1V8_VDDH +GAIN_in20=2 +CRITHI_in20=2156 +CRITLO_in20=1265 +WARNHI_in20=2134 +WARNLO_in20=1287 + +LABEL_in21=S0_1V5_VDDH +CRITHI_in21=1800 +CRITLO_in21=1053 +WARNHI_in21=1782 +WARNLO_in21=1071 + +LABEL_in22=S1_1V5_VDDH +CRITHI_in22=1800 +CRITLO_in22=1053 +WARNHI_in22=1782 +WARNLO_in22=1071 + +LABEL_in23=S0_1V8_SOC +GAIN_in23=2 +CRITHI_in23=2156 +CRITLO_in23=1265 +WARNHI_in23=2134 +WARNLO_in23=1287 + +LABEL_in24=S1_1V8_SOC +GAIN_in24=2 +CRITHI_in24=2156 +CRITLO_in24=1265 +WARNHI_in24=2134 +WARNLO_in24=1287 + +LABEL_in25=S0_1V8_PCP +GAIN_in25=2 +CRITHI_in25=2156 +CRITLO_in25=1265 +WARNHI_in25=2134 +WARNLO_in25=1287 + +LABEL_in26=S1_1V8_PCP +GAIN_in26=2 +CRITHI_in26=2156 +CRITLO_in26=1265 +WARNHI_in26=2134 +WARNLO_in26=1287 + +LABEL_in27=S0_3V3_SOC +GAIN_in27=3 +CRITHI_in27=3960 +CRITLO_in27=2320 +WARNHI_in27=3920 +WARNLO_in27=2360 + +LABEL_in28=S1_3V3_SOC +GAIN_in28=3 +CRITHI_in28=3960 +CRITLO_in28=2320 +WARNHI_in28=3920 +WARNLO_in28=2360 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend new file mode 100644 index 000000000..e69b83e14 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -0,0 +1,31 @@ +FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:" + +EXTRA_OECONF_append_mtjade = " --enable-negative-errno-on-fail" + +CHIPS_mtjade = " \ + bus@1e78a000/i2c-bus@100/tmp175@28 \ + bus@1e78a000/i2c-bus@100/tmp175@29 \ + bus@1e78a000/i2c-bus@100/tmp175@2a \ + bus@1e78a000/i2c-bus@100/tmp175@2b \ + bus@1e78a000/i2c-bus@100/tmp175@2c \ + bus@1e78a000/i2c-bus@100/tmp175@2d \ + bus@1e78a000/i2c-bus@1c0/psu@58 \ + bus@1e78a000/i2c-bus@1c0/psu@59 \ + pwm-tacho-controller@1e786000 \ + " + +ITEMSFMT = "ahb/apb/{0}.conf" + +ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS_${MACHINE}')}" + +ITEMS += "iio-hwmon.conf iio-hwmon-adc14.conf iio-hwmon-battery.conf" + +ENVS = "obmc/${MACHINE}/hwmon/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" + +do_install_append_mtjade() { + SOURCEDIR="${WORKDIR}/obmc/${MACHINE}/hwmon" + DESTDIR="${D}${sysconfdir}/default/obmc" + install -d ${DESTDIR} + cp -r ${SOURCEDIR} ${DESTDIR} +} -- cgit v1.2.3 From e9e3d5c76872873b8debdfc80ce7ab42317461b8 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Tue, 29 Dec 2020 07:18:26 +0000 Subject: meta-ampere: mtjade: Enable Redfish support for on-board sensors Map FAN, temperature and voltage sensors with Redfish chassis instance and enables association feature in phosphor-inventory-manager. The bmcweb looks for the sensors associated with a chassis instance in the association list. The list, which is associations.json file in phosphor-inventory-manager, maps the dbus sensor objects to a chassis inventory. Tested: 1. Check power/voltage sensors reported in redfish/v1/Chassis/chassis/Power. 2. Check FANs/thermal sensors reported in redfish/v1/Chassis/chassis/Thermal. Signed-off-by: Thang Q. Nguyen Change-Id: Ie62a1c1a4edeaf165f834f7456c26711b4b42701 --- .../inventory/inventory-cleanup.bb | 17 +++++ .../inventory-cleanup/inventory-cleanup.yaml | 16 +++++ .../phosphor-inventory-manager/associations.json | 72 ++++++++++++++++++++++ .../phosphor-inventory-manager_%.bbappend | 10 +++ 4 files changed, 115 insertions(+) create mode 100644 meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb create mode 100644 meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml create mode 100644 meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json create mode 100644 meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb new file mode 100644 index 000000000..0c4b56f72 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb @@ -0,0 +1,17 @@ +SUMMARY = "Copy the inventory cleanup yaml for inventory manager" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch +inherit phosphor-inventory-manager + +S = "${WORKDIR}" + +SRC_URI = "file://inventory-cleanup.yaml" + +do_install() { + install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml +} + +FILES_${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml new file mode 100644 index 000000000..e900ad789 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml @@ -0,0 +1,16 @@ +description: > + Mt.Jade inventory fixups + +events: + - name: Add Chassis interface + description: > + Add the chassis interface on the chassis inventory path + type: startup + actions: + - name: createObjects + objs: + /system/chassis: + xyz.openbmc_project.Inventory.Item.Chassis: + Type: + value: "RackMount" + type: string diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json new file mode 100644 index 000000000..bc9cfee32 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json @@ -0,0 +1,72 @@ +[ + { + "path": "system/chassis", + "endpoints": + [ + { + "types": + { + "rType": "chassis", + "fType": "all_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/FAN3_1", + "/xyz/openbmc_project/sensors/fan_tach/FAN3_2", + "/xyz/openbmc_project/sensors/fan_tach/FAN4_1", + "/xyz/openbmc_project/sensors/fan_tach/FAN4_2", + "/xyz/openbmc_project/sensors/fan_tach/FAN5_1", + "/xyz/openbmc_project/sensors/fan_tach/FAN5_2", + "/xyz/openbmc_project/sensors/fan_tach/FAN6_1", + "/xyz/openbmc_project/sensors/fan_tach/FAN6_2", + "/xyz/openbmc_project/sensors/fan_tach/FAN7_1", + "/xyz/openbmc_project/sensors/fan_tach/FAN7_2", + "/xyz/openbmc_project/sensors/fan_tach/FAN8_1", + "/xyz/openbmc_project/sensors/fan_tach/FAN8_2", + "/xyz/openbmc_project/sensors/fan_tach/PSU0_fan1", + "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1", + + "/xyz/openbmc_project/sensors/temperature/TS1_Temp", + "/xyz/openbmc_project/sensors/temperature/TS2_Temp", + "/xyz/openbmc_project/sensors/temperature/TS3_Temp", + "/xyz/openbmc_project/sensors/temperature/TS4_Temp", + "/xyz/openbmc_project/sensors/temperature/TS5_Temp", + "/xyz/openbmc_project/sensors/temperature/TS6_Temp", + "/xyz/openbmc_project/sensors/temperature/PSU0_TEMP", + "/xyz/openbmc_project/sensors/temperature/PSU1_TEMP", + + "/xyz/openbmc_project/sensors/voltage/S0_0V6_VTT0123", + "/xyz/openbmc_project/sensors/voltage/S0_0V6_VTT4567", + "/xyz/openbmc_project/sensors/voltage/S0_0V75_PCP", + "/xyz/openbmc_project/sensors/voltage/S0_0V8_VDDC_SOC", + "/xyz/openbmc_project/sensors/voltage/S0_0V85_RCA", + "/xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ0123", + "/xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ4567", + "/xyz/openbmc_project/sensors/voltage/S0_1V5_VDDH", + "/xyz/openbmc_project/sensors/voltage/S0_1V8_VDDH", + "/xyz/openbmc_project/sensors/voltage/S0_1V8_SOC", + "/xyz/openbmc_project/sensors/voltage/S0_1V8_PCP", + "/xyz/openbmc_project/sensors/voltage/S0_2V5_VPP0123", + "/xyz/openbmc_project/sensors/voltage/S0_2V5_VPP4567", + "/xyz/openbmc_project/sensors/voltage/S0_3V3_SOC", + "/xyz/openbmc_project/sensors/voltage/S1_0V6_VTT0123", + "/xyz/openbmc_project/sensors/voltage/S1_0V6_VTT4567", + "/xyz/openbmc_project/sensors/voltage/S1_0V75_PCP", + "/xyz/openbmc_project/sensors/voltage/S1_0V8_VDDC_SOC", + "/xyz/openbmc_project/sensors/voltage/S1_0V85_RCA", + "/xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ0123", + "/xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ4567", + "/xyz/openbmc_project/sensors/voltage/S1_1V5_VDDH", + "/xyz/openbmc_project/sensors/voltage/S1_1V8_VDDH", + "/xyz/openbmc_project/sensors/voltage/S1_1V8_SOC", + "/xyz/openbmc_project/sensors/voltage/S1_1V8_PCP", + "/xyz/openbmc_project/sensors/voltage/S1_2V5_VPP0123", + "/xyz/openbmc_project/sensors/voltage/S1_2V5_VPP4567", + "/xyz/openbmc_project/sensors/voltage/S1_3V3_SOC", + "/xyz/openbmc_project/sensors/voltage/3V3_SB", + "/xyz/openbmc_project/sensors/voltage/VBAT_RTC" + ] + } + ] + } +] diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend new file mode 100644 index 000000000..a8856809b --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -0,0 +1,10 @@ +DEPENDS_append_mtjade = " inventory-cleanup" + +FILESEXTRAPATHS_prepend_mtjade := "${THISDIR}/${PN}:" +PACKAGECONFIG_append_mtjade = " associations" +SRC_URI_append_mtjade = " file://associations.json" + +do_install_append_mtjade() { + install -d ${D}${base_datadir} + install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir} +} -- cgit v1.2.3 From b2be305f27e3cc8622ccdb2a7f4c50c897156d51 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Wed, 6 Jan 2021 10:56:52 -0800 Subject: Add Owners Plugin to meta-ampere Please see https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/39379 for details about why this is necessary. Signed-off-by: Ed Tanous Change-Id: Ib92e7c8c335b443728754e531c5d13ca869636f8 --- meta-ampere/OWNERS | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 meta-ampere/OWNERS diff --git a/meta-ampere/OWNERS b/meta-ampere/OWNERS new file mode 100644 index 000000000..e7e9b1721 --- /dev/null +++ b/meta-ampere/OWNERS @@ -0,0 +1,3 @@ +owners: +- Thang Q. Nguyen +- Tung Nguyen -- cgit v1.2.3 From 44cf8fd254c30e94cf4f0b90608bd9b6ef2ae292 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Tue, 22 Dec 2020 04:27:36 +0000 Subject: meta-ampere:mtjade:u-boot: Pass system reset status to kernel via bootargs Backport a patch file from meta-yadro/meta-nicole/recipes-bsp/u-boot/ to add the Aspeed reset reason to bootargs so kernel so kernel application can query it. Tested: /proc/cmdline must contain: - resetreason=power after A/C power - resetreason=watchdog after bmc reboot Signed-off-by: Chanh Nguyen Signed-off-by: Thang Q. Nguyen Change-Id: I7e75cccfa0fecfa9a66572e02de0f1c8c1d519a1 --- ...ort-passing-system-reset-status-to-kernel.patch | 180 +++++++++++++++++++++ .../recipes-bsp/u-boot/u-boot-aspeed_%.bbappend | 1 + 2 files changed, 181 insertions(+) create mode 100644 meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0003-aspeed-support-passing-system-reset-status-to-kernel.patch diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0003-aspeed-support-passing-system-reset-status-to-kernel.patch b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0003-aspeed-support-passing-system-reset-status-to-kernel.patch new file mode 100644 index 000000000..0381b5d84 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0003-aspeed-support-passing-system-reset-status-to-kernel.patch @@ -0,0 +1,180 @@ +From af4353ab19aaf29dc68ff89a0d581102ca5be43c Mon Sep 17 00:00:00 2001 +From: "Thang Q. Nguyen" +Date: Wed, 6 Jan 2021 06:33:36 +0000 +Subject: [PATCH] aspeed: support passing system reset status to kernel via + bootargs + +This is a backport of the patch file from +openbmc/meta-yadro/meta-nicole/recipes-bsp/u-boot/ +to add the Aspeed reset reason to bootargs so kernel applications +can query it. + +Test case: /proc/cmdline must contain: + - resetreason=power after cold bmc boot + - resetreason=watchdog after warm bmc reboot + +Signed-off-by: Chanh Nguyen +Signed-off-by: Thang Q. Nguyen +--- + arch/arm/include/asm/arch-aspeed/ast_scu.h | 2 +- + arch/arm/mach-aspeed/ast-scu.c | 6 +- + board/aspeed/ast-g5/ast-g5.c | 81 ++++++++++++++++++++++ + 3 files changed, 87 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/include/asm/arch-aspeed/ast_scu.h b/arch/arm/include/asm/arch-aspeed/ast_scu.h +index d2c010a0dc..f5c9126ec0 100644 +--- a/arch/arm/include/asm/arch-aspeed/ast_scu.h ++++ b/arch/arm/include/asm/arch-aspeed/ast_scu.h +@@ -29,7 +29,7 @@ + #define __AST_SCU_H + + extern void ast_scu_show_system_info (void); +-extern void ast_scu_sys_rest_info(void); ++extern u32 ast_scu_sys_rest_info(void); + extern void ast_scu_security_info(void); + extern u32 ast_scu_revision_id(void); + extern u32 ast_scu_get_vga_memsize(void); +diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c +index ef90ef3805..c7ab66415f 100644 +--- a/arch/arm/mach-aspeed/ast-scu.c ++++ b/arch/arm/mach-aspeed/ast-scu.c +@@ -494,22 +494,26 @@ void ast_scu_security_info(void) + } + } + +-void ast_scu_sys_rest_info(void) ++u32 ast_scu_sys_rest_info(void) + { + u32 rest = ast_scu_read(AST_SCU_SYS_CTRL); + + if (rest & SCU_SYS_EXT_RESET_FLAG) { + printf("RST : External\n"); + ast_scu_write(SCU_SYS_EXT_RESET_FLAG, AST_SCU_SYS_CTRL); ++ rest = SCU_SYS_EXT_RESET_FLAG; + } else if (rest & SCU_SYS_WDT_RESET_FLAG) { + printf("RST : Watchdog\n"); + ast_scu_write(SCU_SYS_WDT_RESET_FLAG, AST_SCU_SYS_CTRL); ++ rest = SCU_SYS_WDT_RESET_FLAG; + } else if (rest & SCU_SYS_PWR_RESET_FLAG) { + printf("RST : Power On\n"); + ast_scu_write(SCU_SYS_PWR_RESET_FLAG, AST_SCU_SYS_CTRL); ++ rest = SCU_SYS_PWR_RESET_FLAG; + } else { + printf("RST : CLK en\n"); + } ++ return rest; + } + + u32 ast_scu_get_vga_memsize(void) +diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c +index 9bf6c905fe..9e27bce0f5 100644 +--- a/board/aspeed/ast-g5/ast-g5.c ++++ b/board/aspeed/ast-g5/ast-g5.c +@@ -8,6 +8,8 @@ + */ + + #include ++#include ++#include + #include + + #include +@@ -25,9 +27,76 @@ int board_init(void) + } + + #ifdef CONFIG_BOARD_LATE_INIT ++static void update_bootargs_cmd(const char *key, const char *value) ++{ ++ int buf_len; ++ char *buf; ++ char *cmdline; ++ char *end = NULL; ++ ++ if (!key || (key[0] == '\0')) { ++ printf("%s: Empty key not allowed\n", __func__); ++ return; ++ } ++ ++ cmdline = getenv("bootargs"); ++ ++ /* Allocate space for maximum possible new command line */ ++ buf_len = (cmdline ? strlen(cmdline) : 0) ++ + 1 /* spacebar as delimiter */ ++ + strlen(key) ++ + (value ? 1 /* equal sign */ + strlen(value) : 0) ++ + 1 /* terminating null */; ++ ++ buf = calloc(buf_len, sizeof(char)); ++ if (!buf) { ++ printf("%s: out of memory\n", __func__); ++ return; ++ } ++ ++ if (cmdline) ++ { ++ char *start = strstr(cmdline, key); ++ ++ /* Check for full word match. Match should be start of cmdline ++ * or there should be space before match ++ **/ ++ if (start && ((start == cmdline) || (*(start - 1) == ' '))) { ++ strncat(buf, cmdline, (start - cmdline)); ++ ++ /* Find the end of the keyword[=value] pair, ++ * including a single training space character, if any. ++ * Skip the found substring, mark the tail of cmdline. ++ **/ ++ end = strchr(start, ' '); ++ if (end) { ++ end++; ++ } ++ } else { ++ strcat(buf, cmdline); ++ strcat(buf, " "); ++ } ++ } ++ ++ strcat(buf, key); ++ if (value) { ++ strcat(buf, "="); ++ strcat(buf, value); ++ } ++ ++ if (end) { ++ strcat(buf, " "); ++ strcat(buf, end); ++ } ++ ++ setenv("bootargs", buf); ++ free(buf); ++} ++ + int board_late_init(void) + { + u32 val; ++ u32 reset_reason = ast_scu_sys_rest_info(); + + /* Switch PWM to GPIO mode to make FAN run in max speed */ + ast_scu_switch_pwm_to_gpio_mode(); +@@ -44,6 +113,18 @@ int board_late_init(void) + writel(0xaa, AST_SCU_BASE); + #endif + ++ if (reset_reason & SCU_SYS_EXT_RESET_FLAG) { ++ update_bootargs_cmd("resetreason", "external"); ++ } else if (reset_reason & SCU_SYS_WDT_RESET_FLAG) { ++ update_bootargs_cmd("resetreason", "watchdog"); ++ } else if (reset_reason & SCU_SYS_PWR_RESET_FLAG) { ++ update_bootargs_cmd("resetreason", "power"); ++ } else { ++ char value[32]; ++ snprintf(value, sizeof(value) - 1, "0x%x", reset_reason); ++ update_bootargs_cmd("resetreason", value); ++ } ++ + return 0; + } + #endif +-- +2.25.1 + diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index c40bfcd02..77a58f523 100644 --- a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -3,4 +3,5 @@ FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch \ file://0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch \ + file://0003-aspeed-support-passing-system-reset-status-to-kernel.patch \ " -- cgit v1.2.3 From 189431e93efb0dfd7efa69c40fead8bd11a9b01a Mon Sep 17 00:00:00 2001 From: Tung Nguyen Date: Wed, 16 Dec 2020 08:11:51 +0000 Subject: meta-ampere: Support solssh Support solssh for Mt.Jade system. It opens these ssh ports: 2200 - CPU console 2201 - SCP 0 concole 2202 - ATF console 2203 - SCP 1 console Tested: - connect to ssh ports - make sure the console are displayed correctly Signed-off-by: Tung Nguyen Change-Id: Ic0be980f201c0176ca00fd07804c101f404e707a --- .../console/obmc-console/ampere_uartmux_ctrl.sh | 84 ++++++++++++++++++++++ .../obmc-console/obmc-console-server-setup.sh | 42 +++++++++++ .../obmc-console/obmc-console-ttyS0-ssh.socket | 10 +++ .../obmc-console/obmc-console-ttyS0-ssh@.service | 12 ++++ .../obmc-console/obmc-console-ttyS1-ssh.socket | 10 +++ .../obmc-console/obmc-console-ttyS1-ssh@.service | 12 ++++ .../obmc-console/obmc-console-ttyS2-ssh.socket | 10 +++ .../obmc-console/obmc-console-ttyS2-ssh@.service | 12 ++++ .../obmc-console/obmc-console-ttyS3-ssh.socket | 10 +++ .../obmc-console/obmc-console-ttyS3-ssh@.service | 12 ++++ .../console/obmc-console/obmc-console@.service | 17 +++++ .../console/obmc-console/server.ttyS0.conf | 3 + .../console/obmc-console/server.ttyS1.conf | 4 ++ .../console/obmc-console/server.ttyS2.conf | 4 ++ .../console/obmc-console/server.ttyS3.conf | 4 ++ .../console/obmc-console_%.bbappend | 54 ++++++++++++++ 16 files changed, 300 insertions(+) create mode 100755 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/ampere_uartmux_ctrl.sh create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-server-setup.sh create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS0-ssh.socket create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS0-ssh@.service create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS1-ssh.socket create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS1-ssh@.service create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS2-ssh.socket create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS2-ssh@.service create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS3-ssh.socket create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS3-ssh@.service create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console@.service create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf create mode 100644 meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/ampere_uartmux_ctrl.sh b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/ampere_uartmux_ctrl.sh new file mode 100755 index 000000000..58fffd8fe --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/ampere_uartmux_ctrl.sh @@ -0,0 +1,84 @@ +#!/bin/bash +# +# Copyright (c) 2020 Ampere Computing LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Ampere Computing LLC: UART MUX/DEMUX for CPU0 UART0,1,4 and CPU1 UART1 +# Usage: ampere_uartmux_ctrl.sh +# of 1 sets CPU To HDR_CONN +# of 2 sets BMC to CPU (eg dropbear ssh server on port 2200) + +if [ $# -lt 2 ]; then + exit 1 +fi + +function set_gpio_active_low() { + if [ $# -ne 2 ]; then + echo "set_gpio_active_low: need both GPIO# and initial level"; + return; + fi + + if [ ! -d /sys/class/gpio/gpio$1 ]; then + echo $1 > /sys/class/gpio/export + fi + echo $2 > /sys/class/gpio/gpio$1/direction +} + +GPIO_BASE=$(cat /sys/class/gpio/gpio*/base) + +case "$1" in + 1) GPIO_UARTx_MODE0=56 + # CPU0 UART0 connects to BMC UART1 + CONSOLE_PORT=0 + ;; + 2) GPIO_UARTx_MODE0=57 + # CPU0 UART1 connects to BMC UART2 + CONSOLE_PORT=1 + ;; + 3) GPIO_UARTx_MODE0=58 + # CPU0 UART4 connects to BMC UART3 + CONSOLE_PORT=2 + ;; + 4) GPIO_UARTx_MODE0=59 + # CPU1 UART1 connects to BMC UART4 + CONSOLE_PORT=3 + ;; + *) echo "Invalid UART port selection" + exit 1 + ;; +esac + +# Only switch the MUX when there is no active connection. This means we only +# switch the MUX before the first session starts and after the last session +# closes. We do this by querying number of connected sessions to the socket +# of requested console port. +# Example format: Accepted: 1; Connected: 1; +CONNECTED=$(systemctl --no-pager status obmc-console-ttyS${CONSOLE_PORT}-ssh.socket | grep -w Connected | cut -d ':' -f 3 | tr -d ' ;') +if [ ! $CONNECTED -le 1 ]; then + exit 0 +fi + +echo "Ampere UART MUX CTRL UART port $1 to mode $2" + +case "$2" in + 1) set_gpio_active_low $((${GPIO_BASE} + ${GPIO_UARTx_MODE0})) low + exit 0 + ;; + 2) set_gpio_active_low $((${GPIO_BASE} + ${GPIO_UARTx_MODE0})) high + exit 0 + ;; + *) echo "Invalid UART mode selection" + exit 1 + ;; +esac diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-server-setup.sh b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-server-setup.sh new file mode 100644 index 000000000..fe2d5ab03 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-server-setup.sh @@ -0,0 +1,42 @@ +#!/bin/sh -e +# +# Copyright (c) 2020 Ampere Computing LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -euo pipefail + +tty="$1" +uart=0 + +case "${tty}" in + "ttyS0") uart=1 + ;; + "ttyS1") uart=2 + ;; + "ttyS2") uart=3 + ;; + "ttyS3") uart=4 + ;; + *) echo "Invalid tty passed to $0. Exiting!" + exit 1; + ;; +esac + +# Default the host routing through the mux to use the BMC (2) +# This allows the SoL console in webui, and the ssh port 2200, to work +# upon startup. If UART transcievers are installed on the header and required, +# this value should be set to 1 +/usr/sbin/ampere_uartmux_ctrl.sh ${uart} 2 + +/usr/sbin/obmc-console-server --config /etc/obmc-console/server.${tty}.conf ${tty} diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS0-ssh.socket b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS0-ssh.socket new file mode 100644 index 000000000..183a7a4f3 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS0-ssh.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Phosphor Host Console SSH Per-Connection socket +Wants=obmc-console@ttyS0.service + +[Socket] +ListenStream=2200 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS0-ssh@.service b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS0-ssh@.service new file mode 100644 index 000000000..f964454e0 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS0-ssh@.service @@ -0,0 +1,12 @@ +[Unit] +Description=Phosphor Host Console SSH Per-Connection +Wants=obmc-console@ttyS0.service + +[Service] +Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" +EnvironmentFile=/etc/default/dropbear +ExecStart=/usr/sbin/dropbear -i -r ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key -c "/usr/bin/obmc-console-client -c /etc/obmc-console/server.ttyS0.conf" -p ttyS0 -F $DROPBEAR_EXTRA_ARGS +SyslogIdentifier=dropbear +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket +KillMode=process diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS1-ssh.socket b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS1-ssh.socket new file mode 100644 index 000000000..bdbf56258 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS1-ssh.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Phosphor Host Console SSH Per-Connection socket +Wants=obmc-console@ttyS1.service + +[Socket] +ListenStream=2201 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS1-ssh@.service b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS1-ssh@.service new file mode 100644 index 000000000..697c24271 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS1-ssh@.service @@ -0,0 +1,12 @@ +[Unit] +Description=Phosphor Host Console SSH Per-Connection +Wants=obmc-console@ttyS1.service + +[Service] +Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" +EnvironmentFile=/etc/default/dropbear +ExecStart=/usr/sbin/dropbear -i -r ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key -c "/usr/bin/obmc-console-client -c /etc/obmc-console/server.ttyS1.conf" -p ttyS1 -F $DROPBEAR_EXTRA_ARGS +SyslogIdentifier=dropbear +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket +KillMode=process diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS2-ssh.socket b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS2-ssh.socket new file mode 100644 index 000000000..f8934fd41 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS2-ssh.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Phosphor Host Console SSH Per-Connection socket +Wants=obmc-console@ttyS2.service + +[Socket] +ListenStream=2202 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS2-ssh@.service b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS2-ssh@.service new file mode 100644 index 000000000..7d7f31490 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS2-ssh@.service @@ -0,0 +1,12 @@ +[Unit] +Description=Phosphor Host Console SSH Per-Connection +Wants=obmc-console@ttyS2.service + +[Service] +Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" +EnvironmentFile=/etc/default/dropbear +ExecStart=/usr/sbin/dropbear -i -r ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key -c "/usr/bin/obmc-console-client -c /etc/obmc-console/server.ttyS2.conf" -p ttyS2 -F $DROPBEAR_EXTRA_ARGS +SyslogIdentifier=dropbear +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket +KillMode=process diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS3-ssh.socket b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS3-ssh.socket new file mode 100644 index 000000000..fd7f3e3f9 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS3-ssh.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Phosphor Host Console SSH Per-Connection socket +Wants=obmc-console@ttyS3.service + +[Socket] +ListenStream=2203 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS3-ssh@.service b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS3-ssh@.service new file mode 100644 index 000000000..261f3a12e --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-ttyS3-ssh@.service @@ -0,0 +1,12 @@ +[Unit] +Description=Phosphor Host Console SSH Per-Connection +Wants=obmc-console@ttyS3.service + +[Service] +Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" +EnvironmentFile=/etc/default/dropbear +ExecStart=/usr/sbin/dropbear -i -r ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key -c "/usr/bin/obmc-console-client -c /etc/obmc-console/server.ttyS3.conf" -p ttyS3 -F $DROPBEAR_EXTRA_ARGS +SyslogIdentifier=dropbear +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket +KillMode=process diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console@.service new file mode 100644 index 000000000..22a5df269 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console@.service @@ -0,0 +1,17 @@ +[Unit] +Description=Phosphor Console Muxer listening on device /dev/%I +BindsTo=dev-%i.device +After=dev-%i.device +StartLimitBurst=3 +StartLimitIntervalSec=300 + +[Service] +ExecStart=/usr/sbin/obmc-console-server-setup.sh %i +SyslogIdentifier=obmc-console-server +Restart=always +RestartSec=10 +TimeoutStartSec=60 +TimeoutStopSec=60 + +[Install] +WantedBy=multi-user.target diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf new file mode 100644 index 000000000..2d02a5138 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf @@ -0,0 +1,3 @@ +local-tty = ttyS0 +local-tty-baud = 115200 +logfile = /var/log/obmc-console-cpu.log diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf new file mode 100644 index 000000000..a77188412 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf @@ -0,0 +1,4 @@ +local-tty = ttyS1 +local-tty-baud = 115200 +socket-id = ttyS1 +logfile = /var/log/obmc-console-scp0.log diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf new file mode 100644 index 000000000..7ac6953e4 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf @@ -0,0 +1,4 @@ +local-tty = ttyS2 +local-tty-baud = 115200 +socket-id = ttyS2 +logfile = /var/log/obmc-console-atf.log diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf new file mode 100644 index 000000000..0ec1b693b --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf @@ -0,0 +1,4 @@ +local-tty = ttyS3 +local-tty-baud = 115200 +socket-id = ttyS3 +logfile = /var/log/obmc-console-scp1.log diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend new file mode 100644 index 000000000..452554c28 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend @@ -0,0 +1,54 @@ +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +RDEPENDS_${PN} += "bash" + +# Remove what installed by common recipe +OBMC_CONSOLE_HOST_TTY = "" +SYSTEMD_SUBSTITUTIONS_remove += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" +SYSTEMD_SUBSTITUTIONS_remove += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" +SYSTEMD_SERVICE_${PN}_remove = " \ + ${PN}-ssh.socket \ + ${PN}-ssh@.service \ + " + +# Declare port spcific conf and service files +HOST_CONSOLE_TTY = "ttyS0 ttyS1 ttyS2 ttyS3" + +CONSOLE_CONF_FMT = "file://server.{0}.conf" +SRC_URI += "${@compose_list(d, 'CONSOLE_CONF_FMT', 'HOST_CONSOLE_TTY')}" +SRC_URI += "file://${BPN}-server-setup.sh" +SRC_URI += "file://${BPN}@.service" +SRC_URI += "file://ampere_uartmux_ctrl.sh" + +CONSOLE_SSH_SOCKET_FILE_FMT = "file://${PN}-{0}-ssh.socket" +CONSOLE_SSH_SERVICE_FILE_FMT = "file://${PN}-{0}-ssh@.service" +SRC_URI += "${@compose_list(d, 'CONSOLE_SSH_SOCKET_FILE_FMT', 'HOST_CONSOLE_TTY')}" +SRC_URI += "${@compose_list(d, 'CONSOLE_SSH_SERVICE_FILE_FMT', 'HOST_CONSOLE_TTY')}" + +CONSOLE_SSH_SOCKET_FMT = "${PN}-{0}-ssh.socket" +CONSOLE_SSH_SERVICE_FMT = "${PN}-{0}-ssh@.service" + +SYSTEMD_SERVICE_${PN} = " \ + ${PN}@.service \ + ${@compose_list(d, 'CONSOLE_SSH_SOCKET_FMT', 'HOST_CONSOLE_TTY')} \ + ${@compose_list(d, 'CONSOLE_SSH_SERVICE_FMT', 'HOST_CONSOLE_TTY')} \ + " +do_install_append() { + for i in ${HOST_CONSOLE_TTY} + do + install -m 0644 ${WORKDIR}/server.${i}.conf ${D}${sysconfdir}/${BPN}/server.${i}.conf + install -m 0644 ${WORKDIR}/${BPN}-${i}-ssh.socket ${D}${systemd_unitdir}/system/${BPN}-${i}-ssh.socket + install -m 0644 ${WORKDIR}/${BPN}-${i}-ssh@.service ${D}${systemd_unitdir}/system/${BPN}-${i}-ssh@.service + done + install -m 0755 ${WORKDIR}/${BPN}-server-setup.sh ${D}${sbindir}/${BPN}-server-setup.sh + + # Deal with files installed by the base package's .bb install function + rm -f ${D}${sysconfdir}/${BPN}.conf + rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf + rm -rf ${D}${systemd_unitdir}/system/${BPN}-ssh@.service.d/ + rm -f ${D}${systemd_unitdir}/system/${BPN}-ssh@.service + rm -f ${D}${systemd_unitdir}/system/${BPN}-ssh.socket + # Overwrite base package's obmc-console@.service with our own + install -m 0644 ${WORKDIR}/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service + install -d ${D}/usr/sbin + install -m 0755 ${WORKDIR}/ampere_uartmux_ctrl.sh ${D}/${sbindir}/ampere_uartmux_ctrl.sh +} -- cgit v1.2.3 From 25254b72534874a19e28baa00446247765ccdbde Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Thu, 7 Jan 2021 07:16:50 +0000 Subject: meta-ampere: mtjade: Add Host firmware update support Enable flash_bios feature and configure to use backend script to flash UEFI firmware via Redfish, WebUI and Rest. Tested: 1. Flash UEFI firmware via WebUI. 2. Flash UEFI firmware via Redfish UpdateService 3. Flash UEFI firmware via Rest interface. Signed-off-by: Thang Q. Nguyen Change-Id: I772e6a409414e374ed01e72e3c69985d0b413cb5 --- .../packagegroups/packagegroup-ampere-apps.bb | 8 ++ .../obmc-flash-host-bios@.service | 7 ++ .../flash/phosphor-software-manager_%.bbappend | 7 ++ meta-ampere/meta-jade/conf/machine/mtjade.conf | 13 +++ .../recipes-ampere/flash/ampere-flash-utils.bb | 23 +++++ .../flash/ampere-flash-utils/ampere_flash_bios.sh | 103 +++++++++++++++++++++ 6 files changed, 161 insertions(+) create mode 100644 meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service create mode 100644 meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend create mode 100644 meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb create mode 100755 meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb index 2990d8ec0..0831988e9 100644 --- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb +++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb @@ -7,13 +7,16 @@ inherit obmc-phosphor-utils PROVIDES = "${PACKAGES}" PACKAGES = " \ ${PN}-chassis \ + ${PN}-flash \ ${PN}-system \ " PROVIDES += "virtual/obmc-chassis-mgmt" +PROVIDES += "virtual/obmc-flash-mgmt" PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" SUMMARY_${PN}-chassis = "Ampere Chassis" @@ -25,3 +28,8 @@ RDEPENDS_${PN}-chassis = " \ SUMMARY_${PN}-system = "Ampere System" RDEPENDS_${PN}-system = " \ " + +SUMMARY_${PN}-flash = "Ampere Flash" +RDEPENDS_${PN}-flash = " \ + ampere-flash-utils \ + " diff --git a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service new file mode 100644 index 000000000..c344600b2 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service @@ -0,0 +1,7 @@ +[Unit] +Description=Ampere service for flashing the Host firmware image + +[Service] +Type=oneshot +RemainAfterExit=no +ExecStart=/usr/sbin/ampere_flash_bios.sh /tmp/images/%I/*.img diff --git a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend new file mode 100644 index 000000000..5d75c711f --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PACKAGECONFIG[flash_bios] = "-Dhost-bios-upgrade=enabled, -Dhost-bios-upgrade=disabled" + +PACKAGECONFIG_append_ = " flash_bios" + +SYSTEMD_SERVICE_${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}" diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 5999392f4..218018953 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -6,8 +6,21 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/distro/include/phosphor-isolation.inc +OBMC_MACHINE_FEATURES += "\ + obmc-phosphor-chassis-mgmt \ + obmc-phosphor-flash-mgmt \ + obmc-chassis-state-mgmt \ + obmc-bmc-state-mgmt \ + " + VOLATILE_LOG_DIR = "no" OBMC_IMAGE_EXTRA_INSTALL_append = "\ ampere-usbnet \ + ampere-flash-utils \ " + +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-ampere-apps" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-ampere-apps" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" diff --git a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb new file mode 100644 index 000000000..9b2840134 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb @@ -0,0 +1,23 @@ + +SUMMARY = "Ampere Computing LLC Flashing Utilities" +DESCRIPTION = "Application to support flashing utilities on Ampere platforms" +PR = "r0" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +RDEPENDS_${PN} = "bash" +DEPENDS = "zlib" + +SRC_URI += "\ + file://ampere_flash_bios.sh \ + " + +S = "${WORKDIR}" +ROOT = "${STAGING_DIR_TARGET}" + +LDFLAGS += "-L ${ROOT}/usr/lib/ -lz " + +do_install_append() { + install -d ${D}/usr/sbin + install -m 0755 ${S}/ampere_flash_bios.sh ${D}/${sbindir}/ampere_flash_bios.sh +} diff --git a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh new file mode 100755 index 000000000..876671c1b --- /dev/null +++ b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh @@ -0,0 +1,103 @@ +#!/bin/bash +# +# Copyright (c) 2021 Ampere Computing LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +do_flash () { + # Check the PNOR partition available + HOST_MTD=$(cat /proc/mtd | grep "pnor" | sed -n 's/^\(.*\):.*/\1/p') + if [ -z "$HOST_MTD" ]; + then + # If the PNOR partition is not available, then bind again driver + echo "--- Bind the ASpeed SMC driver" + echo 1e630000.spi > /sys/bus/platform/drivers/aspeed-smc/bind + sleep 2 + + HOST_MTD=$(cat /proc/mtd | grep "pnor" | sed -n 's/^\(.*\):.*/\1/p') + if [ -z "$HOST_MTD" ]; + then + echo "Fail to probe Host SPI-NOR device" + exit 1 + fi + + echo "--- Flashing firmware to @/dev/$HOST_MTD" + flash_eraseall /dev/$HOST_MTD + flashcp -v $IMAGE /dev/$HOST_MTD + + echo "--- Unbind the ASpeed SMC driver" + echo 1e630000.spi > /sys/bus/platform/drivers/aspeed-smc/unbind + else + echo "--- Flashing firmware to @/dev/$HOST_MTD" + flash_eraseall /dev/$HOST_MTD + flashcp -v $IMAGE /dev/$HOST_MTD + fi +} + + +if [ $# -eq 0 ]; then + echo "Usage: $(basename $0) " + exit 0 +fi + +IMAGE="$1" +if [ ! -f $IMAGE ]; then + echo $IMAGE + echo "The image file $IMAGE does not exist" + exit 1 +fi + +# Turn off the Host if it is currently ON +chassisstate=$(obmcutil chassisstate | awk -F. '{print $NF}') +echo "--- Current Chassis State: $chassisstate" +if [ "$chassisstate" == 'On' ]; +then + echo "--- Turning the Chassis off" + obmcutil chassisoff + sleep 10 + # Check if HOST was OFF + chassisstate_off=$(obmcutil chassisstate | awk -F. '{print $NF}') + if [ "$chassisstate_off" == 'On' ]; + then + echo "--- Error : Failed turning the Chassis off" + exit 1 + fi +fi + +# Switch the host SPI bus to BMC" +echo "--- Switch the host SPI bus to BMC." +gpioset 0 226=0 + +if [[ $? -ne 0 ]]; then + echo "ERROR: Switch the host SPI bus to BMC. Please check gpio state" + exit 1 +fi + +# Flash the firmware +do_flash + +# Switch the host SPI bus to HOST." +echo "--- Switch the host SPI bus to HOST." +gpioset 0 226=1 + +if [[ $? -ne 0 ]]; then + echo "ERROR: Switch the host SPI bus to HOST. Please check gpio state" + exit 1 +fi + +if [ "$chassisstate" == 'On' ]; +then + sleep 5 + echo "Turn on the Host" + obmcutil chassison +fi -- cgit v1.2.3 From 09ea4852cd7f7eb5892de1247c241997244309a4 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Wed, 30 Dec 2020 08:07:10 +0000 Subject: meta-ampere: support Redfish event log Enable system event log for Redfish. It includes the setting to: - Enable sel-logger module which logs the sensor event into the systemd log. - Enable the rsyslog (intel module) to sync the sensor events from systemd to /var/log/redfish. The file will be used by Redfish. - Configure the backend and redfish to get the system log from the /var/log/redfish instead of system d-bus - Enable Redfish journal log Tested: Verify event logs appear in: 1. Redfish: /redfish/v1/Systems/system/LogServices/EventLog/Entries 2. Redfish: /redfish/v1/Managers/bmc/LogServices/Journal/Entries 3. WebUI: /server-health/sys-log at Event type. Signed-off-by: Thang Q. Nguyen Change-Id: I3753e2932ec1dc83cdbe0708173531930df65254 --- .../packagegroups/packagegroup-ampere-apps.bb | 3 ++ .../rsyslog/rsyslog/rotate-event-logs.service | 9 ++++ .../rsyslog/rsyslog/rotate-event-logs.sh | 10 ++++ .../rsyslog/rsyslog/rsyslog-override.conf | 2 + .../recipes-extended/rsyslog/rsyslog/rsyslog.conf | 53 ++++++++++++++++++++++ .../rsyslog/rsyslog/rsyslog.logrotate | 22 +++++++++ .../recipes-extended/rsyslog/rsyslog_%.bbappend | 24 ++++++++++ .../recipes-phosphor/interfaces/bmcweb_%.bbappend | 7 +++ .../sel-logger/phosphor-sel-logger_%.bbappend | 2 + 9 files changed, 132 insertions(+) create mode 100644 meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service create mode 100644 meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh create mode 100644 meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf create mode 100644 meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf create mode 100644 meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate create mode 100644 meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend create mode 100644 meta-ampere/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend create mode 100644 meta-ampere/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb index 0831988e9..d29b87083 100644 --- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb +++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb @@ -23,6 +23,9 @@ SUMMARY_${PN}-chassis = "Ampere Chassis" RDEPENDS_${PN}-chassis = " \ obmc-op-control-power \ ampere-hostctrl \ + phosphor-hostlogger \ + phosphor-sel-logger \ + phosphor-logging \ " SUMMARY_${PN}-system = "Ampere System" diff --git a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service new file mode 100644 index 000000000..8f3a2bc31 --- /dev/null +++ b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service @@ -0,0 +1,9 @@ +[Unit] +Description=Rotate the event logs + +[Service] +Type=simple +ExecStart=/usr/bin/rotate-event-logs.sh + +[Install] +WantedBy=multi-user.target diff --git a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh new file mode 100644 index 000000000..5a8c5cc10 --- /dev/null +++ b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +while true; do + sleep 60 + /usr/sbin/logrotate /etc/logrotate.d/logrotate.rsyslog + ec=$? + if [ $ec -ne 0 ] ; then + echo "logrotate failed ($ec)" + fi +done diff --git a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf new file mode 100644 index 000000000..14bcc0781 --- /dev/null +++ b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf @@ -0,0 +1,2 @@ +[Service] +ExecReload=/bin/kill -HUP $MAINPID diff --git a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf new file mode 100644 index 000000000..656f1d3fb --- /dev/null +++ b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf @@ -0,0 +1,53 @@ +# if you experience problems, check +# http://www.rsyslog.com/troubleshoot for assistance + +# rsyslog v3: load input modules +# If you do not load inputs, nothing happens! +# You may need to set the module load path if modules are not found. +# +# Ported from debian's sysklogd.conf + +# Journal-style logging +# Limit to no more than 2000 entries in one minute and enable the +# journal workaround to avoid duplicate entries +module(load="imjournal" StateFile="/var/log/state" + RateLimit.Interval="60" + RateLimit.Burst="2000") + +# Template for Redfish messages +# " ," +template(name="RedfishTemplate" type="list") { + property(name="timereported" dateFormat="rfc3339") + constant(value=" ") + property(name="$!REDFISH_MESSAGE_ID") + constant(value=",") + property(name="$!REDFISH_MESSAGE_ARGS") + constant(value="\n") +} + +# Template for Application Crashes +# " ," +template(name="CrashTemplate" type="list") { + property(name="timereported" dateFormat="rfc3339") + constant(value=" ") + constant(value="OpenBMC.0.1.ServiceFailure") + constant(value=",") + property(name="$!UNIT") + constant(value="\n") +} + + +# If the journal entry has a Redfish MessageId, save as a Redfish event +if ($!REDFISH_MESSAGE_ID != "") then { + action(type="omfile" file="/var/log/redfish" template="RedfishTemplate") +} + +# If the journal entry has a Exit Code, save as a Redfish event +if ($!EXIT_STATUS != "" and $!EXIT_STATUS != "0") then { + action(type="omfile" file="/var/log/redfish" template="CrashTemplate") +} + +# +# Include all config files in /etc/rsyslog.d/ +# +$IncludeConfig /etc/rsyslog.d/*.conf diff --git a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate new file mode 100644 index 000000000..a6ba28d86 --- /dev/null +++ b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate @@ -0,0 +1,22 @@ +# /etc/logrotate.d/rsyslog - Ported from Debian + +# Keep up to four 64k files for ipmi_sel (256k total) +/var/log/ipmi_sel +{ + rotate 3 + size 64k + missingok + postrotate + systemctl reload rsyslog 2> /dev/null || true + endscript +} +# Keep up to four 64k files for redfish (256k total) +/var/log/redfish +{ + rotate 3 + size 64k + missingok + postrotate + systemctl reload rsyslog 2> /dev/null || true + endscript +} diff --git a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend new file mode 100644 index 000000000..f667fb649 --- /dev/null +++ b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -0,0 +1,24 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://rsyslog.conf \ + file://rsyslog.logrotate \ + file://rotate-event-logs.service \ + file://rotate-event-logs.sh \ + file://rsyslog-override.conf \ + " + +FILES_${PN} += "${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf" + +PACKAGECONFIG_append = " imjournal" + +do_install_append() { + install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir} + install -d ${D}${systemd_system_unitdir}/rsyslog.service.d + install -m 0644 ${WORKDIR}/rsyslog-override.conf \ + ${D}${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/rotate-event-logs.sh ${D}/${bindir}/rotate-event-logs.sh + rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf +} + +SYSTEMD_SERVICE_${PN} += " rotate-event-logs.service" diff --git a/meta-ampere/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend new file mode 100644 index 000000000..15fb5e670 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +EXTRA_OEMESON_append = " \ + -Dinsecure-tftp-update=enabled \ + -Dbmcweb-logging=enabled \ + -Dredfish-bmc-journal=enabled \ + " diff --git a/meta-ampere/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend new file mode 100644 index 000000000..4be8ddbd5 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -0,0 +1,2 @@ +# Enable threshold monitoring +EXTRA_OECMAKE += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" -- cgit v1.2.3 From bc6feda36d757725b751fb7bd67204a3dbc46445 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Mon, 11 Jan 2021 09:35:35 -0800 Subject: Change Owners Plugin in meta-ampere Please see https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/39379 for details about why this is necessary. Some commits pointed out that we should identify by email instead of name. This commit changes the existing owners to use email instead of name. Signed-off-by: Ed Tanous Change-Id: I9b22333bd878df7d94999366bb3887e4637698f2 --- meta-ampere/OWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-ampere/OWNERS b/meta-ampere/OWNERS index e7e9b1721..d759f31c1 100644 --- a/meta-ampere/OWNERS +++ b/meta-ampere/OWNERS @@ -1,3 +1,3 @@ owners: -- Thang Q. Nguyen -- Tung Nguyen +- thang@os.amperecomputing.com +- tungnguyen@os.amperecomputing.com -- cgit v1.2.3 From 522d93bc3dc6fb77429007b33fa0bfb7697340bc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 13:10:38 +0000 Subject: sdbusplus: srcrev bump d64fb7da89..32ffb03dc8 Patrick Williams (3): sdbus++: create server support functions server/interface: simplify property_changed server: un-inline various large functions Change-Id: I0060a0fce928f9212e9813172bda2ab7e78c8772 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index b69ab0888..0e3aa9f7a 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc @@ -3,4 +3,4 @@ PR = "r1" PV = "1.0+git${SRCPV}" SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "d64fb7da89063564adaae56eef49f55c4c98337a" +SRCREV = "32ffb03dc854ba61747849246805ea7597e97130" -- cgit v1.2.3 From b269c72ad4bdfe6f498a2269d1c08e669ed040e1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 02:10:33 +0000 Subject: stdplus: srcrev bump be79c1ea9f..01db662ac1 William A. Kennington III (3): test/gtest: Ignore pedantic compiler warnings types: Use nonstd::span until we can guarantee c++20 test/catch2: Use split headers and static library Change-Id: I6bb2cc9cd11b58114b7dc35eaa1acee5c4614c88 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/stdplus/stdplus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb index 52bfcb208..db0ec884c 100644 --- a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb +++ b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb @@ -17,6 +17,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/stdplus" -SRCREV = "be79c1ea9f092f55a2437309283f0bfaae9fe6ed" +SRCREV = "01db662ac12b9dd97082b3e56e43ea164f77d310" S = "${WORKDIR}/git" -- cgit v1.2.3 From 29d103c7bb060c0c872d03fc7f0a070569dd33a3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 02:51:03 +0000 Subject: phosphor-host-ipmid: srcrev bump 687e9b0347..8a7236ae93 John Wang (1): transportHandler: Separate some util functions to hpp Change-Id: Id3c07db324dd3e1fea6b85c28a5621b3e61924a9 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index f6c697828..57867af39 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "687e9b034734935fc09e59e47f98423688e783bd" +SRCREV = "8a7236ae9309a413cec0644baf9e69f3f9a80160" -- cgit v1.2.3 From 02d82ac809dac78b33385e38adeddea257fd996d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 18:11:15 +0000 Subject: phosphor-virtual-sensor: srcrev bump a4fe665d15..b306b03dae Matt Spinler (1): Add PerformanceLoss threshold checking Change-Id: Ide4d3f1d453316c0196d1dfa4f1337cb309c3dca Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb index 26e09c4d8..28acc172a 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -16,7 +16,7 @@ DEPENDS += "nlohmann-json" DEPENDS += "exprtk" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=git" -SRCREV = "a4fe665d15549108a5e644a423950c95ea0e72da" +SRCREV = "b306b03dae93cb74e3deeed0ef56d9b60f5d7229" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "phosphor-virtual-sensor.service" -- cgit v1.2.3 From 8cae3c8876ab2e2c20a7b92af30816b4e69a170f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 20:51:09 +0000 Subject: phosphor-power: srcrev bump 48033bf628..3cd2b40713 Shawn McCarney (1): regulators: Handle expected D-Bus exceptions Change-Id: I82ffd1e412fd3f3117ca1517ed99992e7cbf2edd Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 85d8abe10..8a648bec1 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "48033bf62871ac8c2572cebdfb4d5aab31e41f71" +SRCREV = "3cd2b407131b5f0111c3a1c50383f34f84f6f27f" -- cgit v1.2.3 From 672165fbed3650c0be1521488e465ed86eb0cce8 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 21:50:48 +0000 Subject: bmcweb: srcrev bump 349a2ac392..6a9f85f905 AppaRao Puli (1): Fix wrong check in EventService events Change-Id: I483627faac08a474dd00e4d565b42ce70118fe3a Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index d9344f64b..69fde7b97 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "349a2ac3921e17ff0e2bce47ba6698112d586e67" +SRCREV = "6a9f85f9050e2c0f38148e295d7e25f56d05c6de" S = "${WORKDIR}/git" -- cgit v1.2.3 From e52c29cc48602d23a1f3d5e2f005ee57b255b9bc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 22:00:39 +0000 Subject: entity-manager: srcrev bump f094125cd3..0836ce053c Josh Lehan (1): Add parameters for external sensor Change-Id: Ib1af5f1f67473325d73e18a143d7bd154bc36cdf Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index e8ed237ff..4b83098a0 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "f094125cd3bdbc8737dc8035a6e9ac252f6e8840" +SRCREV = "0836ce053c2ce94fb1d56eed37ad78514de7934e" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From c722f1fccb5f266bc6ffeba4cf616afe73fe8408 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Mon, 1 Feb 2021 13:33:00 -0800 Subject: dbus-sensors: srcrev bump a3e8f2a391..2a40e93930 Josh Lehan (1): ExternalSensor: New service for external sensors Also, add the externalsensor systemd service file to the recipe, so it is installed correctly. Change-Id: I2fb3373101793b13692b673eeff524e84668d4c9 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 727bad533..035b4c61e 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "a3e8f2a391f389ffb2c379ca0c181e67de43824e" +SRCREV = "2a40e939307c5ffccf19b19d500eac5935c63009" PV = "0.1+git${SRCPV}" @@ -24,6 +24,7 @@ PACKAGECONFIG ??= " \ PACKAGECONFIG[adcsensor] = "-DDISABLE_ADC=OFF, -DDISABLE_ADC=ON" PACKAGECONFIG[cpusensor] = "-DDISABLE_CPU=OFF, -DDISABLE_CPU=ON" PACKAGECONFIG[exitairtempsensor] = "-DDISABLE_EXIT_AIR=OFF, -DDISABLE_EXIT_AIR=ON" +PACKAGECONFIG[externalsensor] = "-DDISABLE_EXTERNAL=OFF, -DDISABLE_EXTERNAL=ON" PACKAGECONFIG[fansensor] = "-DDISABLE_FAN=OFF, -DDISABLE_FAN=ON" PACKAGECONFIG[hwmontempsensor] = "-DDISABLE_HWMON_TEMP=OFF, -DDISABLE_HWMON_TEMP=ON" PACKAGECONFIG[intrusionsensor] = "-DDISABLE_INTRUSION=OFF, -DDISABLE_INTRUSION=ON" @@ -58,6 +59,9 @@ SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'mcutempsensor', SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'psusensor', \ 'xyz.openbmc_project.psusensor.service', \ '', d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'externalsensor', \ + 'xyz.openbmc_project.externalsensor.service', \ + '', d)}" DEPENDS = "boost nlohmann-json sdbusplus i2c-tools libgpiod" inherit cmake systemd -- cgit v1.2.3 From fd78857a44602d829a2df29d8360819064382565 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 22:41:21 +0000 Subject: webui-vue: srcrev bump 6e2cb97842..be6858c06b Dixsie Wolmers (1): Remove account type assignments from privilege role table Sukanya Pandey (1): Add power restore policy page Yoshie Muranaka (1): Update failing unit tests Change-Id: I9c795dc567d16ade319aa858e56dba3bbbda6013 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index b2a603efb..c94c4b6fc 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "6e2cb978428ba078ebe0d171a69322308ab48d48" +SRCREV = "be6858c06bfbd1e06935ad01b743c1043f74488a" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 45b84ad123dc7ebb19856426b1fe2b9d4ef05f74 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 20:20:59 +0000 Subject: phosphor-logging: srcrev bump e7d271ae7e..f397afcc47 Matt Spinler (1): PEL: Allow missing AD keys in the reg callouts Change-Id: Ibc81f4bfd143131d83c49c2de468e1c9b56c0d86 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 3e0b84174..37270958e 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -55,7 +55,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "e7d271ae7ecf460b9c4b76caf9ba555f7d8a532e" +SRCREV = "f397afcc472d521341a5ab9afd6065a6195db6c0" S = "${WORKDIR}/git" -- cgit v1.2.3 From 0c8ac5e7dc34104938239c2c911e52e27356454f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 2 Feb 2021 17:40:43 +0000 Subject: phosphor-bmc-code-mgmt: srcrev bump 878377d3a7..42bd99361c Adriana Kobylak (1): meson: Make verify-full-signature stand-alone Change-Id: I111545a47e6af15f37d0908e854d48b70570cac2 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index c4c1d7f21..3ed1cfd0b 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "878377d3a7049a113a6c538d860c5caa91fffa24" +SRCREV = "42bd99361cdad9971e76c228bf83b7010fc7b249" -- cgit v1.2.3 From 4b8758fffdc8d9e8bd724bb1dbe2f9bd2a9d7e64 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 2 Feb 2021 20:51:07 +0000 Subject: phosphor-hwmon: srcrev bump 9455535224..82921ae8e8 Matt Spinler (1): Change an sdbusplus mock signature Change-Id: Iea854c8998daa84061456b5d21c34dda6d140f6b Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index de7c02506..a5c1db49a 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -46,7 +46,7 @@ SRC_URI += "file://70-hwmon.rules" SRC_URI += "file://70-iio.rules" SRC_URI += "file://start_hwmon.sh" -SRCREV = "94555352240ba7ac577a7017c0719cd9bbeb7a23" +SRCREV = "82921ae8e84b250e6436c8c005245bccd5c4706c" S = "${WORKDIR}/git" -- cgit v1.2.3 From ae773f7c175592240ac7cc43eaeb1053485feeb8 Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Sat, 30 Jan 2021 01:14:23 +0300 Subject: openpower-esel-parser: srcrev bump 8d25ae..5bf636 Alexander Filippov (1) Fix build with OpenBMC 2.10.0-dev Change-Id: Iee1968deb5c72c3559cbf629742af03bf29bfae2 Signed-off-by: Alexander Filippov --- .../meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-yadro/meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb b/meta-yadro/meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb index dc6d4b31a..440f0f89d 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb @@ -20,4 +20,4 @@ DEPENDS += "autoconf-archive-native \ # Source code repository S = "${WORKDIR}/git" SRC_URI = "gitsm://github.com/YADRO-KNS/openpower-esel-parser" -SRCREV = "8d25ae3cf40c090dfa17eb30a95c3d844012235f" +SRCREV = "5bf636b0b8bd0d09928b1879aa480c60e4452e80" -- cgit v1.2.3 From c723b72979bfac6362509cf1fe086900f6641f28 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 8 Jan 2021 16:14:09 -0600 Subject: poky: subtree update:796be0593a..10c69538c0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alan Perry (1): binutils: add libopcodes package for perf Alex Stewart (1): opkg: upgrade to version 0.4.4 Alexander Kanavin (73): selftest/reproducible: enable world reproducibility test selftest/reproducible: add an exclusion list for items that are not yet reproducible kea: upgrade 1.7.10 -> 1.8.1 valgrind: exclude bar_bad/bar_bad_xml from ptests bzip2: run ptests without valgrind lttng-tools: disable more failing ptests glib-2.0: add a patch to increase a test timeout acpica: upgrade 20201113 -> 20201217 bind: upgrade 9.16.9 -> 9.16.10 diffoscope: upgrade 161 -> 163 dnf: upgrade 4.4.0 -> 4.5.2 enchant2: upgrade 2.2.13 -> 2.2.14 epiphany: upgrade 3.38.1 -> 3.38.2 ethtool: upgrade 5.9 -> 5.10 gtk+3: upgrade 3.24.23 -> 3.24.24 init-system-helpers: upgrade 1.58 -> 1.60 kbd: upgrade 2.3.0 -> 2.4.0 kea: upgrade 1.8.1 -> 1.8.2 libmodulemd: upgrade 2.9.4 -> 2.11.1 libpcre2: upgrade 10.35 -> 10.36 libtirpc: upgrade 1.2.6 -> 1.3.1 libusb1: upgrade 1.0.23 -> 1.0.24 libva: upgrade 2.9.0 -> 2.10.0 libx11: upgrade 1.6.12 -> 1.7.0 lighttpd: upgrade 1.4.56 -> 1.4.57 ninja: upgrade 1.10.1 -> 1.10.2 puzzles: upgrade to latest revision python3-hypothesis: upgrade 5.41.5 -> 5.43.3 python3-py: upgrade 1.9.0 -> 1.10.0 python3-setuptools-scm: upgrade 4.1.2 -> 5.0.1 sqlite3: upgrade 3.33.0 -> 3.34.0 stress-ng: upgrade 0.11.24 -> 0.12.00 sudo: upgrade 1.9.3p1 -> 1.9.4p1 sysvinit: upgrade 2.97 -> 2.98 vala: upgrade 0.50.1 -> 0.50.2 vulkan-headers: upgrade 1.2.154.0 -> 1.2.162.0 webkitgtk: upgrade 2.30.2 -> 2.30.4 xprop: upgrade 1.2.4 -> 1.2.5 xserver-xorg: upgrade 1.20.9 -> 1.20.10 glib-2.0: update 2.66.2 -> 2.66.4 rpm: update 4.16.0 -> 4.16.1.2 piglit: update to latest revision sbc: update 1.4 -> 1.5 libdnf: update 0.55.0 -> 0.55.2 libva-utils: update 2.9.1 -> 2.10.0 python3-importlib-metadata: update 3.1.1 -> 3.3.0 python3: update 3.9.0 -> 3.9.1 vulkan-loader: upgrade 1.2.154.1 -> 1.2.162.0 vulkan-tools: upgrade 1.2.154.0 -> 1.2.162.0 systemd-bootchart: update 233 -> 234 zstd: add recipe from meta-oe zstd: update 1.4.5 -> 1.4.8 devtool: gitsm:// should be handled same as git:// in upgrades ovmf: upgrade 202008 -> 202011 libksba: update 1.4.0 -> 1.5.0 libjitterentropy: update 2.2.0 -> 3.0.0 icu: update 68.1 -> 68.2 gnutls: update 3.6.15 -> 3.7.0 gnupg: update 2.2.23 -> 2.2.26 boost: update 1.74.0 -> 1.75.0 kexec-tools: update 2.0.20 -> 2.0.21 vulkan-samples: update to latest revision libpam: update 1.3.1 -> 1.5.1 strace: update 5.9 -> 5.10 python3-pytest: update 6.1.2 -> 6.2.1 mtools: update 4.0.25 -> 4.0.26 gnu-config: update to latest revision cmake: update 3.18.4 -> 3.19.2 ccache: upgrade 3.7.11 -> 4.1 ccache.bbclass: use ccache from host distribution gawk: add missing ptest dependency util-linux: upgrade 2.36 -> 2.36.1 ell: upgrade 0.33 -> 0.35 Anatol Belski (1): iproute2: Make it easier to manipulate SUBDIRS list from bbappend Anuj Mittal (2): mesa: add more details to elf-tls patch mesa: remove patch disabling asm Bruce Ashfield (23): linux-yocto-rt/5.4: update to -rt44 linux-yocto/5.4: update to v5.4.80 lttng-modules: fix build against v5.10+ kern-tools: non-gcc config support and option re-classification linux-yocto/cfg: qemuppc: set CONFIG_SCSI to '=y' linux-yocto/5.4: update to v5.4.82 linux-yocto/cfg: qemuarm64-gfx.cfg: add CONFIG_INPUT_UINPUT linux-yocto/5.4: update to v5.4.83 linux-yocto/5.8/cfg: fix -tiny warnings linux-yocto/5.4/cfg: fix -tiny warnings systemtap: fix on target build for 4.4 and 5.10+ linux-yocto/5.4/cfg: fix FIRMWARE_LOADER warnings kernel-devsrc: fix 32bit ARM devsrc builds linux-yocto/5.4: update to v5.4.85 linux-yocto-dev: bump to v5.11-rc libc-headers: update to v5.10 machine/qemuarm*: add vmalloc kernel parameter linux-yocto: introduce v5.10 reference kernel recipes linux-yocto/5.10: update to v5.10.2 conf/machine: bump qemu preferred versions to 5.10 poky/poky-tiny: set preferred kernel to 5.10 yocto-bsp: explicitly set preferred version for reference boards poky-alt: don't use conditional assignment for preferred kernel version Changqing Li (2): libexif: fix CVE-2020-0198; CVE-2020-0452 libpam: support usrmerge Chris Laplante (1): contrib/git-hooks: add a sendemail-validate example hook that adds FROM: lines to outgoing patch emails Christopher Larson (2): grub-efi-cfg: exclude OVERRIDES from build_efi_cfg vardeps uboot-extlinux-config: exclude OVERRIDES from do_create_extlinux_config vardeps Deepak Rawat (1): openssl: add support for mingw64 as target Diego Sueiro (2): wic: Introduce empty plugin to create unformatted empty partitions modutils-initscripts: Use depmod -a when modules.dep is empty Dmitry Baryshkov (3): perl: fix installation failure because of shell issue linux-firmware: upgrade 20201118 -> 20201218 linux-firmware: package firmware for Lontium lt9611uxc bridge Easwar Hariharan (1): classes/kernel-fitimage: make fitimage_emit_section_config more readable Elvis Stansvik (1): ref-manual: terms: Fix poky tarball root folder Jack Mitchell (1): distutils3: allow setup.py to be run from a different directory to ${S} Joey Degges (4): bitbake: tests/fetch: Organize usehead tests by net requirements bitbake: tests/fetch: Document behavior of test_gitfetch_usehead bitbake: tests/fetch: Test usehead with a non-default name bitbake: fetch/git: Fix usehead for non-default names Jose Quaresma (11): gstreamer1.0: upgrade 1.18.1 -> 1.18.2 gstreamer1.0-plugins-bad: v4l2codecs fix typo gstreamer1.0-plugins-bad: add support for aom plugin gstreamer1.0-plugins-bad: add support for x265 plugin gstreamer1.0-plugins-bad: sctp plugin uses the internal usrsctp static lib gstreamer1.0-plugins-bad: remove unsupported plugins comment gstreamer1.0-plugins-bad: netsim plugin don't have external deps gstreamer1.0-plugins-bad: transcode plugin external deps is always present gstreamer1.0: use the correct meson option for the capabilities shaderc: upgrade 2020.3 -> 2020.4 spirv-tools: upgrade 2020.5 -> 2020.6 Khairul Rohaizzat Jamaluddin (3): openssl: Update 1.1.1h -> 1.1.1i go: Update 1.15.5 -> 1.15.6 curl: Update 7.73.0 -> 7.74.0 Khem Raj (21): musl: Update to latest master systemd: Fix reallocarray check go.bbclass: Use external linker for native packages qemuriscv: check serial consoles w.r.t. /proc/consoles busybox-inittab: Implement SYSVINIT_ENABLED_GETTYS and USE_VT initscripts: use quotes for shell variable comparision busybox: Install /etc/default/rcS when used as init system busybox: Run mdev as daemon rcS: Define identifier for init system used initscripts: Use initctl on sysvinit only busybox: Sync rcS.default with sysvinit ltp: Fix ltp-pan crash on 32bit arches using 64bit time_t pulseaudio: Fix build with clang for non-x86 target util-linux: Build fixes for 32bit arches with 64bit time_t libpam: Drop musl patches ccache: Build fixes for clang and riscv32 shadow: Remove lastlog pam plugin on musl system rxvt-unicode: Disable lastlog on musl systems openssh: Disable lastlog on musl dropbear: Disable lastlog and wtmp on musl ccache: Fix build on aarch64/clang Lee Chee Yang (2): gdk-pixbuf: fix CVE-2020-29385 wic/direct/kparser: ensure fsuuid for vfat and msdos align with format Li Wang (2): qemu: CVE-2020-25723 qemu: CVE-2020-28916 Luca Boccassi (6): classes/kernel-fitimage: add ability to sign individual images systemd: update 246 -> 247 systemd: add package config for systemd-oomd systemd: ship new systemd-dissect in -extra-utils systemd: set -Dmode=release as recommended by NEWS systemd: add RRECOMMENDS for weak dependencies, if enabled Mark Jonas (1): parted: Make readline dependency optional Martin Jansa (2): license.bbclass: Add COMMON_LICENSE_DIR and LICENSE_PATH dirs to PSEUDO_IGNORE_PATHS busybox.inc: install rcS, rcK and rcS.default only with busybox in VIRTUAL-RUNTIME_init_manager Maxime Roussin-Bélanger (1): meta: add missing descriptions in some support recipes Michael Halstead (1): releases: conf: add link to 3.2.1, update to include 3.2.1 Milan Shah (2): oe-pkgdata-util: Added a test to verify oe-pkgdata-util without parameters bitbake: utils: add docstrings to functions Mingli Yu (1): kbd: fix transaction conflict Nathan Rossi (7): gcc: Add patch to resolve i*86 tune configuration overrides qemu.inc: Add seccomp PACKAGECONFIG option ncurses: Prevent LDFLAGS being emitted in .pc files which: add nativesdk to BBCLASSEXTEND sed: add nativesdk to BBCLASSEXTEND grep: add nativesdk to BBCLASSEXTEND coreutils: enable xattrs by default for nativesdk Ovidiu Panait (3): timezone: upgrade to 2020e timezone: upgrade to 2020f variables: Add documentation for KERNEL_DTC_FLAGS Paul Barker (8): bitbake.conf: Prevent pyc file generation in pseudo context documentation: Simplify oe_wiki and oe_home links documentation: Simplify layerindex and layer links documentation: Simplify remaining yocto_home links profile-manual: Simplify yocto_bugs link ref-manual: Simplify oe_lists link documentation: Use https links where possible selftest: Add argument to keep build dir Paul Eggleton (11): classes/kernel-fitimage: add variable for description classes/kernel-fitimage: allow substituting mkimage command classes/kernel-fitimage: add ability to add additional signing options oe-selftest: move FIT image tests to their own module oe-selftest: fitimage: Test for FIT_DESC oe-selftest: fitimage: add test for signing FIT images classes: minor corrections to kernel-fitimage section variables: clarify KERNEL_ALT_IMAGETYPE reference variables: explicitly state that UBOOT_MKIMAGE_DTCOPTS is optional variables: Add documentation for new kernel-fitimage vars ref-manual: use consistent capitalisation of U-Boot Peter Kjellerstedt (7): lib/oe/path: Add canonicalize() bitbake.conf: Canonicalize paths in PSEUDO_IGNORE_PATHS wic: Pass canonicalized paths in PSEUDO_IGNORE_PATHS glibc: Make adjtime() for 32 bit support being called with delta == NULL bitbake: cache: Make CoreRecipeInfo include rprovides_pkg for skipped recipes bitbake: cooker: Include all packages a recipe provides in SkippedPackage.rprovides apr-util: Only specify --with-dbm=gdbm if gdbm support is enabled Richard Purdie (22): pseudo: Drop patches merged into upstream branch bitbake: data_smart: Ensure hash reflects vardepvalue flags correctly linuxloader: Avoid confusing string concat errors systemd: Ensure uid/gid ranges are set deterministically grub: Fix build reproducibility issue u-boot-tools: Fix reproducibility issue grub: Add second fix for determinism issue oeqa/commands: Ensure sync can be found regardless of PATH cups: Mark CVE-2009-0032 as a non-issue cups: Mark CVE-2008-1033 as a non-issue groff: Fix reproducibility issue man-db: Avoid reproducibility failures after fixing groff-native meta-selftest/staticids: Add ids for other recipes selftest/reproducible: Add useradd-staticids to reproducible builds tests grub: Further reproducibility fix man-db: Fix reproducibility issue bitbake.conf: Add mkfifo to HOSTTOOLS bitbake.conf: Add /run/ to PSEUDO_IGNORE_PATHS ppp: Update 2.4.8 -> 2.4.9 ppp: Fix reproducibility issue sanity: Bump min python version to 3.6 pseudo: Add lchmod wrapper Robert Yang (6): buildtools-tarball.bb: Fix PATH for environment setup script ncurses: Make ncurses-tools depend on ncurses-terminfo-base minicom: RDEPENDS on ncurses-terminfo-base archiver.bbclass: Fix --runall=deploy_archives for images ccache: Extend to nativesdk ccache.bbclass: Set CCACHE_TEMPDIR Ross Burton (13): wic-image-minimal: only depend on syslinux on x86 targets syslinux: rewrite recipe so only target code is x86-specific wic-tools: don't build syslinux-native for targets without syslinux image-uefi.conf: add EFI arch variable systemd-boot: build the EFI stub systemd-boot: allow building for Arm targets wic-tools: add grub-efi and systemd-boot on arm64 lib/oe/qa: handle the 'no specific instruction set' ELF e_machine value local.conf: add aarch64 to the SDKMACHINE example values kernel: set COMPATIBLE_HOST to *-linux bitbake.conf: default SDKMACHINE to the build host architecture diffstat: point the license checksum at the license ruby: remove tcl DEPENDS Scott Murray (2): grub: fix "CVE:" line in one of the patches patch: fix CVE-2019-20633 Sinan Kaya (1): gcsections: add more suppressions for SDK builds Steve Sakoman (1): oeqa/selftest/cases/devtool.py: fix typo in ignore_patterns call Tanu Kaskinen (6): maintainers.inc: remove myself from maintainers pulseaudio: Remove OE_LT_RPATH_ALLOW pulseaudio: disable EsounD support pulseaudio: disable GConf support pulseaudio: switch build system from Autotools to Meson pulseaudio: fix client.conf location Teoh Jay Shen (2): oeqa/terminal : improve the test case oeqa/suspend : add test for suspend state Tim Orling (6): python3-hypothesis: upgrade 5.41.4 -> 5.41.5 python3-importlib-metadata: upgrade 3.1.0 -> 3.1.1 python3-pygments: upgrade v2.7.2 -> v2.7.3 python3-setuptools: upgrade 50.3.2 -> 51.0.0 python3-setuptools-scm: add python3-toml dep python3-packaging: upgrade 20.4 -> 20.8 Tomasz Dziendzielski (1): populate_sdk_base: Fix condition syntax if SDK_RELOCATE_AFTER_INSTALL is disabled Trevor Woerner (7): mesa.inc: switch true/enabled false/disabled mesa: update 20.2.4 -> 20.3.1 insane.bbclass: allow fifos selftest-chown: add test for fifos PSPLASH_FIFO_DIR: refactor psplash: fix working on first boot (sysvinit) psplash (sysvinit): add textual updates Vivien Didelot (4): README.hardware: prettify headline README.hardware: fix the dd command meta-yocto-bsp: use provided variables meta-yocto-bsp: use mmcblk0 for root partition Wang Mingyu (4): libaio: upgrade 0.3.111 -> 0.3.112 readline: upgrade 8.0 -> 8.1 man-pages: upgrade 5.09 ->5.10 mobile-broadband-provider-info: upgrade 20190618 ->20201225 Yi Zhao (6): dhcpcd: upgrade 9.3.2 -> 9.3.4 dhcpcd: fix SECCOMP for i386 inetutils: add dnsdomainname to ALTERNATIVE libcap: update 2.45 -> 2.46 libcap-ng: upgrade 0.8.1 -> 0.8.2 dhcpcd: upgrade 9.3.4 -> 9.4.0 Zhixiong Chi (1): glibc: CVE-2020-29562 and CVE-2020-29573 zangrc (3): bash: Rename patch name systemtap: upgrade 4.3 -> 4.4 msmtp: upgrade 1.8.13 -> 1.8.14 zhengruoqin (2): cantarell-fonts: upgrade 0.201 -> 0.301 gdbm: upgrade 1.18.1 -> 1.19 Signed-off-by: Andrew Geissler Change-Id: I9000a711651a4e884e8bfccc438c95fce184b35e --- poky/bitbake/lib/bb/cache.py | 4 +- poky/bitbake/lib/bb/cooker.py | 4 +- poky/bitbake/lib/bb/data_smart.py | 2 +- poky/bitbake/lib/bb/fetch2/git.py | 7 +- poky/bitbake/lib/bb/tests/fetch.py | 92 +- poky/bitbake/lib/bb/utils.py | 38 +- poky/contrib/git-hooks/sendemail-validate.sample | 78 ++ poky/documentation/README | 8 +- poky/documentation/boilerplate.rst | 2 +- poky/documentation/brief-yoctoprojectqs/index.rst | 2 +- poky/documentation/bsp-guide/bsp.rst | 4 +- poky/documentation/conf.py | 5 +- poky/documentation/dev-manual/common-tasks.rst | 17 +- poky/documentation/kernel-dev/intro.rst | 3 +- poky/documentation/overview-manual/concepts.rst | 28 +- .../overview-manual/development-environment.rst | 22 +- poky/documentation/overview-manual/yp-intro.rst | 13 +- poky/documentation/profile-manual/usage.rst | 49 +- poky/documentation/ref-manual/classes.rst | 20 +- poky/documentation/ref-manual/faq.rst | 6 +- poky/documentation/ref-manual/images.rst | 4 +- poky/documentation/ref-manual/kickstart.rst | 4 +- poky/documentation/ref-manual/migration-1.7.rst | 2 +- poky/documentation/ref-manual/migration-2.1.rst | 2 +- poky/documentation/ref-manual/migration-2.2.rst | 4 +- poky/documentation/ref-manual/migration-2.3.rst | 4 +- poky/documentation/ref-manual/migration-2.7.rst | 2 +- poky/documentation/ref-manual/qa-checks.rst | 2 +- poky/documentation/ref-manual/resources.rst | 7 +- poky/documentation/ref-manual/terms.rst | 3 +- poky/documentation/ref-manual/variables.rst | 76 +- poky/documentation/releases.rst | 1 + poky/documentation/sdk-manual/intro.rst | 2 +- poky/documentation/sphinx-static/switchers.js | 2 +- poky/documentation/toaster-manual/intro.rst | 2 +- poky/documentation/toaster-manual/reference.rst | 8 +- .../documentation/toaster-manual/setup-and-use.rst | 11 +- .../transitioning-to-a-custom-environment.rst | 4 +- poky/documentation/what-i-wish-id-known.rst | 11 +- poky/meta-poky/conf/distro/include/gcsections.inc | 10 + .../distro/include/poky-distro-alt-test-config.inc | 2 +- poky/meta-poky/conf/distro/poky-tiny.conf | 2 +- poky/meta-poky/conf/distro/poky.conf | 4 +- poky/meta-poky/conf/local.conf.sample | 2 +- .../classes/test-mkimage-wrapper.bbclass | 19 + poky/meta-selftest/files/static-group | 9 +- poky/meta-selftest/files/static-passwd | 6 + poky/meta-selftest/lib/pseudo_pyc_test1.py | 1 + poky/meta-selftest/lib/pseudo_pyc_test2.py | 1 + .../recipes-test/images/wic-image-minimal.bb | 5 +- .../pseudo-pyc-test/pseudo-pyc-test.bb | 15 + .../recipes-test/selftest-chown/selftest-chown.bb | 5 + poky/meta-selftest/wic/test_empty_plugin.wks | 4 + poky/meta-yocto-bsp/README.hardware | 4 +- poky/meta-yocto-bsp/conf/layer.conf | 6 + .../conf/machine/beaglebone-yocto.conf | 2 +- poky/meta-yocto-bsp/wic/beaglebone-yocto.wks | 2 +- poky/meta/classes/archiver.bbclass | 1 + poky/meta/classes/ccache.bbclass | 7 +- poky/meta/classes/distutils3.bbclass | 10 +- poky/meta/classes/go.bbclass | 1 + poky/meta/classes/grub-efi-cfg.bbclass | 1 + poky/meta/classes/insane.bbclass | 3 +- poky/meta/classes/kernel-fitimage.bbclass | 114 ++- poky/meta/classes/kernel.bbclass | 2 + poky/meta/classes/license.bbclass | 1 + poky/meta/classes/linuxloader.bbclass | 6 +- poky/meta/classes/populate_sdk_base.bbclass | 2 +- poky/meta/classes/sanity.bbclass | 6 +- poky/meta/classes/uboot-extlinux-config.bbclass | 1 + poky/meta/conf/bitbake.conf | 12 +- poky/meta/conf/distro/include/maintainers.inc | 39 +- poky/meta/conf/distro/include/tcmode-default.inc | 2 +- poky/meta/conf/image-uefi.conf | 13 +- poky/meta/conf/machine/include/riscv/qemuriscv.inc | 1 + poky/meta/conf/machine/include/x86-base.inc | 2 +- poky/meta/conf/machine/qemuarm.conf | 2 +- poky/meta/conf/machine/qemuarmv5.conf | 4 +- poky/meta/lib/oe/path.py | 21 + poky/meta/lib/oe/qa.py | 1 + poky/meta/lib/oeqa/runtime/cases/suspend.py | 33 + poky/meta/lib/oeqa/runtime/cases/terminal.py | 7 +- poky/meta/lib/oeqa/selftest/cases/buildoptions.py | 8 +- poky/meta/lib/oeqa/selftest/cases/devtool.py | 2 +- poky/meta/lib/oeqa/selftest/cases/fitimage.py | 233 +++++ poky/meta/lib/oeqa/selftest/cases/imagefeatures.py | 74 -- poky/meta/lib/oeqa/selftest/cases/oelib/elf.py | 2 +- poky/meta/lib/oeqa/selftest/cases/package.py | 3 +- poky/meta/lib/oeqa/selftest/cases/pkgdata.py | 6 + poky/meta/lib/oeqa/selftest/cases/pseudo.py | 27 + poky/meta/lib/oeqa/selftest/cases/reproducible.py | 90 +- poky/meta/lib/oeqa/selftest/cases/wic.py | 20 + poky/meta/lib/oeqa/selftest/context.py | 17 +- poky/meta/lib/oeqa/utils/commands.py | 3 + ...overflow-checking-primitives-where-we-do-.patch | 2 +- poky/meta/recipes-bsp/grub/files/determinism.patch | 56 ++ poky/meta/recipes-bsp/grub/grub2.inc | 1 + poky/meta/recipes-bsp/u-boot/u-boot-tools.inc | 15 + .../0001-avoid-start-failure-with-bind-user.patch | 27 + ...lwresd-V-and-start-log-hide-build-options.patch | 35 + ...-searching-for-json-headers-searches-sysr.patch | 47 + .../recipes-connectivity/bind/bind-9.16.10/bind9 | 2 + .../bind/bind-9.16.10/conf.patch | 330 +++++++ .../bind/bind-9.16.10/generate-rndc-key.sh | 8 + .../init.d-add-support-for-read-only-rootfs.patch | 65 ++ .../make-etc-initd-bind-stop-work.patch | 42 + .../bind/bind-9.16.10/named.service | 22 + .../0001-avoid-start-failure-with-bind-user.patch | 27 - ...lwresd-V-and-start-log-hide-build-options.patch | 35 - ...-searching-for-json-headers-searches-sysr.patch | 47 - .../recipes-connectivity/bind/bind-9.16.9/bind9 | 2 - .../bind/bind-9.16.9/conf.patch | 330 ------- .../bind/bind-9.16.9/generate-rndc-key.sh | 8 - .../init.d-add-support-for-read-only-rootfs.patch | 65 -- .../make-etc-initd-bind-stop-work.patch | 42 - .../bind/bind-9.16.9/named.service | 22 - .../meta/recipes-connectivity/bind/bind_9.16.10.bb | 123 +++ poky/meta/recipes-connectivity/bind/bind_9.16.9.bb | 123 --- .../recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb | 57 -- .../recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb | 57 ++ .../inetutils/inetutils_1.9.4.bb | 4 +- .../recipes-connectivity/iproute2/iproute2.inc | 4 +- poky/meta/recipes-connectivity/kea/kea_1.7.10.bb | 78 -- poky/meta/recipes-connectivity/kea/kea_1.8.2.bb | 78 ++ .../mobile-broadband-provider-info_git.bb | 4 +- .../recipes-connectivity/openssh/openssh_8.4p1.bb | 4 +- .../recipes-connectivity/openssl/openssl_1.1.1h.bb | 216 ----- .../recipes-connectivity/openssl/openssl_1.1.1i.bb | 221 +++++ .../ppp/ppp/0001-Fix-build-with-musl.patch | 124 --- .../ppp/ppp/0001-ppp-Remove-unneeded-include.patch | 43 - .../0001-pppd-Fix-bounds-check-in-EAP-code.patch | 47 - poky/meta/recipes-connectivity/ppp/ppp/copts.patch | 21 - .../ppp/ppp/fix-CVE-2015-3310.patch | 30 - .../ppp/makefile-remove-hard-usr-reference.patch | 34 - .../recipes-connectivity/ppp/ppp/makefile.patch | 115 --- .../recipes-connectivity/ppp/ppp/makefix.patch | 40 + .../ppp/ppp/pppd-resolv-varrun.patch | 45 - poky/meta/recipes-connectivity/ppp/ppp_2.4.8.bb | 103 -- poky/meta/recipes-connectivity/ppp/ppp_2.4.9.bb | 96 ++ .../recipes-core/busybox/busybox-inittab_1.32.0.bb | 50 + poky/meta/recipes-core/busybox/busybox.inc | 3 +- poky/meta/recipes-core/busybox/busybox/mdev.cfg | 2 + poky/meta/recipes-core/busybox/busybox_1.32.0.bb | 1 + poky/meta/recipes-core/busybox/files/mdev | 56 +- poky/meta/recipes-core/busybox/files/rcS.default | 31 + poky/meta/recipes-core/coreutils/coreutils_8.32.bb | 3 + poky/meta/recipes-core/dropbear/dropbear.inc | 3 + ...01-ell-add-missing-include-in-dhcp-server.patch | 23 + .../ell/ell/0001-pem.c-do-not-use-rawmemchr.patch | 27 + poky/meta/recipes-core/ell/ell_0.33.bb | 21 - poky/meta/recipes-core/ell/ell_0.35.bb | 24 + ...ts-codegen.py-bump-timeout-to-100-seconds.patch | 26 + .../glib-2.0/glib-2.0/relocate-modules.patch | 2 +- poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb | 49 - poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.4.bb | 50 + ...Allow-adjtime-with-NULL-argument-BZ-26833.patch | 110 +++ .../recipes-core/glibc/glibc/CVE-2020-29562.patch | 155 +++ .../recipes-core/glibc/glibc/CVE-2020-29573.patch | 56 ++ poky/meta/recipes-core/glibc/glibc_2.32.bb | 3 + .../initscripts/init-system-helpers_1.58.bb | 41 - .../initscripts/init-system-helpers_1.60.bb | 41 + .../initscripts/initscripts-1.0/checkroot.sh | 2 +- .../initscripts/initscripts-1.0/mountall.sh | 22 +- poky/meta/recipes-core/kbd/kbd_2.3.0.bb | 38 - poky/meta/recipes-core/kbd/kbd_2.4.0.bb | 45 + poky/meta/recipes-core/meta/buildtools-tarball.bb | 2 +- poky/meta/recipes-core/meta/wic-tools.bb | 9 +- .../musl/musl/0001-crt-Add-.file-directive.patch | 59 -- ...slibdir-and-libdir-as-default-pathes-to-l.patch | 8 +- poky/meta/recipes-core/musl/musl_git.bb | 2 +- ...ig.in-Do-not-include-LDFLAGS-in-generated.patch | 29 + poky/meta/recipes-core/ncurses/ncurses.inc | 2 +- poky/meta/recipes-core/ncurses/ncurses_6.2.bb | 1 + poky/meta/recipes-core/ovmf/ovmf_git.bb | 6 +- poky/meta/recipes-core/psplash/files/psplash-init | 4 +- poky/meta/recipes-core/psplash/psplash_git.bb | 6 + .../readline/readline-8.0/configure-fix.patch | 35 - .../readline/readline-8.0/norpath.patch | 21 - .../readline/readline-8.0/rl-native.map | 12 - .../readline/readline-8.1/configure-fix.patch | 35 + .../readline/readline-8.1/norpath.patch | 21 + .../readline/readline-8.1/rl-native.map | 12 + poky/meta/recipes-core/readline/readline_8.0.bb | 7 - poky/meta/recipes-core/readline/readline_8.1.bb | 7 + .../recipes-core/systemd/systemd-boot_246.6.bb | 70 -- .../recipes-core/systemd/systemd-boot_247.2.bb | 70 ++ .../recipes-core/systemd/systemd-conf_246.1.bb | 44 - .../recipes-core/systemd/systemd-conf_247.2.bb | 44 + poky/meta/recipes-core/systemd/systemd.inc | 4 +- .../systemd/0001-Handle-missing-gshadow.patch | 162 ---- ...t-install-dependency-links-at-install-tim.patch | 8 +- ...01-do-not-disable-buffer-in-writing-files.patch | 411 -------- ....in-use-ROOTPREFIX-without-suffixed-slash.patch | 6 +- .../0002-don-t-use-glibc-specific-qsort_r.patch | 57 +- ...src-login-brightness.c-include-sys-wait.h.patch | 29 - ...e.h-add-__compare_fn_t-and-comparison_fn_.patch | 16 +- .../0003-src-basic-copy.c-include-signal.h.patch | 31 - ...llback-parse_printf_format-implementation.patch | 60 +- ...-cpu-set-util.h-add-__cpu_mask-definition.patch | 58 -- ...asic-missing.h-check-for-missing-strndupa.patch | 158 +-- .../systemd/0006-Include-netinet-if_ether.h.patch | 237 +++-- ...if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch | 156 +++ ...-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch | 153 --- .../0008-add-missing-FTW_-macros-for-musl.patch | 10 +- ...-of-__register_atfork-for-non-glibc-build.patch | 45 + .../0010-Use-uintmax_t-for-handling-rlim_t.patch | 97 ++ ...-of-__register_atfork-for-non-glibc-build.patch | 43 - .../0011-Use-uintmax_t-for-handling-rlim_t.patch | 95 -- ....c-Disable-tests-for-missing-typedefs-in-.patch | 42 + ...ass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 99 ++ ...c-compatible-basename-for-non-glibc-syste.patch | 35 + ...ble-buffering-when-writing-to-oom_score_a.patch | 41 + ....c-Disable-tests-for-missing-typedefs-in-.patch | 39 - ...-XSI-compliant-strerror_r-from-GNU-specif.patch | 62 ++ ...ass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 97 -- ...c-compatible-basename-for-non-glibc-syste.patch | 32 - ...rt_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | 35 + ...ble-buffering-when-writing-to-oom_score_a.patch | 39 - ...ing_type.h-add-__compar_d_fn_t-definition.patch | 30 + ...id-redefinition-of-prctl_mm_map-structure.patch | 32 + ...-XSI-compliant-strerror_r-from-GNU-specif.patch | 60 -- .../systemd/0019-Handle-missing-LOCK_EX.patch | 26 + ...rt_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | 33 - ...ompatible-pointer-type-struct-sockaddr_un.patch | 40 + ...ing_type.h-add-__compar_d_fn_t-definition.patch | 28 - .../systemd/0021-Handle-missing-LOCK_EX.patch | 23 - ...id-redefinition-of-prctl_mm_map-structure.patch | 30 - .../systemd/0021-test-json.c-define-M_PIl.patch | 33 + ...ompatible-pointer-type-struct-sockaddr_un.patch | 37 - ...22-do-not-disable-buffer-in-writing-files.patch | 413 ++++++++ .../systemd/systemd/0023-Include-sys-wait.h.patch | 31 + .../systemd/systemd/0024-Include-signal.h.patch | 33 + .../systemd/0024-test-json.c-define-M_PIl.patch | 31 - .../systemd/0025-Handle-__cpu_mask-usage.patch | 60 ++ .../systemd/0026-Handle-missing-gshadow.patch | 173 ++++ ...elinux-hook-handling-to-enumerate-nexthop.patch | 46 - poky/meta/recipes-core/systemd/systemd_246.6.bb | 732 -------------- poky/meta/recipes-core/systemd/systemd_247.2.bb | 745 ++++++++++++++ poky/meta/recipes-core/sysvinit/sysvinit/rc | 9 +- .../recipes-core/sysvinit/sysvinit/rcS-default | 7 + poky/meta/recipes-core/sysvinit/sysvinit_2.97.bb | 112 --- poky/meta/recipes-core/sysvinit/sysvinit_2.98.bb | 117 +++ ...o-not-build-plymouth-ctrl.c-w-disabled-pl.patch | 52 + ...ck-do-not-assume-__NR_settimeofday_time32.patch | 30 + .../recipes-core/util-linux/util-linux_2.36.1.bb | 361 +++++++ .../recipes-core/util-linux/util-linux_2.36.bb | 359 ------- .../recipes-devtools/binutils/binutils_2.35.bb | 6 +- .../ccache/0001-Improve-SIMD-detection-735.patch | 121 +++ ...0001-blake3-Remove-asm-checks-for-sse-avx.patch | 35 + .../0002-Always-use-64bit-to-print-time_t.patch | 33 + poky/meta/recipes-devtools/ccache/ccache_3.7.11.bb | 32 - poky/meta/recipes-devtools/ccache/ccache_4.1.bb | 27 + .../recipes-devtools/cmake/cmake-native_3.18.4.bb | 53 - .../recipes-devtools/cmake/cmake-native_3.19.2.bb | 53 + poky/meta/recipes-devtools/cmake/cmake.inc | 5 +- ...ineSystem-use-oe-environment-vars-to-load.patch | 6 +- ...ures.cmake-do-not-try-to-run-the-test-bin.patch | 26 + .../0002-cmake-Prevent-the-detection-of-Qt5.patch | 22 +- poky/meta/recipes-devtools/cmake/cmake_3.18.4.bb | 53 - poky/meta/recipes-devtools/cmake/cmake_3.19.2.bb | 53 + .../recipes-devtools/diffstat/diffstat_1.63.bb | 4 +- poky/meta/recipes-devtools/dnf/dnf_4.4.0.bb | 90 -- poky/meta/recipes-devtools/dnf/dnf_4.5.2.bb | 90 ++ poky/meta/recipes-devtools/gcc/gcc-10.2.inc | 1 + .../gcc/0001-lib-Remove-i-86-march-overrides.patch | 113 +++ .../recipes-devtools/gnu-config/gnu-config_git.bb | 4 +- poky/meta/recipes-devtools/go/go-1.15.inc | 5 +- ...permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch | 100 -- .../recipes-devtools/go/go-binary-native_1.15.5.bb | 46 - .../recipes-devtools/go/go-binary-native_1.15.6.bb | 46 + poky/meta/recipes-devtools/libdnf/libdnf_0.55.0.bb | 34 - poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb | 34 + .../libmodulemd/libmodulemd_git.bb | 4 +- .../mtools/mtools/disable-hardcoded-configs.patch | 6 +- .../mtools/mtools/mtools-makeinfo.patch | 78 +- poky/meta/recipes-devtools/mtools/mtools_4.0.25.bb | 50 - poky/meta/recipes-devtools/mtools/mtools_4.0.26.bb | 50 + poky/meta/recipes-devtools/ninja/ninja_1.10.1.bb | 30 - poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb | 30 + ...et-the-OS-negotiate-relative-package-dirs.patch | 43 + poky/meta/recipes-devtools/opkg/opkg_0.4.3.bb | 74 -- poky/meta/recipes-devtools/opkg/opkg_0.4.4.bb | 75 ++ .../patch/patch/CVE-2019-20633.patch | 31 + poky/meta/recipes-devtools/patch/patch_2.7.6.bb | 1 + poky/meta/recipes-devtools/perl/perl_5.32.0.bb | 5 +- ...nt-Lessen-indentation-of-pseudo_client_ig.patch | 69 -- ...nt-Simplify-pseudo_client_ignore_path_chr.patch | 50 - poky/meta/recipes-devtools/pseudo/pseudo_git.bb | 4 +- .../python/python3-hypothesis_5.41.4.bb | 14 - .../python/python3-hypothesis_5.43.3.bb | 14 + .../python/python3-importlib-metadata_3.1.0.bb | 18 - .../python/python3-importlib-metadata_3.3.0.bb | 20 + .../python/python3-packaging_20.4.bb | 14 - .../python/python3-packaging_20.8.bb | 13 + .../recipes-devtools/python/python3-py_1.10.0.bb | 14 + .../recipes-devtools/python/python3-py_1.9.0.bb | 15 - .../python/python3-pygments_2.7.2.bb | 19 - .../python/python3-pygments_2.7.3.bb | 19 + ...ove-the-setup_requires-for-setuptools-scm.patch | 17 +- .../python/python3-pytest_6.1.2.bb | 39 - .../python/python3-pytest_6.2.1.bb | 39 + .../python/python3-setuptools-scm_4.1.2.bb | 23 - .../python/python3-setuptools-scm_5.0.1.bb | 24 + .../python/python3-setuptools_50.3.2.bb | 65 -- .../python/python3-setuptools_51.0.0.bb | 65 ++ .../python/python3/CVE-2020-27619.patch | 69 -- poky/meta/recipes-devtools/python/python3_3.9.0.bb | 376 -------- poky/meta/recipes-devtools/python/python3_3.9.1.bb | 374 ++++++++ poky/meta/recipes-devtools/qemu/qemu.inc | 3 + .../qemu/qemu/CVE-2020-25723.patch | 51 + .../qemu/qemu/CVE-2020-28916.patch | 49 + ...code-lib-rpm-as-the-installation-path-for.patch | 10 +- .../files/0001-rpmdb.c-add-a-missing-include.patch | 25 - poky/meta/recipes-devtools/rpm/rpm_4.16.0.bb | 165 ---- poky/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb | 164 ++++ poky/meta/recipes-devtools/ruby/ruby.inc | 2 +- ...rk-IPPROTO_MAX-last-in-IPPROTO_-constants.patch | 70 -- poky/meta/recipes-devtools/strace/strace_5.10.bb | 59 ++ poky/meta/recipes-devtools/strace/strace_5.9.bb | 56 -- .../syslinux/syslinux_6.04-pre2.bb | 84 +- .../systemd-bootchart/systemd-bootchart_233.bb | 39 - .../systemd-bootchart/systemd-bootchart_234.bb | 37 + poky/meta/recipes-devtools/vala/vala_0.50.1.bb | 5 - poky/meta/recipes-devtools/vala/vala_0.50.2.bb | 5 + .../valgrind/valgrind/remove-for-aarch64 | 2 - .../valgrind/valgrind/remove-for-all | 2 + .../recipes-devtools/valgrind/valgrind/run-ptest | 10 + .../recipes-devtools/valgrind/valgrind_3.16.1.bb | 2 + .../recipes-extended/acpica/acpica_20201113.bb | 49 - .../recipes-extended/acpica/acpica_20201217.bb | 49 + .../bash/bash/CVE-2019-18276.patch | 386 ++++++++ .../bash/bash/bash-CVE-2019-18276.patch | 386 -------- poky/meta/recipes-extended/bash/bash_5.0.bb | 2 +- poky/meta/recipes-extended/bzip2/bzip2/Makefile.am | 2 +- poky/meta/recipes-extended/cups/cups.inc | 4 + .../ethtool/ethtool/avoid_parallel_tests.patch | 6 +- poky/meta/recipes-extended/ethtool/ethtool_5.10.bb | 37 + poky/meta/recipes-extended/ethtool/ethtool_5.9.bb | 37 - poky/meta/recipes-extended/gawk/gawk_5.1.0.bb | 4 + poky/meta/recipes-extended/grep/grep_3.6.bb | 2 + poky/meta/recipes-extended/groff/groff_1.22.4.bb | 2 +- .../recipes-extended/libaio/libaio/destdir.patch | 17 - .../libaio/libaio/system-linkage.patch | 18 +- .../meta/recipes-extended/libaio/libaio_0.3.111.bb | 23 - .../meta/recipes-extended/libaio/libaio_0.3.112.bb | 22 + .../recipes-extended/libtirpc/libtirpc_1.2.6.bb | 26 - .../recipes-extended/libtirpc/libtirpc_1.3.1.bb | 25 + .../recipes-extended/lighttpd/lighttpd_1.4.56.bb | 83 -- .../recipes-extended/lighttpd/lighttpd_1.4.57.bb | 82 ++ ...ltp-pan-Use-long-long-int-to-print-time_t.patch | 33 + poky/meta/recipes-extended/ltp/ltp_20200930.bb | 1 + poky/meta/recipes-extended/man-db/man-db_2.9.3.bb | 6 + .../recipes-extended/man-pages/man-pages_5.09.bb | 36 - .../recipes-extended/man-pages/man-pages_5.10.bb | 36 + .../meta/recipes-extended/minicom/minicom_2.7.1.bb | 2 + poky/meta/recipes-extended/msmtp/msmtp_1.8.13.bb | 27 - poky/meta/recipes-extended/msmtp/msmtp_1.8.14.bb | 27 + ...upport-for-defining-missing-funcitonality.patch | 68 -- .../libpam/0001-Makefile.am-support-usrmage.patch | 28 + ..._namespace-Makefile.am-correctly-install-.patch | 28 + .../pam/libpam/crypt_configure.patch | 40 - .../pam/libpam/include_paths_header.patch | 59 -- .../pam-security-abstract-securetty-handling.patch | 203 ---- .../pam/libpam/pam-unix-nullok-secure.patch | 195 ---- poky/meta/recipes-extended/pam/libpam_1.3.1.bb | 168 ---- poky/meta/recipes-extended/pam/libpam_1.5.1.bb | 162 ++++ poky/meta/recipes-extended/parted/parted_3.3.bb | 5 +- poky/meta/recipes-extended/sed/sed_4.8.bb | 2 + poky/meta/recipes-extended/shadow/shadow.inc | 2 + .../stress-ng/stress-ng_0.11.24.bb | 27 - .../stress-ng/stress-ng_0.12.00.bb | 27 + poky/meta/recipes-extended/sudo/sudo_1.9.3p1.bb | 49 - poky/meta/recipes-extended/sudo/sudo_1.9.4p1.bb | 49 + poky/meta/recipes-extended/timezone/timezone.inc | 6 +- poky/meta/recipes-extended/which/which_2.21.bb | 2 + ...le-sort-all-wildcard-file-list-expansions.patch | 80 ++ poky/meta/recipes-extended/zstd/zstd_1.4.8.bb | 37 + .../meta/recipes-gnome/epiphany/epiphany_3.38.1.bb | 20 - .../meta/recipes-gnome/epiphany/epiphany_3.38.2.bb | 20 + .../gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch | 55 ++ .../recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb | 1 + poky/meta/recipes-gnome/gtk+/gtk+3_3.24.23.bb | 18 - poky/meta/recipes-gnome/gtk+/gtk+3_3.24.24.bb | 18 + .../cantarell-fonts/cantarell-fonts_0.201.bb | 18 - .../cantarell-fonts/cantarell-fonts_0.301.bb | 18 + .../recipes-graphics/libva/libva-initial_2.10.0.bb | 5 + .../recipes-graphics/libva/libva-initial_2.9.0.bb | 5 - .../recipes-graphics/libva/libva-utils_2.10.0.bb | 32 + .../recipes-graphics/libva/libva-utils_2.9.1.bb | 32 - poky/meta/recipes-graphics/libva/libva.inc | 2 +- poky/meta/recipes-graphics/libva/libva_2.10.0.bb | 20 + poky/meta/recipes-graphics/libva/libva_2.9.0.bb | 20 - ...cb-fixes-to-loader-when-using-x11-and-dri.patch | 36 - .../0002-meson.build-make-TLS-ELF-optional.patch | 15 + ...-Enable-asm-unconditionally-now-that-gen_.patch | 147 --- ...max_t-for-formatted-output-of-timespec-me.patch | 51 - poky/meta/recipes-graphics/mesa/mesa-gl_20.2.4.bb | 15 - poky/meta/recipes-graphics/mesa/mesa-gl_20.3.1.bb | 15 + poky/meta/recipes-graphics/mesa/mesa.inc | 34 +- poky/meta/recipes-graphics/mesa/mesa_20.2.4.bb | 2 - poky/meta/recipes-graphics/mesa/mesa_20.3.1.bb | 2 + ...01-render-ops.c-add-missing-format-string.patch | 24 + poky/meta/recipes-graphics/piglit/piglit_git.bb | 3 +- ...de-vendor-libs-and-disable-git-versioning.patch | 19 +- .../recipes-graphics/shaderc/shaderc_2020.3.bb | 33 - .../recipes-graphics/shaderc/shaderc_2020.4.bb | 33 + .../recipes-graphics/spir/spirv-tools_2020.5.bb | 38 - .../recipes-graphics/spir/spirv-tools_2020.6.bb | 38 + .../vulkan/vulkan-headers_1.2.154.0.bb | 18 - .../vulkan/vulkan-headers_1.2.162.0.bb | 18 + ...01-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch | 40 + .../vulkan/vulkan-loader_1.2.154.1.bb | 38 - .../vulkan/vulkan-loader_1.2.162.0.bb | 40 + .../recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +- .../vulkan/vulkan-tools_1.2.154.0.bb | 31 - .../vulkan/vulkan-tools_1.2.162.0.bb | 31 + poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb | 18 - poky/meta/recipes-graphics/xorg-app/xprop_1.2.5.bb | 17 + .../xorg-lib/files/libx11-whitespace.patch | 56 -- .../xorg-lib/libx11-compose-data_1.6.8.bb | 2 +- .../recipes-graphics/xorg-lib/libx11_1.6.12.bb | 45 - .../meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb | 45 + .../xorg-xserver/xserver-xorg_1.20.10.bb | 33 + .../xorg-xserver/xserver-xorg_1.20.9.bb | 33 - .../kern-tools/kern-tools-native_git.bb | 2 +- .../0001-kexec-Fix-build-with-fno-common.patch | 78 -- ...ppc-kexec-ppc.c-correct-double-definition.patch | 23 + ...support-to-build-kexec-tools-with-x32-ABI.patch | 93 -- ...arm-undefine-__NR_kexec_file_load-for-arm.patch | 40 - ...07-kexec-un-break-the-build-on-32-bit-x86.patch | 13 +- .../recipes-kernel/kexec/kexec-tools_2.0.20.bb | 91 -- .../recipes-kernel/kexec/kexec-tools_2.0.21.bb | 88 ++ .../linux-firmware/linux-firmware_20201118.bb | 1004 ------------------- .../linux-firmware/linux-firmware_20201218.bb | 1014 ++++++++++++++++++++ .../linux-libc-headers/linux-libc-headers_5.10.bb | 19 + .../linux-libc-headers/linux-libc-headers_5.8.bb | 18 - poky/meta/recipes-kernel/linux/kernel-devsrc.bb | 2 +- poky/meta/recipes-kernel/linux/linux-dummy.bb | 2 +- poky/meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +- .../recipes-kernel/linux/linux-yocto-rt_5.10.bb | 44 + .../recipes-kernel/linux/linux-yocto-rt_5.4.bb | 6 +- .../recipes-kernel/linux/linux-yocto-rt_5.8.bb | 2 +- .../recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 32 + .../recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 8 +- .../recipes-kernel/linux/linux-yocto-tiny_5.8.bb | 2 +- poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb | 55 ++ poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +- poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb | 2 +- ...ix-objtool-Rename-frame.h-objtool.h-v5.10.patch | 88 ++ ...ake-ordered-extent-tracepoint-take-btrfs_.patch | 179 ++++ ...-fix-ext4-fast-commit-recovery-path-v5.10.patch | 99 ++ ...-kvm-x86-mmu-Add-TDP-MMU-PF-handler-v5.10.patch | 82 ++ ...acepoint-Optimize-using-static_call-v5.10.patch | 196 ++++ ...mp-undefined-symbols-caused-by-incorrect-.patch | 55 ++ .../recipes-kernel/lttng/lttng-modules_2.12.3.bb | 10 +- ...s-regression-disable-the-tools-live-tests.patch | 35 +- .../modutils-initscripts/files/modutils.sh | 2 +- ...rotect-include-and-callsite-with-same-con.patch | 44 + .../recipes-kernel/systemtap/systemtap_git.inc | 5 +- .../gstreamer/gst-devtools_1.18.1.bb | 42 - .../gstreamer/gst-devtools_1.18.2.bb | 42 + .../gstreamer/gst-examples_1.18.1.bb | 32 - .../gstreamer/gst-examples_1.18.2.bb | 32 + .../gstreamer/gstreamer1.0-libav_1.18.1.bb | 22 - .../gstreamer/gstreamer1.0-libav_1.18.2.bb | 22 + .../gstreamer/gstreamer1.0-omx_1.18.1.bb | 46 - .../gstreamer/gstreamer1.0-omx_1.18.2.bb | 46 + .../gstreamer/gstreamer1.0-plugins-bad_1.18.1.bb | 153 --- .../gstreamer/gstreamer1.0-plugins-bad_1.18.2.bb | 146 +++ .../gstreamer/gstreamer1.0-plugins-base_1.18.1.bb | 94 -- .../gstreamer/gstreamer1.0-plugins-base_1.18.2.bb | 94 ++ ...dd-vchostif-library-as-it-is-required-to-.patch | 32 - .../gstreamer/gstreamer1.0-plugins-good_1.18.1.bb | 73 -- .../gstreamer/gstreamer1.0-plugins-good_1.18.2.bb | 72 ++ .../gstreamer/gstreamer1.0-plugins-ugly_1.18.1.bb | 39 - .../gstreamer/gstreamer1.0-plugins-ugly_1.18.2.bb | 39 + .../gstreamer/gstreamer1.0-python_1.18.1.bb | 22 - .../gstreamer/gstreamer1.0-python_1.18.2.bb | 22 + .../gstreamer/gstreamer1.0-rtsp-server_1.18.1.bb | 31 - .../gstreamer/gstreamer1.0-rtsp-server_1.18.2.bb | 31 + .../gstreamer/gstreamer1.0-vaapi_1.18.1.bb | 52 - .../gstreamer/gstreamer1.0-vaapi_1.18.2.bb | 52 + ...inloader.c-when-env-var-is-set-do-not-fal.patch | 51 +- ....h-increse-padding-in-struct-_GstClockEnt.patch | 34 - .../0002-Remove-unused-valgrind-detection.patch | 18 +- ...0003-meson-Add-option-for-installed-tests.patch | 16 +- .../gstreamer/gstreamer1.0_1.18.1.bb | 70 -- .../gstreamer/gstreamer1.0_1.18.2.bb | 69 ++ .../recipes-multimedia/pulseaudio/pulseaudio.inc | 71 +- ...dd-an-option-for-enabling-disabling-Valgr.patch | 67 ++ .../0001-meson-Check-for-__get_cpuid.patch | 82 ++ .../pulseaudio/pulseaudio_14.0.bb | 2 + .../0001-sbc_primitives-Fix-build-on-non-x86.patch | 45 + poky/meta/recipes-multimedia/sbc/sbc_1.4.bb | 23 - poky/meta/recipes-multimedia/sbc/sbc_1.5.bb | 24 + poky/meta/recipes-sato/puzzles/puzzles_git.bb | 2 +- .../recipes-sato/rxvt-unicode/rxvt-unicode.inc | 2 +- ...-longer-exposes-FALSE-and-TRUE-macros-by-.patch | 180 ---- poky/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb | 148 --- poky/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb | 147 +++ poky/meta/recipes-support/apr/apr-util_1.6.1.bb | 5 +- poky/meta/recipes-support/apr/apr_1.7.0.bb | 4 + poky/meta/recipes-support/aspell/aspell_0.60.8.bb | 4 + .../recipes-support/atk/at-spi2-core_2.38.0.bb | 2 + poky/meta/recipes-support/attr/acl_2.2.53.bb | 2 + poky/meta/recipes-support/attr/attr.inc | 4 + .../bash-completion/bash-completion_2.11.bb | 2 + poky/meta/recipes-support/boost/boost-1.74.0.inc | 20 - poky/meta/recipes-support/boost/boost-1.75.0.inc | 20 + ...-Apply-boost-1.62.0-no-forced-flags.patch.patch | 100 -- poky/meta/recipes-support/boost/boost_1.74.0.bb | 11 - poky/meta/recipes-support/boost/boost_1.75.0.bb | 10 + poky/meta/recipes-support/curl/curl_7.73.0.bb | 85 -- poky/meta/recipes-support/curl/curl_7.74.0.bb | 85 ++ .../recipes-support/diffoscope/diffoscope_161.bb | 17 - .../recipes-support/diffoscope/diffoscope_163.bb | 17 + .../recipes-support/enchant/enchant2_2.2.13.bb | 28 - .../recipes-support/enchant/enchant2_2.2.14.bb | 28 + .../gdbm-fix-link-failure-against-gcc-10.patch | 47 - poky/meta/recipes-support/gdbm/gdbm_1.18.1.bb | 44 - poky/meta/recipes-support/gdbm/gdbm_1.19.bb | 43 + ...c-use-a-custom-value-for-the-location-of-.patch | 6 +- .../gnupg/0003-dirmngr-uses-libgpg-error.patch | 18 +- .../recipes-support/gnupg/gnupg/relocate.patch | 2 +- poky/meta/recipes-support/gnupg/gnupg_2.2.23.bb | 80 -- poky/meta/recipes-support/gnupg/gnupg_2.2.26.bb | 80 ++ .../recipes-support/gnutls/gnutls/arm_eabi.patch | 15 +- poky/meta/recipes-support/gnutls/gnutls_3.6.15.bb | 67 -- poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb | 67 ++ poky/meta/recipes-support/icu/icu_68.1.bb | 150 --- poky/meta/recipes-support/icu/icu_68.2.bb | 150 +++ .../libcap-ng/libcap-ng-python_0.8.1.bb | 29 - .../libcap-ng/libcap-ng-python_0.8.2.bb | 29 + poky/meta/recipes-support/libcap-ng/libcap-ng.inc | 4 +- .../recipes-support/libcap-ng/libcap-ng_0.8.1.bb | 17 - .../recipes-support/libcap-ng/libcap-ng_0.8.2.bb | 17 + .../0001-tests-do-not-statically-link-a-test.patch | 10 +- poky/meta/recipes-support/libcap/libcap_2.45.bb | 76 -- poky/meta/recipes-support/libcap/libcap_2.46.bb | 76 ++ .../libexif/files/CVE-2020-0198.patch | 66 ++ .../libexif/files/CVE-2020-0452.patch | 39 + .../meta/recipes-support/libexif/libexif_0.6.22.bb | 2 + .../files/0001-Make-man-pages-reproducible.patch | 30 - ...001-Makefile-cleanup-install-for-rebuilds.patch | 56 -- .../libjitterentropy/libjitterentropy_2.2.0.bb | 29 - .../libjitterentropy/libjitterentropy_3.0.0.bb | 27 + .../libksba/ksba-add-pkgconfig-support.patch | 18 +- poky/meta/recipes-support/libksba/libksba_1.4.0.bb | 29 - poky/meta/recipes-support/libksba/libksba_1.5.0.bb | 29 + .../meta/recipes-support/libpcre/libpcre2_10.35.bb | 52 - .../meta/recipes-support/libpcre/libpcre2_10.36.bb | 52 + poky/meta/recipes-support/libusb/libusb1_1.0.23.bb | 44 - poky/meta/recipes-support/libusb/libusb1_1.0.24.bb | 43 + poky/meta/recipes-support/nettle/nettle_3.6.bb | 3 + poky/meta/recipes-support/sqlite/sqlite3_3.33.0.bb | 12 - poky/meta/recipes-support/sqlite/sqlite3_3.34.0.bb | 12 + poky/scripts/lib/devtool/upgrade.py | 4 +- poky/scripts/lib/wic/ksparser.py | 17 + poky/scripts/lib/wic/partition.py | 12 +- poky/scripts/lib/wic/plugins/imager/direct.py | 7 + poky/scripts/lib/wic/plugins/source/empty.py | 32 + 561 files changed, 14310 insertions(+), 12984 deletions(-) create mode 100755 poky/contrib/git-hooks/sendemail-validate.sample create mode 100644 poky/meta-selftest/classes/test-mkimage-wrapper.bbclass create mode 100644 poky/meta-selftest/lib/pseudo_pyc_test1.py create mode 100644 poky/meta-selftest/lib/pseudo_pyc_test2.py create mode 100644 poky/meta-selftest/recipes-test/pseudo-pyc-test/pseudo-pyc-test.bb create mode 100644 poky/meta-selftest/wic/test_empty_plugin.wks create mode 100644 poky/meta/lib/oeqa/runtime/cases/suspend.py create mode 100644 poky/meta/lib/oeqa/selftest/cases/fitimage.py create mode 100644 poky/meta/lib/oeqa/selftest/cases/pseudo.py create mode 100644 poky/meta/recipes-bsp/grub/files/determinism.patch create mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.10/0001-avoid-start-failure-with-bind-user.patch create mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch create mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.10/bind-ensure-searching-for-json-headers-searches-sysr.patch create mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.10/bind9 create mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.10/conf.patch create mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.10/generate-rndc-key.sh create mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.10/init.d-add-support-for-read-only-rootfs.patch create mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.10/make-etc-initd-bind-stop-work.patch create mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.10/named.service delete mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.9/0001-avoid-start-failure-with-bind-user.patch delete mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.9/0001-named-lwresd-V-and-start-log-hide-build-options.patch delete mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.9/bind-ensure-searching-for-json-headers-searches-sysr.patch delete mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.9/bind9 delete mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.9/conf.patch delete mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.9/generate-rndc-key.sh delete mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.9/init.d-add-support-for-read-only-rootfs.patch delete mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.9/make-etc-initd-bind-stop-work.patch delete mode 100644 poky/meta/recipes-connectivity/bind/bind-9.16.9/named.service create mode 100644 poky/meta/recipes-connectivity/bind/bind_9.16.10.bb delete mode 100644 poky/meta/recipes-connectivity/bind/bind_9.16.9.bb delete mode 100644 poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb create mode 100644 poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb delete mode 100644 poky/meta/recipes-connectivity/kea/kea_1.7.10.bb create mode 100644 poky/meta/recipes-connectivity/kea/kea_1.8.2.bb delete mode 100644 poky/meta/recipes-connectivity/openssl/openssl_1.1.1h.bb create mode 100644 poky/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb delete mode 100644 poky/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch delete mode 100644 poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch delete mode 100644 poky/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch delete mode 100644 poky/meta/recipes-connectivity/ppp/ppp/copts.patch delete mode 100644 poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch delete mode 100644 poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch delete mode 100644 poky/meta/recipes-connectivity/ppp/ppp/makefile.patch create mode 100644 poky/meta/recipes-connectivity/ppp/ppp/makefix.patch delete mode 100644 poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch delete mode 100644 poky/meta/recipes-connectivity/ppp/ppp_2.4.8.bb create mode 100644 poky/meta/recipes-connectivity/ppp/ppp_2.4.9.bb create mode 100644 poky/meta/recipes-core/busybox/files/rcS.default create mode 100644 poky/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch create mode 100644 poky/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch delete mode 100644 poky/meta/recipes-core/ell/ell_0.33.bb create mode 100644 poky/meta/recipes-core/ell/ell_0.35.bb create mode 100644 poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch delete mode 100644 poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb create mode 100644 poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.4.bb create mode 100644 poky/meta/recipes-core/glibc/glibc/0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch create mode 100644 poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch create mode 100644 poky/meta/recipes-core/glibc/glibc/CVE-2020-29573.patch delete mode 100644 poky/meta/recipes-core/initscripts/init-system-helpers_1.58.bb create mode 100644 poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb delete mode 100644 poky/meta/recipes-core/kbd/kbd_2.3.0.bb create mode 100644 poky/meta/recipes-core/kbd/kbd_2.4.0.bb create mode 100644 poky/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch delete mode 100644 poky/meta/recipes-core/readline/readline-8.0/configure-fix.patch delete mode 100644 poky/meta/recipes-core/readline/readline-8.0/norpath.patch delete mode 100644 poky/meta/recipes-core/readline/readline-8.0/rl-native.map create mode 100644 poky/meta/recipes-core/readline/readline-8.1/configure-fix.patch create mode 100644 poky/meta/recipes-core/readline/readline-8.1/norpath.patch create mode 100644 poky/meta/recipes-core/readline/readline-8.1/rl-native.map delete mode 100644 poky/meta/recipes-core/readline/readline_8.0.bb create mode 100644 poky/meta/recipes-core/readline/readline_8.1.bb delete mode 100644 poky/meta/recipes-core/systemd/systemd-boot_246.6.bb create mode 100644 poky/meta/recipes-core/systemd/systemd-boot_247.2.bb delete mode 100644 poky/meta/recipes-core/systemd/systemd-conf_246.1.bb create mode 100644 poky/meta/recipes-core/systemd/systemd-conf_247.2.bb delete mode 100644 poky/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0021-Handle-missing-LOCK_EX.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch create mode 100644 poky/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd/selinux-hook-handling-to-enumerate-nexthop.patch delete mode 100644 poky/meta/recipes-core/systemd/systemd_246.6.bb create mode 100644 poky/meta/recipes-core/systemd/systemd_247.2.bb delete mode 100644 poky/meta/recipes-core/sysvinit/sysvinit_2.97.bb create mode 100644 poky/meta/recipes-core/sysvinit/sysvinit_2.98.bb create mode 100644 poky/meta/recipes-core/util-linux/util-linux/0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch create mode 100644 poky/meta/recipes-core/util-linux/util-linux/0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch create mode 100644 poky/meta/recipes-core/util-linux/util-linux_2.36.1.bb delete mode 100644 poky/meta/recipes-core/util-linux/util-linux_2.36.bb create mode 100644 poky/meta/recipes-devtools/ccache/ccache/0001-Improve-SIMD-detection-735.patch create mode 100644 poky/meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch create mode 100644 poky/meta/recipes-devtools/ccache/ccache/0002-Always-use-64bit-to-print-time_t.patch delete mode 100644 poky/meta/recipes-devtools/ccache/ccache_3.7.11.bb create mode 100644 poky/meta/recipes-devtools/ccache/ccache_4.1.bb delete mode 100644 poky/meta/recipes-devtools/cmake/cmake-native_3.18.4.bb create mode 100644 poky/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb create mode 100644 poky/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch delete mode 100644 poky/meta/recipes-devtools/cmake/cmake_3.18.4.bb create mode 100644 poky/meta/recipes-devtools/cmake/cmake_3.19.2.bb delete mode 100644 poky/meta/recipes-devtools/dnf/dnf_4.4.0.bb create mode 100644 poky/meta/recipes-devtools/dnf/dnf_4.5.2.bb create mode 100644 poky/meta/recipes-devtools/gcc/gcc/0001-lib-Remove-i-86-march-overrides.patch delete mode 100644 poky/meta/recipes-devtools/go/go-1.15/0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch delete mode 100644 poky/meta/recipes-devtools/go/go-binary-native_1.15.5.bb create mode 100644 poky/meta/recipes-devtools/go/go-binary-native_1.15.6.bb delete mode 100644 poky/meta/recipes-devtools/libdnf/libdnf_0.55.0.bb create mode 100644 poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb delete mode 100644 poky/meta/recipes-devtools/mtools/mtools_4.0.25.bb create mode 100644 poky/meta/recipes-devtools/mtools/mtools_4.0.26.bb delete mode 100644 poky/meta/recipes-devtools/ninja/ninja_1.10.1.bb create mode 100644 poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb create mode 100644 poky/meta/recipes-devtools/opkg/opkg/0001-tests-let-the-OS-negotiate-relative-package-dirs.patch delete mode 100644 poky/meta/recipes-devtools/opkg/opkg_0.4.3.bb create mode 100644 poky/meta/recipes-devtools/opkg/opkg_0.4.4.bb create mode 100644 poky/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch delete mode 100644 poky/meta/recipes-devtools/pseudo/files/0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch delete mode 100644 poky/meta/recipes-devtools/pseudo/files/0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch delete mode 100644 poky/meta/recipes-devtools/python/python3-hypothesis_5.41.4.bb create mode 100644 poky/meta/recipes-devtools/python/python3-hypothesis_5.43.3.bb delete mode 100644 poky/meta/recipes-devtools/python/python3-importlib-metadata_3.1.0.bb create mode 100644 poky/meta/recipes-devtools/python/python3-importlib-metadata_3.3.0.bb delete mode 100644 poky/meta/recipes-devtools/python/python3-packaging_20.4.bb create mode 100644 poky/meta/recipes-devtools/python/python3-packaging_20.8.bb create mode 100644 poky/meta/recipes-devtools/python/python3-py_1.10.0.bb delete mode 100644 poky/meta/recipes-devtools/python/python3-py_1.9.0.bb delete mode 100644 poky/meta/recipes-devtools/python/python3-pygments_2.7.2.bb create mode 100644 poky/meta/recipes-devtools/python/python3-pygments_2.7.3.bb delete mode 100644 poky/meta/recipes-devtools/python/python3-pytest_6.1.2.bb create mode 100644 poky/meta/recipes-devtools/python/python3-pytest_6.2.1.bb delete mode 100644 poky/meta/recipes-devtools/python/python3-setuptools-scm_4.1.2.bb create mode 100644 poky/meta/recipes-devtools/python/python3-setuptools-scm_5.0.1.bb delete mode 100644 poky/meta/recipes-devtools/python/python3-setuptools_50.3.2.bb create mode 100644 poky/meta/recipes-devtools/python/python3-setuptools_51.0.0.bb delete mode 100644 poky/meta/recipes-devtools/python/python3/CVE-2020-27619.patch delete mode 100644 poky/meta/recipes-devtools/python/python3_3.9.0.bb create mode 100644 poky/meta/recipes-devtools/python/python3_3.9.1.bb create mode 100644 poky/meta/recipes-devtools/qemu/qemu/CVE-2020-25723.patch create mode 100644 poky/meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch delete mode 100644 poky/meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch delete mode 100644 poky/meta/recipes-devtools/rpm/rpm_4.16.0.bb create mode 100644 poky/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb delete mode 100644 poky/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch create mode 100644 poky/meta/recipes-devtools/strace/strace_5.10.bb delete mode 100644 poky/meta/recipes-devtools/strace/strace_5.9.bb delete mode 100644 poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb create mode 100644 poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb delete mode 100644 poky/meta/recipes-devtools/vala/vala_0.50.1.bb create mode 100644 poky/meta/recipes-devtools/vala/vala_0.50.2.bb create mode 100644 poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all delete mode 100644 poky/meta/recipes-extended/acpica/acpica_20201113.bb create mode 100644 poky/meta/recipes-extended/acpica/acpica_20201217.bb create mode 100644 poky/meta/recipes-extended/bash/bash/CVE-2019-18276.patch delete mode 100644 poky/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch create mode 100644 poky/meta/recipes-extended/ethtool/ethtool_5.10.bb delete mode 100644 poky/meta/recipes-extended/ethtool/ethtool_5.9.bb delete mode 100644 poky/meta/recipes-extended/libaio/libaio/destdir.patch delete mode 100644 poky/meta/recipes-extended/libaio/libaio_0.3.111.bb create mode 100644 poky/meta/recipes-extended/libaio/libaio_0.3.112.bb delete mode 100644 poky/meta/recipes-extended/libtirpc/libtirpc_1.2.6.bb create mode 100644 poky/meta/recipes-extended/libtirpc/libtirpc_1.3.1.bb delete mode 100644 poky/meta/recipes-extended/lighttpd/lighttpd_1.4.56.bb create mode 100644 poky/meta/recipes-extended/lighttpd/lighttpd_1.4.57.bb create mode 100644 poky/meta/recipes-extended/ltp/ltp/0001-ltp-pan-Use-long-long-int-to-print-time_t.patch delete mode 100644 poky/meta/recipes-extended/man-pages/man-pages_5.09.bb create mode 100644 poky/meta/recipes-extended/man-pages/man-pages_5.10.bb delete mode 100644 poky/meta/recipes-extended/msmtp/msmtp_1.8.13.bb create mode 100644 poky/meta/recipes-extended/msmtp/msmtp_1.8.14.bb delete mode 100644 poky/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch create mode 100644 poky/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch create mode 100644 poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch delete mode 100644 poky/meta/recipes-extended/pam/libpam/crypt_configure.patch delete mode 100644 poky/meta/recipes-extended/pam/libpam/include_paths_header.patch delete mode 100644 poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch delete mode 100644 poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch delete mode 100644 poky/meta/recipes-extended/pam/libpam_1.3.1.bb create mode 100644 poky/meta/recipes-extended/pam/libpam_1.5.1.bb delete mode 100644 poky/meta/recipes-extended/stress-ng/stress-ng_0.11.24.bb create mode 100644 poky/meta/recipes-extended/stress-ng/stress-ng_0.12.00.bb delete mode 100644 poky/meta/recipes-extended/sudo/sudo_1.9.3p1.bb create mode 100644 poky/meta/recipes-extended/sudo/sudo_1.9.4p1.bb create mode 100644 poky/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch create mode 100644 poky/meta/recipes-extended/zstd/zstd_1.4.8.bb delete mode 100644 poky/meta/recipes-gnome/epiphany/epiphany_3.38.1.bb create mode 100644 poky/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb create mode 100644 poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch delete mode 100644 poky/meta/recipes-gnome/gtk+/gtk+3_3.24.23.bb create mode 100644 poky/meta/recipes-gnome/gtk+/gtk+3_3.24.24.bb delete mode 100644 poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.201.bb create mode 100644 poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb create mode 100644 poky/meta/recipes-graphics/libva/libva-initial_2.10.0.bb delete mode 100644 poky/meta/recipes-graphics/libva/libva-initial_2.9.0.bb create mode 100644 poky/meta/recipes-graphics/libva/libva-utils_2.10.0.bb delete mode 100644 poky/meta/recipes-graphics/libva/libva-utils_2.9.1.bb create mode 100644 poky/meta/recipes-graphics/libva/libva_2.10.0.bb delete mode 100644 poky/meta/recipes-graphics/libva/libva_2.9.0.bb delete mode 100644 poky/meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch delete mode 100644 poky/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch delete mode 100644 poky/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch delete mode 100644 poky/meta/recipes-graphics/mesa/mesa-gl_20.2.4.bb create mode 100644 poky/meta/recipes-graphics/mesa/mesa-gl_20.3.1.bb delete mode 100644 poky/meta/recipes-graphics/mesa/mesa_20.2.4.bb create mode 100644 poky/meta/recipes-graphics/mesa/mesa_20.3.1.bb create mode 100644 poky/meta/recipes-graphics/piglit/piglit/0001-render-ops.c-add-missing-format-string.patch delete mode 100644 poky/meta/recipes-graphics/shaderc/shaderc_2020.3.bb create mode 100644 poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb delete mode 100644 poky/meta/recipes-graphics/spir/spirv-tools_2020.5.bb create mode 100644 poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb delete mode 100644 poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.154.0.bb create mode 100644 poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.162.0.bb create mode 100644 poky/meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch delete mode 100644 poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.154.1.bb create mode 100644 poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb delete mode 100644 poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.154.0.bb create mode 100644 poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.162.0.bb delete mode 100644 poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb create mode 100644 poky/meta/recipes-graphics/xorg-app/xprop_1.2.5.bb delete mode 100644 poky/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch delete mode 100644 poky/meta/recipes-graphics/xorg-lib/libx11_1.6.12.bb create mode 100644 poky/meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb create mode 100644 poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb delete mode 100644 poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb delete mode 100644 poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch create mode 100644 poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch delete mode 100644 poky/meta/recipes-kernel/kexec/kexec-tools/0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch delete mode 100644 poky/meta/recipes-kernel/kexec/kexec-tools/0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch delete mode 100644 poky/meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb create mode 100644 poky/meta/recipes-kernel/kexec/kexec-tools_2.0.21.bb delete mode 100644 poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201118.bb create mode 100644 poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201218.bb create mode 100644 poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb delete mode 100644 poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.8.bb create mode 100644 poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb create mode 100644 poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb create mode 100644 poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb create mode 100644 poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-objtool-Rename-frame.h-objtool.h-v5.10.patch create mode 100644 poky/meta/recipes-kernel/lttng/lttng-modules/0009-fix-btrfs-make-ordered-extent-tracepoint-take-btrfs_.patch create mode 100644 poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-ext4-fast-commit-recovery-path-v5.10.patch create mode 100644 poky/meta/recipes-kernel/lttng/lttng-modules/0012-fix-kvm-x86-mmu-Add-TDP-MMU-PF-handler-v5.10.patch create mode 100644 poky/meta/recipes-kernel/lttng/lttng-modules/0014-fix-tracepoint-Optimize-using-static_call-v5.10.patch create mode 100644 poky/meta/recipes-kernel/lttng/lttng-modules/0016-fix-statedump-undefined-symbols-caused-by-incorrect-.patch create mode 100644 poky/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.1.bb create mode 100644 poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.2.bb delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.1.bb create mode 100644 poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.2.bb delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.1.bb create mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.2.bb delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.1.bb create mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.2.bb delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.1.bb create mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.2.bb delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.1.bb create mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.2.bb delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb create mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.2.bb delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.1.bb create mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.2.bb delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.1.bb create mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.2.bb delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.1.bb create mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.2.bb delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.1.bb create mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.2.bb delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch delete mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb create mode 100644 poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.2.bb create mode 100644 poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch create mode 100644 poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch create mode 100644 poky/meta/recipes-multimedia/sbc/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch delete mode 100644 poky/meta/recipes-multimedia/sbc/sbc_1.4.bb create mode 100644 poky/meta/recipes-multimedia/sbc/sbc_1.5.bb delete mode 100644 poky/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch delete mode 100644 poky/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb create mode 100644 poky/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb delete mode 100644 poky/meta/recipes-support/boost/boost-1.74.0.inc create mode 100644 poky/meta/recipes-support/boost/boost-1.75.0.inc delete mode 100644 poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch delete mode 100644 poky/meta/recipes-support/boost/boost_1.74.0.bb create mode 100644 poky/meta/recipes-support/boost/boost_1.75.0.bb delete mode 100644 poky/meta/recipes-support/curl/curl_7.73.0.bb create mode 100644 poky/meta/recipes-support/curl/curl_7.74.0.bb delete mode 100644 poky/meta/recipes-support/diffoscope/diffoscope_161.bb create mode 100644 poky/meta/recipes-support/diffoscope/diffoscope_163.bb delete mode 100644 poky/meta/recipes-support/enchant/enchant2_2.2.13.bb create mode 100644 poky/meta/recipes-support/enchant/enchant2_2.2.14.bb delete mode 100644 poky/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch delete mode 100644 poky/meta/recipes-support/gdbm/gdbm_1.18.1.bb create mode 100644 poky/meta/recipes-support/gdbm/gdbm_1.19.bb delete mode 100644 poky/meta/recipes-support/gnupg/gnupg_2.2.23.bb create mode 100644 poky/meta/recipes-support/gnupg/gnupg_2.2.26.bb delete mode 100644 poky/meta/recipes-support/gnutls/gnutls_3.6.15.bb create mode 100644 poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb delete mode 100644 poky/meta/recipes-support/icu/icu_68.1.bb create mode 100644 poky/meta/recipes-support/icu/icu_68.2.bb delete mode 100644 poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.1.bb create mode 100644 poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb delete mode 100644 poky/meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb create mode 100644 poky/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb delete mode 100644 poky/meta/recipes-support/libcap/libcap_2.45.bb create mode 100644 poky/meta/recipes-support/libcap/libcap_2.46.bb create mode 100644 poky/meta/recipes-support/libexif/files/CVE-2020-0198.patch create mode 100644 poky/meta/recipes-support/libexif/files/CVE-2020-0452.patch delete mode 100644 poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch delete mode 100644 poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch delete mode 100644 poky/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb create mode 100644 poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb delete mode 100644 poky/meta/recipes-support/libksba/libksba_1.4.0.bb create mode 100644 poky/meta/recipes-support/libksba/libksba_1.5.0.bb delete mode 100644 poky/meta/recipes-support/libpcre/libpcre2_10.35.bb create mode 100644 poky/meta/recipes-support/libpcre/libpcre2_10.36.bb delete mode 100644 poky/meta/recipes-support/libusb/libusb1_1.0.23.bb create mode 100644 poky/meta/recipes-support/libusb/libusb1_1.0.24.bb delete mode 100644 poky/meta/recipes-support/sqlite/sqlite3_3.33.0.bb create mode 100644 poky/meta/recipes-support/sqlite/sqlite3_3.34.0.bb create mode 100644 poky/scripts/lib/wic/plugins/source/empty.py diff --git a/poky/bitbake/lib/bb/cache.py b/poky/bitbake/lib/bb/cache.py index b8054e028..36270d009 100644 --- a/poky/bitbake/lib/bb/cache.py +++ b/poky/bitbake/lib/bb/cache.py @@ -26,7 +26,7 @@ import re logger = logging.getLogger("BitBake.Cache") -__cache_version__ = "153" +__cache_version__ = "154" def getCacheFile(path, filename, mc, data_hash): mcspec = '' @@ -94,6 +94,7 @@ class CoreRecipeInfo(RecipeInfoCommon): if not self.packages: self.packages.append(self.pn) self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata) + self.rprovides_pkg = self.pkgvar('RPROVIDES', self.packages, metadata) self.skipreason = self.getvar('__SKIPPED', metadata) if self.skipreason: @@ -120,7 +121,6 @@ class CoreRecipeInfo(RecipeInfoCommon): self.depends = self.depvar('DEPENDS', metadata) self.rdepends = self.depvar('RDEPENDS', metadata) self.rrecommends = self.depvar('RRECOMMENDS', metadata) - self.rprovides_pkg = self.pkgvar('RPROVIDES', self.packages, metadata) self.rdepends_pkg = self.pkgvar('RDEPENDS', self.packages, metadata) self.rrecommends_pkg = self.pkgvar('RRECOMMENDS', self.packages, metadata) self.inherits = self.getvar('__inherit_cache', metadata, expand=False) diff --git a/poky/bitbake/lib/bb/cooker.py b/poky/bitbake/lib/bb/cooker.py index 1f4cc1e96..83cfee7fb 100644 --- a/poky/bitbake/lib/bb/cooker.py +++ b/poky/bitbake/lib/bb/cooker.py @@ -73,7 +73,9 @@ class SkippedPackage: self.pn = info.pn self.skipreason = info.skipreason self.provides = info.provides - self.rprovides = info.rprovides + self.rprovides = info.packages + info.rprovides + for package in info.packages: + self.rprovides += info.rprovides_pkg[package] elif reason: self.skipreason = reason diff --git a/poky/bitbake/lib/bb/data_smart.py b/poky/bitbake/lib/bb/data_smart.py index c559102cf..2328c334a 100644 --- a/poky/bitbake/lib/bb/data_smart.py +++ b/poky/bitbake/lib/bb/data_smart.py @@ -1005,7 +1005,7 @@ class DataSmart(MutableMapping): else: data.update({key:value}) - varflags = d.getVarFlags(key, internalflags = True) + varflags = d.getVarFlags(key, internalflags = True, expand=["vardepvalue"]) if not varflags: continue for f in varflags: diff --git a/poky/bitbake/lib/bb/fetch2/git.py b/poky/bitbake/lib/bb/fetch2/git.py index 490d57fbb..df9538a60 100644 --- a/poky/bitbake/lib/bb/fetch2/git.py +++ b/poky/bitbake/lib/bb/fetch2/git.py @@ -220,7 +220,12 @@ class Git(FetchMethod): ud.shallow = False if ud.usehead: - ud.unresolvedrev['default'] = 'HEAD' + # When usehead is set let's associate 'HEAD' with the unresolved + # rev of this repository. This will get resolved into a revision + # later. If an actual revision happens to have also been provided + # then this setting will be overridden. + for name in ud.names: + ud.unresolvedrev[name] = 'HEAD' ud.basecmd = d.getVar("FETCHCMD_git") or "git -c core.fsyncobjectfiles=0" diff --git a/poky/bitbake/lib/bb/tests/fetch.py b/poky/bitbake/lib/bb/tests/fetch.py index da17d7f28..1452d7615 100644 --- a/poky/bitbake/lib/bb/tests/fetch.py +++ b/poky/bitbake/lib/bb/tests/fetch.py @@ -654,6 +654,58 @@ class FetcherLocalTest(FetcherTest): with self.assertRaises(bb.fetch2.UnpackError): self.fetchUnpack(['file://a;subdir=/bin/sh']) + def test_local_gitfetch_usehead(self): + # Create dummy local Git repo + src_dir = tempfile.mkdtemp(dir=self.tempdir, + prefix='gitfetch_localusehead_') + src_dir = os.path.abspath(src_dir) + bb.process.run("git init", cwd=src_dir) + bb.process.run("git commit --allow-empty -m'Dummy commit'", + cwd=src_dir) + # Use other branch than master + bb.process.run("git checkout -b my-devel", cwd=src_dir) + bb.process.run("git commit --allow-empty -m'Dummy commit 2'", + cwd=src_dir) + stdout = bb.process.run("git rev-parse HEAD", cwd=src_dir) + orig_rev = stdout[0].strip() + + # Fetch and check revision + self.d.setVar("SRCREV", "AUTOINC") + url = "git://" + src_dir + ";protocol=file;usehead=1" + fetcher = bb.fetch.Fetch([url], self.d) + fetcher.download() + fetcher.unpack(self.unpackdir) + stdout = bb.process.run("git rev-parse HEAD", + cwd=os.path.join(self.unpackdir, 'git')) + unpack_rev = stdout[0].strip() + self.assertEqual(orig_rev, unpack_rev) + + def test_local_gitfetch_usehead_withname(self): + # Create dummy local Git repo + src_dir = tempfile.mkdtemp(dir=self.tempdir, + prefix='gitfetch_localusehead_') + src_dir = os.path.abspath(src_dir) + bb.process.run("git init", cwd=src_dir) + bb.process.run("git commit --allow-empty -m'Dummy commit'", + cwd=src_dir) + # Use other branch than master + bb.process.run("git checkout -b my-devel", cwd=src_dir) + bb.process.run("git commit --allow-empty -m'Dummy commit 2'", + cwd=src_dir) + stdout = bb.process.run("git rev-parse HEAD", cwd=src_dir) + orig_rev = stdout[0].strip() + + # Fetch and check revision + self.d.setVar("SRCREV", "AUTOINC") + url = "git://" + src_dir + ";protocol=file;usehead=1;name=newName" + fetcher = bb.fetch.Fetch([url], self.d) + fetcher.download() + fetcher.unpack(self.unpackdir) + stdout = bb.process.run("git rev-parse HEAD", + cwd=os.path.join(self.unpackdir, 'git')) + unpack_rev = stdout[0].strip() + self.assertEqual(orig_rev, unpack_rev) + class FetcherNoNetworkTest(FetcherTest): def setUp(self): super().setUp() @@ -844,35 +896,21 @@ class FetcherNetworkTest(FetcherTest): self.assertRaises(bb.fetch.FetchError, self.gitfetcher, url1, url2) @skipIfNoNetwork() - def test_gitfetch_localusehead(self): - # Create dummy local Git repo - src_dir = tempfile.mkdtemp(dir=self.tempdir, - prefix='gitfetch_localusehead_') - src_dir = os.path.abspath(src_dir) - bb.process.run("git init", cwd=src_dir) - bb.process.run("git commit --allow-empty -m'Dummy commit'", - cwd=src_dir) - # Use other branch than master - bb.process.run("git checkout -b my-devel", cwd=src_dir) - bb.process.run("git commit --allow-empty -m'Dummy commit 2'", - cwd=src_dir) - stdout = bb.process.run("git rev-parse HEAD", cwd=src_dir) - orig_rev = stdout[0].strip() - - # Fetch and check revision - self.d.setVar("SRCREV", "AUTOINC") - url = "git://" + src_dir + ";protocol=file;usehead=1" - fetcher = bb.fetch.Fetch([url], self.d) - fetcher.download() - fetcher.unpack(self.unpackdir) - stdout = bb.process.run("git rev-parse HEAD", - cwd=os.path.join(self.unpackdir, 'git')) - unpack_rev = stdout[0].strip() - self.assertEqual(orig_rev, unpack_rev) + def test_gitfetch_usehead(self): + # Since self.gitfetcher() sets SRCREV we expect this to override + # `usehead=1' and instead fetch the specified SRCREV. See + # test_local_gitfetch_usehead() for a positive use of the usehead + # feature. + url = "git://git.openembedded.org/bitbake;usehead=1" + self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) @skipIfNoNetwork() - def test_gitfetch_remoteusehead(self): - url = "git://git.openembedded.org/bitbake;usehead=1" + def test_gitfetch_usehead_withname(self): + # Since self.gitfetcher() sets SRCREV we expect this to override + # `usehead=1' and instead fetch the specified SRCREV. See + # test_local_gitfetch_usehead() for a positive use of the usehead + # feature. + url = "git://git.openembedded.org/bitbake;usehead=1;name=newName" self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) @skipIfNoNetwork() diff --git a/poky/bitbake/lib/bb/utils.py b/poky/bitbake/lib/bb/utils.py index f73d31fb7..5c775bd8a 100644 --- a/poky/bitbake/lib/bb/utils.py +++ b/poky/bitbake/lib/bb/utils.py @@ -129,6 +129,7 @@ def vercmp(ta, tb): return r def vercmp_string(a, b): + """ Split version strings and compare them """ ta = split_version(a) tb = split_version(b) return vercmp(ta, tb) @@ -247,6 +248,12 @@ def explode_dep_versions2(s, *, sort=True): return r def explode_dep_versions(s): + """ + Take an RDEPENDS style string of format: + "DEPEND1 (optional version) DEPEND2 (optional version) ..." + skip null value and items appeared in dependancy string multiple times + and return a dictionary of dependencies and versions. + """ r = explode_dep_versions2(s) for d in r: if not r[d]: @@ -692,7 +699,7 @@ def remove(path, recurse=False, ionice=False): raise def prunedir(topdir, ionice=False): - # Delete everything reachable from the directory named in 'topdir'. + """ Delete everything reachable from the directory named in 'topdir'. """ # CAUTION: This is dangerous! if _check_unsafe_delete_path(topdir): raise Exception('bb.utils.prunedir: called with dangerous path "%s", refusing to delete!' % topdir) @@ -703,8 +710,10 @@ def prunedir(topdir, ionice=False): # but thats possibly insane and suffixes is probably going to be small # def prune_suffix(var, suffixes, d): - # See if var ends with any of the suffixes listed and - # remove it if found + """ + See if var ends with any of the suffixes listed and + remove it if found + """ for suffix in suffixes: if suffix and var.endswith(suffix): return var[:-len(suffix)] @@ -956,6 +965,10 @@ def umask(new_mask): os.umask(current_mask) def to_boolean(string, default=None): + """ + Check input string and return boolean value True/False/None + depending upon the checks + """ if not string: return default @@ -999,6 +1012,23 @@ def contains(variable, checkvalues, truevalue, falsevalue, d): return falsevalue def contains_any(variable, checkvalues, truevalue, falsevalue, d): + """Check if a variable contains any values specified. + + Arguments: + + variable -- the variable name. This will be fetched and expanded (using + d.getVar(variable)) and then split into a set(). + + checkvalues -- if this is a string it is split on whitespace into a set(), + otherwise coerced directly into a set(). + + truevalue -- the value to return if checkvalues is a subset of variable. + + falsevalue -- the value to return if variable is empty or if checkvalues is + not a subset of variable. + + d -- the data store. + """ val = d.getVar(variable) if not val: return falsevalue @@ -1560,8 +1590,8 @@ def set_process_name(name): except: pass -# export common proxies variables from datastore to environment def export_proxies(d): + """ export common proxies variables from datastore to environment """ import os variables = ['http_proxy', 'HTTP_PROXY', 'https_proxy', 'HTTPS_PROXY', diff --git a/poky/contrib/git-hooks/sendemail-validate.sample b/poky/contrib/git-hooks/sendemail-validate.sample new file mode 100755 index 000000000..af5d55cb0 --- /dev/null +++ b/poky/contrib/git-hooks/sendemail-validate.sample @@ -0,0 +1,78 @@ +#!/usr/bin/env python3 + +# Copyright (C) 2020 Agilent Technologies, Inc. +# Author: Chris Laplante + +# This sendemail-validate hook injects 'From: ' header lines into outgoing +# emails sent via 'git send-email', to ensure that accurate commit authorship +# information is present. It was created because some email servers +# (notably Microsoft Exchange / Office 360) seem to butcher outgoing patches, +# resulting in incorrect authorship. + +# Current limitations: +# 1. Assumes one per patch per email +# 2. Minimal error checking +# +# Installation: +# 1. Copy to .git/hooks/sendemail-validate +# 2. chmod +x .git/hooks/sendemail-validate + + +import enum +import re +import subprocess +import sys + + +class Subject(enum.IntEnum): + NOT_SEEN = 0 + CONSUMING = 1 + SEEN = 2 + + +def make_from_line(): + cmd = ["git", "var", "GIT_COMMITTER_IDENT"] + proc = subprocess.run(cmd, check=True, stdout=subprocess.PIPE, universal_newlines=True) + regex = re.compile(r"^(.*>).*$") + match = regex.match(proc.stdout) + assert match is not None + return "From: {0}".format(match.group(1)) + + +def main(): + email = sys.argv[1] + + with open(email, "r") as f: + email_lines = f.read().split("\n") + + subject_seen = Subject.NOT_SEEN + first_body_line = None + for i, line in enumerate(email_lines): + if (subject_seen == Subject.NOT_SEEN) and line.startswith("Subject: "): + subject_seen = Subject.CONSUMING + continue + if subject_seen == Subject.CONSUMING: + if not line.strip(): + subject_seen = Subject.SEEN + continue + if subject_seen == Subject.SEEN: + first_body_line = i + break + + assert subject_seen == Subject.SEEN + assert first_body_line is not None + + from_line = make_from_line() + # Only add FROM line if it is not already there + if email_lines[first_body_line] != from_line: + email_lines.insert(first_body_line, from_line) + email_lines.insert(first_body_line + 1, "") + with open(email, "w") as f: + f.write("\n".join(email_lines)) + + return 0 + + +if __name__ == "__main__": + sys.exit(main()) + diff --git a/poky/documentation/README b/poky/documentation/README index b0a3cb1dc..be03bb119 100644 --- a/poky/documentation/README +++ b/poky/documentation/README @@ -2,7 +2,7 @@ documentation ============= This is the directory that contains the Yocto Project documentation. The Yocto -Project source repositories at http://git.yoctoproject.org/cgit.cgi have two +Project source repositories at https://git.yoctoproject.org/cgit.cgi have two instances of the "documentation" directory. You should understand each of these instances. @@ -47,12 +47,12 @@ Folders exist for individual manuals as follows: Each folder is self-contained regarding content and figures. If you want to find HTML versions of the Yocto Project manuals on the web, -go to http://www.yoctoproject.org and click on the "Documentation" tab. From +go to https://www.yoctoproject.org and click on the "Documentation" tab. From there you have access to archived documentation from previous releases, current documentation for the latest release, and "Docs in Progress" for the release currently being developed. -In general, the Yocto Project site (http://www.yoctoproject.org) is a great +In general, the Yocto Project site (https://www.yoctoproject.org) is a great reference for both information and downloads. poky.yaml @@ -228,7 +228,7 @@ content: Variables can be nested, like it was the case for DocBook: - YOCTO_HOME_URL : "http://www.yoctoproject.org" + YOCTO_HOME_URL : "https://www.yoctoproject.org" YOCTO_DOCS_URL : "&YOCTO_HOME_URL;/docs" Note directive diff --git a/poky/documentation/boilerplate.rst b/poky/documentation/boilerplate.rst index ddffdac24..2ad60eb8b 100644 --- a/poky/documentation/boilerplate.rst +++ b/poky/documentation/boilerplate.rst @@ -8,7 +8,7 @@ Permission is granted to copy, distribute and/or modify this document under the terms of the `Creative Commons Attribution-Share Alike 2.0 UK: England & Wales -`_ as published by Creative +`_ as published by Creative Commons. To report any inaccuracies or problems with this (or any other Yocto Project) diff --git a/poky/documentation/brief-yoctoprojectqs/index.rst b/poky/documentation/brief-yoctoprojectqs/index.rst index f077ee843..63083cb13 100644 --- a/poky/documentation/brief-yoctoprojectqs/index.rst +++ b/poky/documentation/brief-yoctoprojectqs/index.rst @@ -397,7 +397,7 @@ information including the website, wiki pages, and user manuals: Development Community into which you can tap. - **Developer Screencast:** The `Getting Started with the Yocto Project - - New Developer Screencast Tutorial `__ + New Developer Screencast Tutorial `__ provides a 30-minute video created for users unfamiliar with the Yocto Project but familiar with Linux build hosts. While this screencast is somewhat dated, the introductory and fundamental diff --git a/poky/documentation/bsp-guide/bsp.rst b/poky/documentation/bsp-guide/bsp.rst index 068ab6c80..93e918249 100644 --- a/poky/documentation/bsp-guide/bsp.rst +++ b/poky/documentation/bsp-guide/bsp.rst @@ -894,8 +894,8 @@ Yocto Project: ``recipes-*`` subdirectories specific to the recipe's function, or within a subdirectory containing a set of closely-related recipes. The recipes themselves should follow the general guidelines for - recipes used in the Yocto Project found in the "`OpenEmbedded Style - Guide `__". + recipes used in the Yocto Project found in the ":oe_wiki:`OpenEmbedded + Style Guide `". - *License File:* You must include a license file in the ``meta-bsp_root_name`` directory. This license covers the BSP diff --git a/poky/documentation/conf.py b/poky/documentation/conf.py index a626b1f14..407ea3292 100644 --- a/poky/documentation/conf.py +++ b/poky/documentation/conf.py @@ -68,7 +68,7 @@ rst_prolog = """ # external links and substitutions extlinks = { - 'yocto_home': ('https://yoctoproject.org%s', None), + 'yocto_home': ('https://www.yoctoproject.org%s', None), 'yocto_wiki': ('https://wiki.yoctoproject.org/wiki%s', None), 'yocto_dl': ('https://downloads.yoctoproject.org%s', None), 'yocto_lists': ('https://lists.yoctoproject.org%s', None), @@ -79,6 +79,9 @@ extlinks = { 'oe_home': ('https://www.openembedded.org%s', None), 'oe_lists': ('https://lists.openembedded.org%s', None), 'oe_git': ('https://git.openembedded.org%s', None), + 'oe_wiki': ('https://www.openembedded.org/wiki%s', None), + 'oe_layerindex': ('https://layers.openembedded.org%s', None), + 'oe_layer': ('https://layers.openembedded.org/layerindex/branch/master/layer%s', None), } # Intersphinx config to use cross reference with Bitbake user manual diff --git a/poky/documentation/dev-manual/common-tasks.rst b/poky/documentation/dev-manual/common-tasks.rst index ada3bac7e..e1dee8ecd 100644 --- a/poky/documentation/dev-manual/common-tasks.rst +++ b/poky/documentation/dev-manual/common-tasks.rst @@ -38,9 +38,8 @@ Follow these general steps to create your layer without using tools: 1. *Check Existing Layers:* Before creating a new layer, you should be sure someone has not already created a layer containing the Metadata - you need. You can see the `OpenEmbedded Metadata - Index `__ for a - list of layers from the OpenEmbedded community that can be used in + you need. You can see the :oe_layerindex:`OpenEmbedded Metadata Index <>` + for a list of layers from the OpenEmbedded community that can be used in the Yocto Project. You could find a layer that is identical or close to what you need. @@ -322,7 +321,7 @@ Logo for your layer and application. The process consists of two parts: successful compatibility registration. 2. Completion of an application acceptance form, which you can find at - https://www.yoctoproject.org/webform/yocto-project-compatible-registration. + :yocto_home:`/webform/yocto-project-compatible-registration`. To be granted permission to use the logo, you need to satisfy the following: @@ -346,7 +345,7 @@ application, you can use the Yocto Project Compatibility Logo with your layer and the application that uses your layer. To access the form, use this link: -https://www.yoctoproject.org/webform/yocto-project-compatible-registration. +:yocto_home:`/webform/yocto-project-compatible-registration`. Follow the instructions on the form to complete your application. The application consists of the following sections: @@ -1194,8 +1193,8 @@ Before writing a recipe from scratch, it is often useful to discover whether someone else has already written one that meets (or comes close to meeting) your needs. The Yocto Project and OpenEmbedded communities maintain many recipes that might be candidates for what you are doing. -You can find a good central index of these recipes in the `OpenEmbedded -Layer Index `__. +You can find a good central index of these recipes in the +:oe_layerindex:`OpenEmbedded Layer Index <>`. Working from an existing recipe or a skeleton recipe is the best way to get started. Here are some points on both methods: @@ -2540,7 +2539,7 @@ Following Recipe Style Guidelines --------------------------------- When writing recipes, it is good to conform to existing style -guidelines. The :oe_home:`OpenEmbedded Styleguide ` wiki page +guidelines. The :oe_wiki:`OpenEmbedded Styleguide ` wiki page provides rough guidelines for preferred recipe style. It is common for existing recipes to deviate a bit from this style. @@ -6044,7 +6043,7 @@ the Internet: Botnet - *"*\ `Security Issues for Embedded - Devices `__\ *"* + Devices `__\ *"* by Jake Edge When securing your image is of concern, there are steps, tools, and diff --git a/poky/documentation/kernel-dev/intro.rst b/poky/documentation/kernel-dev/intro.rst index c95d2f7cb..f6c9b9713 100644 --- a/poky/documentation/kernel-dev/intro.rst +++ b/poky/documentation/kernel-dev/intro.rst @@ -72,8 +72,7 @@ tools with your own kernel sources. The remainder of this manual provides instructions for completing specific Linux kernel development tasks. These instructions assume you -are comfortable working with -`BitBake `__ recipes and basic +are comfortable working with :oe_wiki:`BitBake ` recipes and basic open-source development tools. Understanding these concepts will facilitate the process of working with the kernel recipes. If you find you need some additional background, please be sure to review and diff --git a/poky/documentation/overview-manual/concepts.rst b/poky/documentation/overview-manual/concepts.rst index 8fbbabbac..257de44ec 100644 --- a/poky/documentation/overview-manual/concepts.rst +++ b/poky/documentation/overview-manual/concepts.rst @@ -141,12 +141,10 @@ hardware-specific configurations allows you to share other metadata by using a different layer where that metadata might be common across several pieces of hardware. -Many layers exist that work in the Yocto Project development -environment. The `Yocto Project Curated Layer -Index `__ -and `OpenEmbedded Layer -Index `__ -both contain layers from which you can use or leverage. +Many layers exist that work in the Yocto Project development environment. The +:yocto_home:`Yocto Project Curated Layer Index ` +and :oe_layerindex:`OpenEmbedded Layer Index <>` both contain layers from +which you can use or leverage. By convention, layers in the Yocto Project follow a specific form. Conforming to a known structure allows BitBake to make assumptions @@ -380,13 +378,11 @@ figure <#general-workflow-figure>`__: - *Metadata (.bb + Patches):* Software layers containing user-supplied recipe files, patches, and append files. A good example - of a software layer might be the - `meta-qt5 layer `__ from - the `OpenEmbedded Layer - Index `__. - This layer is for version 5.0 of the popular - `Qt `__ cross-platform application - development framework for desktop, embedded and mobile. + of a software layer might be the :oe_layer:`meta-qt5 layer ` + from the :oe_layerindex:`OpenEmbedded Layer Index <>`. This layer is for + version 5.0 of the popular `Qt `__ + cross-platform application development framework for desktop, embedded and + mobile. - *Machine BSP Configuration:* Board Support Package (BSP) layers (i.e. "BSP Layer" in the following figure) providing machine-specific @@ -2096,10 +2092,8 @@ The capability to run tasks in a fake root environment is known as the BitBake keyword/variable flag that requests a fake root environment for a task. -In the :term:`OpenEmbedded Build System`, -the program that -implements fakeroot is known as -`Pseudo `__. Pseudo +In the :term:`OpenEmbedded Build System`, the program that implements +fakeroot is known as :yocto_home:`Pseudo `. Pseudo overrides system calls by using the environment variable ``LD_PRELOAD``, which results in the illusion of running as root. To keep track of "fake" file ownership and permissions resulting from operations that diff --git a/poky/documentation/overview-manual/development-environment.rst b/poky/documentation/overview-manual/development-environment.rst index 9a2997d9f..011a47957 100644 --- a/poky/documentation/overview-manual/development-environment.rst +++ b/poky/documentation/overview-manual/development-environment.rst @@ -40,7 +40,7 @@ project is the Windows family of operating systems developed by Microsoft Corporation. Wikipedia has a good historical description of the Open Source -Philosophy `here `__. You can +Philosophy `here `__. You can also find helpful information on how to participate in the Linux Community `here `__. @@ -291,7 +291,7 @@ While each development environment is unique, there are some best practices or methods that help development run smoothly. The following list describes some of these practices. For more information about Git workflows, see the workflow topics in the `Git Community -Book `__. +Book `__. - *Make Small Changes:* It is best to keep the changes you commit small as compared to bundling many disparate changes into a single commit. @@ -368,12 +368,12 @@ commands. .. note:: - For more information on Git, see - http://git-scm.com/documentation. + https://git-scm.com/documentation. - If you need to download Git, it is recommended that you add Git to your system through your distribution's "software store" (e.g. for Ubuntu, use the Ubuntu Software feature). For the Git download - page, see http://git-scm.com/download. + page, see https://git-scm.com/download. - For information beyond the introductory nature in this section, see the ":ref:`dev-manual/start:locating yocto project source files`" @@ -507,7 +507,7 @@ you can manage with a small set of basic operations and workflows once you understand the basic philosophy behind Git. You do not have to be an expert in Git to be functional. A good place to look for instruction on a minimal set of Git commands is -`here `__. +`here `__. The following list of Git commands briefly describes some basic Git operations as a way to get started. As with any set of commands, this @@ -614,10 +614,10 @@ and Free Software has an interesting history. If you are interested in this history, you can find basic information here: - `Open source license - history `__ + history `__ - `Free software license - history `__ + history `__ In general, the Yocto Project is broadly licensed under the Massachusetts Institute of Technology (MIT) License. MIT licensing @@ -626,9 +626,9 @@ license is distributed with that software. MIT is also compatible with the GNU General Public License (GPL). Patches to the Yocto Project follow the upstream licensing scheme. You can find information on the MIT license -`here `__. You can +`here `__. You can find information on the GNU GPL -`here `__. +`here `__. When you build an image using the Yocto Project, the build process uses a known list of licenses to ensure compliance. You can find this list in @@ -646,11 +646,11 @@ the developer to resolve potential licensing issues. The base list of licenses used by the build process is a combination of the Software Package Data Exchange (SPDX) list and the Open Source -Initiative (OSI) projects. `SPDX Group `__ is a working +Initiative (OSI) projects. `SPDX Group `__ is a working group of the Linux Foundation that maintains a specification for a standard format for communicating the components, licenses, and copyrights associated with a software package. -`OSI `__ is a corporation dedicated to the Open +`OSI `__ is a corporation dedicated to the Open Source Definition and the effort for reviewing and approving licenses that conform to the Open Source Definition (OSD). diff --git a/poky/documentation/overview-manual/yp-intro.rst b/poky/documentation/overview-manual/yp-intro.rst index 66a88c952..0ec7e2b96 100644 --- a/poky/documentation/overview-manual/yp-intro.rst +++ b/poky/documentation/overview-manual/yp-intro.rst @@ -221,8 +221,7 @@ your Metadata, the easier it is to cope with future changes. - Familiarize yourself with the `Yocto Project curated layer index `__ - or the `OpenEmbedded layer - index `__. + or the :oe_layerindex:`OpenEmbedded layer index <>`. The latter contains more layers but they are less universally validated. @@ -364,13 +363,12 @@ activities using the Yocto Project: versions available for Yocto Project. The main purpose of the system is to help you manage the recipes you maintain and to offer a dynamic overview of the project. The Recipe Reporting System is built on top - of the `OpenEmbedded Layer - Index `__, which + of the :oe_layerindex:`OpenEmbedded Layer Index <>`, which is a website that indexes OpenEmbedded-Core layers. - *Patchwork:* `Patchwork `__ is a fork of a project originally started by - `OzLabs `__. The project is a web-based tracking + `OzLabs `__. The project is a web-based tracking system designed to streamline the process of bringing contributions into a project. The Yocto Project uses Patchwork as an organizational tool to handle patches, which number in the thousands for every @@ -402,7 +400,7 @@ activities using the Yocto Project: Historically, cross-prelink is a variant of prelink, which was conceived by `Jakub - Jelínek `__ a number of + Jelínek `__ a number of years ago. Both prelink and cross-prelink are maintained in the same repository albeit on separate branches. By providing an emulated runtime dynamic linker (i.e. ``glibc``-derived ``ld.so`` emulation), @@ -531,8 +529,7 @@ targets: Debian Package (dpkg) in operation. Opkg is intended for use on embedded Linux devices and is used in - this capacity in the - `OpenEmbedded `__ and + this capacity in the :oe_home:`OpenEmbedded <>` and `OpenWrt `__ projects, as well as the Yocto Project. diff --git a/poky/documentation/profile-manual/usage.rst b/poky/documentation/profile-manual/usage.rst index 418f4e993..b401cf904 100644 --- a/poky/documentation/profile-manual/usage.rst +++ b/poky/documentation/profile-manual/usage.rst @@ -39,7 +39,7 @@ other tools when it seems useful to do so. The coverage below details some of the most common ways you'll likely want to apply the tool; full documentation can be found either within the tool itself or in the man pages at -`perf(1) `__. +`perf(1) `__. Perf Setup ---------- @@ -860,7 +860,7 @@ the right kind of trace data, higher-level profiling-type summaries can be derived from it. Documentation on using the `'perf script' python -binding `__. +binding `__. System-Wide Tracing and Profiling ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1136,32 +1136,31 @@ Perf Documentation Online versions of the man pages for the commands discussed in this section can be found here: -- The `'perf stat' manpage `__. +- The `'perf stat' manpage `__. - The `'perf record' - manpage `__. + manpage `__. - The `'perf report' - manpage `__. + manpage `__. -- The `'perf probe' manpage `__. +- The `'perf probe' manpage `__. - The `'perf script' - manpage `__. + manpage `__. - Documentation on using the `'perf script' python - binding `__. + binding `__. -- The top-level `perf(1) manpage `__. +- The top-level `perf(1) manpage `__. Normally, you should be able to invoke the man pages via perf itself e.g. 'perf help' or 'perf help record'. However, by default Yocto doesn't install man pages, but perf invokes the man pages for most help functionality. This is a bug and is being -addressed by a Yocto bug: `Bug 3388 - perf: enable man pages for basic -'help' -functionality `__. +addressed by a Yocto bug: :yocto_bugs:`Bug 3388 - perf: enable man pages for +basic 'help' functionality `. The man pages in text form, along with some other files, such as a set of examples, can be found in the 'perf' directory of the kernel tree: :: @@ -1719,7 +1718,7 @@ events': The tool is pretty self-explanatory, but for more detailed information on navigating through the data, see the `kernelshark -website `__. +website `__. ftrace Documentation -------------------- @@ -1737,19 +1736,19 @@ Documentation directory: :: There is a nice series of articles on using ftrace and trace-cmd at LWN: - `Debugging the kernel using Ftrace - part - 1 `__ + 1 `__ - `Debugging the kernel using Ftrace - part - 2 `__ + 2 `__ - `Secrets of the Ftrace function - tracer `__ + tracer `__ - `trace-cmd: A front-end for Ftrace `__ There's more detailed documentation kernelshark usage here: -`KernelShark `__ +`KernelShark `__ An amusing yet useful README (a tracing mini-HOWTO) can be found in ``/sys/kernel/debug/tracing/README``. @@ -1764,7 +1763,7 @@ gather/print/aggregate data extracted from the context they end up being invoked under. For example, this probe from the `SystemTap -tutorial `__ simply prints a +tutorial `__ simply prints a line every time any process on the system open()s a file. For each line, it prints the executable name of the program that opened the file, along with its PID, and the name of the file it opened (or tried to open), @@ -1937,11 +1936,11 @@ systemtap Documentation ----------------------- The SystemTap language reference can be found here: `SystemTap Language -Reference `__ +Reference `__ Links to other SystemTap documents, tutorials, and examples can be found here: `SystemTap documentation -page `__ +page `__ Sysprof ======= @@ -2215,7 +2214,7 @@ developers who are working in a Linux environment and are interested in efficient software tracing. For information on LTTng in general, visit the `LTTng -Project `__ site. You can find a "Getting +Project `__ site. You can find a "Getting Started" link on this site that takes you to an LTTng Quick Start. blktrace @@ -2366,7 +2365,7 @@ first part of the filenames: :: The report shows each event that was found in the blktrace data, along with a summary of the overall block I/O traffic during the run. You can look at the -`blkparse `__ manpage to learn the +`blkparse `__ manpage to learn the meaning of each field displayed in the trace listing. Live Mode @@ -2565,11 +2564,11 @@ blktrace Documentation Online versions of the man pages for the commands discussed in this section can be found here: -- http://linux.die.net/man/8/blktrace +- https://linux.die.net/man/8/blktrace -- http://linux.die.net/man/1/blkparse +- https://linux.die.net/man/1/blkparse -- http://linux.die.net/man/8/btrace +- https://linux.die.net/man/8/btrace The above manpages, along with manpages for the other blktrace utilities (btt, blkiomon, etc) can be found in the /doc directory of the blktrace diff --git a/poky/documentation/ref-manual/classes.rst b/poky/documentation/ref-manual/classes.rst index 5a30ce379..a152dcac7 100644 --- a/poky/documentation/ref-manual/classes.rst +++ b/poky/documentation/ref-manual/classes.rst @@ -278,7 +278,7 @@ The ``ccache`` class enables the C/C++ Compiler Cache for the build. This class is used to give a minor performance boost during the build. However, using the class can lead to unexpected side-effects. Thus, it is recommended that you do not use this class. See -http://ccache.samba.org/ for information on the C/C++ Compiler +https://ccache.samba.org/ for information on the C/C++ Compiler Cache. .. _ref-classes-chrpath: @@ -1374,36 +1374,36 @@ generation. ``kernel-fitimage.bbclass`` =========================== -The ``kernel-fitimage`` class provides support to pack a kernel Image, +The ``kernel-fitimage`` class provides support to pack a kernel image, device trees and a RAM disk into a single FIT image. In theory, a FIT -image can support any number of kernels, RAM disks and device-trees. +image can support any number of kernels, RAM disks and device trees. However, ``kernel-fitimage`` currently only supports limited usescases: just one kernel image, an optional RAM disk, and -any number of device tree. +any number of device trees. To create a FIT image, it is required that :term:`KERNEL_CLASSES` -is set to "kernel-fitimage" and :term:`KERNEL_IMAGETYPE` +is set to include "kernel-fitimage" and :term:`KERNEL_IMAGETYPE` is set to "fitImage". -The options for the device tree compiler passed to mkimage -D feature +The options for the device tree compiler passed to ``mkimage -D`` when creating the FIT image are specified using the :term:`UBOOT_MKIMAGE_DTCOPTS` variable. Only a single kernel can be added to the FIT image created by ``kernel-fitimage`` and the kernel image in FIT is mandatory. The -address where the kernel image is to be loaded by U-boot is +address where the kernel image is to be loaded by U-Boot is specified by :term:`UBOOT_LOADADDRESS` and the entrypoint by :term:`UBOOT_ENTRYPOINT`. Multiple device trees can be added to the FIT image created by ``kernel-fitimage`` and the device tree is optional. -The address where the device tree is to be loaded by U-boot is +The address where the device tree is to be loaded by U-Boot is specified by :term:`UBOOT_DTBO_LOADADDRESS` for device tree overlays and by :term:`UBOOT_DTB_LOADADDRESS` for device tree binaries. Only a single RAM disk can be added to the FIT image created by ``kernel-fitimage`` and the RAM disk in FIT is optional. -The address where the RAM disk image is to be loaded by U-boot +The address where the RAM disk image is to be loaded by U-Boot is specified by :term:`UBOOT_RD_LOADADDRESS` and the entrypoint by :term:`UBOOT_RD_ENTRYPOINT`. The ramdisk is added to FIT image when :term:`INITRAMFS_IMAGE` is specified. @@ -2581,7 +2581,7 @@ the :term:`SYSTEMD_BOOT_CFG`, :term:`SYSTEMD_BOOT_TIMEOUT` variables. You can also see the `Systemd-boot -documentation `__ +documentation `__ for more information. .. _ref-classes-terminal: diff --git a/poky/documentation/ref-manual/faq.rst b/poky/documentation/ref-manual/faq.rst index f67c53824..34b26ee3e 100644 --- a/poky/documentation/ref-manual/faq.rst +++ b/poky/documentation/ref-manual/faq.rst @@ -55,9 +55,9 @@ Yocto Project is fairly straightforward. **Q:** Are there any products built using the OpenEmbedded build system? **A:** The software running on the `Vernier -LabQuest `__ is built using the +LabQuest `__ is built using the OpenEmbedded build system. See the `Vernier -LabQuest `__ website +LabQuest `__ website for more information. There are a number of pre-production devices using the OpenEmbedded build system and the Yocto Project team announces them as soon as they are released. @@ -273,7 +273,7 @@ OpenEmbedded build system to use its internally built toolchain (i.e. particular, "external-\*" refers to external toolchains. One example is the Sourcery G++ Toolchain. The support for this toolchain resides in the separate ``meta-sourcery`` layer at -http://github.com/MentorEmbedded/meta-sourcery/. +https://github.com/MentorEmbedded/meta-sourcery/. In addition to the toolchain configuration, you also need a corresponding toolchain recipe file. This recipe file needs to package diff --git a/poky/documentation/ref-manual/images.rst b/poky/documentation/ref-manual/images.rst index 5e9374eae..cf5cc1109 100644 --- a/poky/documentation/ref-manual/images.rst +++ b/poky/documentation/ref-manual/images.rst @@ -37,9 +37,9 @@ Following is a list of supported recipes: all the pieces required to run builds using the build system as well as the build system itself. You can boot and run the image using either the `VMware - Player `__ or + Player `__ or `VMware - Workstation `__. + Workstation `__. For more information on this image, see the :yocto_home:`Build Appliance ` page on the Yocto Project website. diff --git a/poky/documentation/ref-manual/kickstart.rst b/poky/documentation/ref-manual/kickstart.rst index bb9c0460f..472820f16 100644 --- a/poky/documentation/ref-manual/kickstart.rst +++ b/poky/documentation/ref-manual/kickstart.rst @@ -24,7 +24,7 @@ The information lists the commands, their syntax, and meanings. Kickstart commands are based on the Fedora kickstart versions but with modifications to reflect Wic capabilities. You can see the original documentation for those commands at the following link: -http://pykickstart.readthedocs.io/en/latest/kickstart-docs.html +https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html Command: part or partition ========================== @@ -164,7 +164,7 @@ the ``part`` and ``partition`` commands: - ``--part-type``: This option is a Wic-specific option that specifies the partition type globally unique identifier (GUID) for GPT partitions. You can find the list of partition type GUIDs at - http://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs. + https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs. - ``--use-uuid``: This option is a Wic-specific option that causes Wic to generate a random GUID for the partition. The generated diff --git a/poky/documentation/ref-manual/migration-1.7.rst b/poky/documentation/ref-manual/migration-1.7.rst index 19275b3cd..54544e479 100644 --- a/poky/documentation/ref-manual/migration-1.7.rst +++ b/poky/documentation/ref-manual/migration-1.7.rst @@ -190,7 +190,7 @@ Removed Recipes The following recipes have been removed: -- ``x-load``: This recipe has been superseded by U-boot SPL for all +- ``x-load``: This recipe has been superseded by U-Boot SPL for all Cortex-based TI SoCs. For legacy boards, the ``meta-ti`` layer, which contains a maintained recipe, should be used instead. diff --git a/poky/documentation/ref-manual/migration-2.1.rst b/poky/documentation/ref-manual/migration-2.1.rst index e8b3ada26..861d04861 100644 --- a/poky/documentation/ref-manual/migration-2.1.rst +++ b/poky/documentation/ref-manual/migration-2.1.rst @@ -89,7 +89,7 @@ package-specific nesting should be done by the package itself. Finally, having ``libexecdir`` change between recipes makes it very difficult for different recipes to invoke binaries that have been installed into ``libexecdir``. The Filesystem Hierarchy Standard (i.e. -http://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html) now +https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html) now recognizes the use of ``${prefix}/libexec/``, giving distributions the choice between ``${prefix}/lib`` or ``${prefix}/libexec`` without breaking FHS. diff --git a/poky/documentation/ref-manual/migration-2.2.rst b/poky/documentation/ref-manual/migration-2.2.rst index ac247dce4..5c6fecf32 100644 --- a/poky/documentation/ref-manual/migration-2.2.rst +++ b/poky/documentation/ref-manual/migration-2.2.rst @@ -28,8 +28,8 @@ The way directories are staged in sysroot has been simplified and introduces the new :term:`SYSROOT_DIRS`, :term:`SYSROOT_DIRS_NATIVE`, and :term:`SYSROOT_DIRS_BLACKLIST`. See the -`v2 patch series on the OE-Core Mailing -List `__ +:oe_lists:`v2 patch series on the OE-Core Mailing List +` for additional information. .. _migration-2.2-removal-of-old-images-from-tmp-deploy-now-enabled: diff --git a/poky/documentation/ref-manual/migration-2.3.rst b/poky/documentation/ref-manual/migration-2.3.rst index 3e9758119..04b11daa7 100644 --- a/poky/documentation/ref-manual/migration-2.3.rst +++ b/poky/documentation/ref-manual/migration-2.3.rst @@ -238,7 +238,7 @@ to substitute a GPLv2 version of a GPLv3 recipe, then you must add the .. note:: You can ``find meta-gplv2`` layer in the OpenEmbedded layer index at - https://layers.openembedded.org/layerindex/branch/master/layer/meta-gplv2/. + :oe_layer:`/meta-gplv2`. These relocated GPLv2 recipes do not receive the same level of maintenance as other core recipes. The recipes do not get security fixes @@ -274,7 +274,7 @@ The following package management changes took place: fixed. For more information, see the `DNF - Documentation `__. + Documentation `__. - Rpm 5.x is replaced with Rpm 4.x. This is done for two major reasons: diff --git a/poky/documentation/ref-manual/migration-2.7.rst b/poky/documentation/ref-manual/migration-2.7.rst index 7e628fc3e..5af5947ff 100644 --- a/poky/documentation/ref-manual/migration-2.7.rst +++ b/poky/documentation/ref-manual/migration-2.7.rst @@ -159,7 +159,7 @@ The following miscellaneous changes occurred: from the top-level ``scripts`` directory. - Perl now builds for the target using - `perl-cross `_ for better + `perl-cross `_ for better maintainability and improved build performance. This change should not present any problems unless you have heavily customized your Perl recipe. diff --git a/poky/documentation/ref-manual/qa-checks.rst b/poky/documentation/ref-manual/qa-checks.rst index 54977dcb2..6cb767d93 100644 --- a/poky/documentation/ref-manual/qa-checks.rst +++ b/poky/documentation/ref-manual/qa-checks.rst @@ -227,7 +227,7 @@ Errors and Warnings CFLAGS_append = " -fPIC " For more information on text relocations at runtime, see - http://www.akkadia.org/drepper/textrelocs.html. + https://www.akkadia.org/drepper/textrelocs.html.   .. _qa-check-ldflags: diff --git a/poky/documentation/ref-manual/resources.rst b/poky/documentation/ref-manual/resources.rst index 77c367809..7554164d1 100644 --- a/poky/documentation/ref-manual/resources.rst +++ b/poky/documentation/ref-manual/resources.rst @@ -52,7 +52,7 @@ against the Yocto Project, see the following: - The Yocto Project :yocto_wiki:`Bugzilla wiki page ` -For information on Bugzilla in general, see http://www.bugzilla.org/about/. +For information on Bugzilla in general, see https://www.bugzilla.org/about/. .. _resources-mailinglist: @@ -118,8 +118,7 @@ Here is a list of resources you might find helpful: distribution from which the Yocto Project derives its build system (Poky) and to which it contributes. -- :oe_home:`BitBake `\ *:* The tool - used to process metadata. +- :oe_wiki:`BitBake `\ *:* The tool used to process metadata. - :doc:`BitBake User Manual `\ *:* A comprehensive guide to the BitBake tool. If you want information on BitBake, see @@ -194,5 +193,5 @@ Here is a list of resources you might find helpful: available for Yocto Project and Poky discussions: ``#yocto`` and ``#poky``, respectively. -- `Quick EMUlator (QEMU) `__\ *:* An +- `Quick EMUlator (QEMU) `__\ *:* An open-source machine emulator and virtualizer. diff --git a/poky/documentation/ref-manual/terms.rst b/poky/documentation/ref-manual/terms.rst index c07dd4b12..966962005 100644 --- a/poky/documentation/ref-manual/terms.rst +++ b/poky/documentation/ref-manual/terms.rst @@ -349,7 +349,8 @@ universal, the list includes them just in case: Source Directory is derived from the Yocto Project release tarball. For example, downloading and unpacking :yocto_dl:`/releases/yocto/&DISTRO_REL_TAG;/&YOCTO_POKY;.tar.bz2` - results in a Source Directory whose root folder is named ``poky``. + results in a Source Directory whose root folder is named + ``&YOCTO_POKY;``. It is important to understand the differences between the Source Directory created by unpacking a released tarball as compared to diff --git a/poky/documentation/ref-manual/variables.rst b/poky/documentation/ref-manual/variables.rst index 8c6cc46b6..4ce264813 100644 --- a/poky/documentation/ref-manual/variables.rst +++ b/poky/documentation/ref-manual/variables.rst @@ -2538,6 +2538,13 @@ system and gives an overview of their function and contents. For guidance on how to create your own file permissions settings table file, examine the existing ``fs-perms.txt``. + :term:`FIT_DESC` + Specifies the description string encoded into a fitImage. The default + value is set by the :ref:`kernel-fitimage ` + class as follows:: + + FIT_DESC ?= "U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}" + :term:`FIT_GENERATE_KEYS` Decides whether to generate the keys for signing fitImage if they don't already exist. The keys are created in ``UBOOT_SIGN_KEYDIR``. @@ -2568,6 +2575,13 @@ system and gives an overview of their function and contents. Size of private key in number of bits used in fitImage. The default value is "2048". + :term:`FIT_SIGN_INDIVIDUAL` + If set to "1", then the :ref:`kernel-fitimage ` + class will sign the kernel, dtb and ramdisk images individually in addition + to signing the fitImage itself. This could be useful if you are + intending to verify signatures in another context than booting via + U-Boot. + :term:`FONT_EXTRA_RDEPENDS` When inheriting the :ref:`fontcache ` class, this variable specifies the runtime dependencies for font packages. @@ -2648,7 +2662,7 @@ system and gives an overview of their function and contents. GROUPADD_PARAM_${PN} = "-r netdev" For information on the standard Linux shell command - ``groupadd``, see http://linux.die.net/man/8/groupadd. + ``groupadd``, see https://linux.die.net/man/8/groupadd. :term:`GROUPMEMS_PARAM` When inheriting the :ref:`useradd ` class, @@ -2657,7 +2671,7 @@ system and gives an overview of their function and contents. of a group when the package is installed. For information on the standard Linux shell command ``groupmems``, - see http://linux.die.net/man/8/groupmems. + see https://linux.die.net/man/8/groupmems. :term:`GRUB_GFXSERIAL` Configures the GNU GRand Unified Bootloader (GRUB) to have graphics @@ -3870,6 +3884,15 @@ system and gives an overview of their function and contents. KERNEL_ARTIFACT_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" + :term:`KERNEL_DTC_FLAGS` + Specifies the ``dtc`` flags that are passed to the Linux kernel build + system when generating the device trees (via ``DTC_FLAGS`` environment + variable). + + In order to use this variable, the + :ref:`kernel-devicetree ` class must + be inherited. + :term:`KERNEL_EXTRA_ARGS` Specifies additional ``make`` command-line arguments the OpenEmbedded build system passes on when compiling the kernel. @@ -3983,8 +4006,9 @@ system and gives an overview of their function and contents. when building the kernel and is passed to ``make`` as the target to build. - If you want to build an alternate kernel image type, use the - :term:`KERNEL_ALT_IMAGETYPE` variable. + If you want to build an alternate kernel image type in addition to that + specified by ``KERNEL_IMAGETYPE``, use the :term:`KERNEL_ALT_IMAGETYPE` + variable. :term:`KERNEL_MODULE_AUTOLOAD` Lists kernel modules that need to be auto-loaded during boot. @@ -4679,7 +4703,7 @@ system and gives an overview of their function and contents. See the :term:`KERNEL_MODULE_AUTOLOAD` variable for more information. module_conf - Specifies `modprobe.d `_ + Specifies `modprobe.d `_ syntax lines for inclusion in the ``/etc/modprobe.d/modname.conf`` file. @@ -7604,7 +7628,7 @@ system and gives an overview of their function and contents. SYSTEMD_BOOT_CFG ?= "${:term:`S`}/loader.conf" For information on Systemd-boot, see the `Systemd-boot - documentation `__. + documentation `__. :term:`SYSTEMD_BOOT_ENTRIES` When :term:`EFI_PROVIDER` is set to @@ -7618,7 +7642,7 @@ system and gives an overview of their function and contents. SYSTEMD_BOOT_ENTRIES ?= "" For information on Systemd-boot, see the `Systemd-boot - documentation `__. + documentation `__. :term:`SYSTEMD_BOOT_TIMEOUT` When :term:`EFI_PROVIDER` is set to @@ -7631,7 +7655,7 @@ system and gives an overview of their function and contents. SYSTEMD_BOOT_TIMEOUT ?= "10" For information on Systemd-boot, see the `Systemd-boot - documentation `__. + documentation `__. :term:`SYSTEMD_PACKAGES` When inheriting the :ref:`systemd ` class, @@ -7662,7 +7686,7 @@ system and gives an overview of their function and contents. When using :ref:`SysVinit `, specifies a space-separated list of the virtual terminals that should - run a `getty `__ + run a `getty `__ (allowing login), assuming :term:`USE_VT` is not set to "0". @@ -7886,7 +7910,7 @@ system and gives an overview of their function and contents. toolchain. One example is the Sourcery G++ Toolchain. The support for this toolchain resides in the separate Mentor Graphics ``meta-sourcery`` layer at - http://github.com/MentorEmbedded/meta-sourcery/. + https://github.com/MentorEmbedded/meta-sourcery/. The layer's ``README`` file contains information on how to use the Sourcery G++ Toolchain as an external toolchain. In summary, you must @@ -8389,21 +8413,21 @@ system and gives an overview of their function and contents. In this example, "sd" is selected as the configuration of the possible four for the ``UBOOT_MACHINE``. The "sd" configuration defines "mx6qsabreauto_config" as the value for ``UBOOT_MACHINE``, while the - "sdcard" specifies the ``IMAGE_FSTYPES`` to use for the U-boot image. + "sdcard" specifies the ``IMAGE_FSTYPES`` to use for the U-Boot image. For more information on how the ``UBOOT_CONFIG`` is handled, see the :ref:`uboot-config ` class. :term:`UBOOT_DTB_LOADADDRESS` - Specifies the load address for the dtb image used by U-boot. During FIT + Specifies the load address for the dtb image used by U-Boot. During FIT image creation, the ``UBOOT_DTB_LOADADDRESS`` variable is used in :ref:`kernel-fitimage ` class to specify the load address to be used in creating the dtb sections of Image Tree Source for the FIT image. :term:`UBOOT_DTBO_LOADADDRESS` - Specifies the load address for the dtbo image used by U-boot. During FIT + Specifies the load address for the dtbo image used by U-Boot. During FIT image creation, the ``UBOOT_DTBO_LOADADDRESS`` variable is used in :ref:`kernel-fitimage ` class to specify the load address to be used in creating the dtbo sections of Image Tree Source for the FIT image. @@ -8440,9 +8464,29 @@ system and gives an overview of their function and contents. Specifies the target called in the ``Makefile``. The default target is "all". + :term:`UBOOT_MKIMAGE` + Specifies the name of the mkimage command as used by the + :ref:`kernel-fitimage ` class to assemble + the FIT image. This can be used to substitute an alternative command, wrapper + script or function if desired. The default is "uboot-mkimage". + :term:`UBOOT_MKIMAGE_DTCOPTS` Options for the device tree compiler passed to mkimage '-D' feature while creating FIT image in :ref:`kernel-fitimage ` class. + If ``UBOOT_MKIMAGE_DTCOPTS`` is not set then kernel-fitimage will not + pass the ``-D`` option to mkimage. + + :term:`UBOOT_MKIMAGE_SIGN` + Specifies the name of the mkimage command as used by the + :ref:`kernel-fitimage ` class to sign + the FIT image after it has been assembled (if enabled). This can be used + to substitute an alternative command, wrapper script or function if + desired. The default is "${:term:`UBOOT_MKIMAGE`}". + + :term:`UBOOT_MKIMAGE_SIGN_ARGS` + Optionally specifies additional arguments for the + :ref:`kernel-fitimage ` class to pass to the + mkimage command when signing the FIT image. :term:`UBOOT_RD_ENTRYPOINT` Specifies the entrypoint for the RAM disk image. @@ -8468,7 +8512,7 @@ system and gives an overview of their function and contents. certificate used for signing FIT image. :term:`UBOOT_SIGN_KEYNAME` - The name of keys used for signing U-boot FIT image stored in + The name of keys used for signing U-Boot FIT image stored in :term:`UBOOT_SIGN_KEYDIR` directory. For e.g. dev.key key and dev.crt certificate stored in :term:`UBOOT_SIGN_KEYDIR` directory will have :term:`UBOOT_SIGN_KEYNAME` set to "dev". @@ -8562,7 +8606,7 @@ system and gives an overview of their function and contents. When using :ref:`SysVinit `, determines whether or not to run a - `getty `__ on any + `getty `__ on any virtual terminals in order to enable logging in through those terminals. @@ -8673,7 +8717,7 @@ system and gives an overview of their function and contents. For information on the standard Linux shell command ``useradd``, see - http://linux.die.net/man/8/useradd. + https://linux.die.net/man/8/useradd. :term:`USERADD_UID_TABLES` Specifies a password file to use for obtaining static user diff --git a/poky/documentation/releases.rst b/poky/documentation/releases.rst index 254630055..b40907202 100644 --- a/poky/documentation/releases.rst +++ b/poky/documentation/releases.rst @@ -9,6 +9,7 @@ ******************************* - :yocto_docs:`3.2 Documentation ` +- :yocto_docs:`3.2.1 Documentation ` **************************** 3.1 'dunfell' Release Series diff --git a/poky/documentation/sdk-manual/intro.rst b/poky/documentation/sdk-manual/intro.rst index 66b12cdff..e4b9b05ba 100644 --- a/poky/documentation/sdk-manual/intro.rst +++ b/poky/documentation/sdk-manual/intro.rst @@ -210,7 +210,7 @@ You just need to follow these general steps: 3. *Develop and Test your Application:* At this point, you have the tools to develop your application. If you need to separately install and use the QEMU emulator, you can go to `QEMU Home - Page `__ to download and learn about + Page `__ to download and learn about the emulator. See the ":doc:`/dev-manual/qemu`" chapter in the Yocto Project Development Tasks Manual for information on using QEMU within the Yocto Project. diff --git a/poky/documentation/sphinx-static/switchers.js b/poky/documentation/sphinx-static/switchers.js index fc901d329..754de2e6a 100644 --- a/poky/documentation/sphinx-static/switchers.js +++ b/poky/documentation/sphinx-static/switchers.js @@ -3,7 +3,7 @@ var all_versions = { 'dev': 'dev (3.3)', - '3.2': '3.2', + '3.2.1': '3.2.1', '3.1.4': '3.1.4', '3.0.4': '3.0.4', '2.7.4': '2.7.4', diff --git a/poky/documentation/toaster-manual/intro.rst b/poky/documentation/toaster-manual/intro.rst index c78b3f53d..57e5b2bb7 100644 --- a/poky/documentation/toaster-manual/intro.rst +++ b/poky/documentation/toaster-manual/intro.rst @@ -27,7 +27,7 @@ extensive information about the build process. - Browse layers listed in the various :ref:`layer sources ` that are available in your project (e.g. the OpenEmbedded Layer Index at - http://layers.openembedded.org/layerindex/). + :oe_layerindex:`/`). - Browse images, recipes, and machines provided by those layers. diff --git a/poky/documentation/toaster-manual/reference.rst b/poky/documentation/toaster-manual/reference.rst index dfe51889e..d2ab14c8e 100644 --- a/poky/documentation/toaster-manual/reference.rst +++ b/poky/documentation/toaster-manual/reference.rst @@ -24,12 +24,12 @@ type of layer source called a "layer index." A layer index is a web application that contains information about a set of custom layers. A good example of an existing layer index is the OpenEmbedded Layer Index. A public instance of this layer index exists -at http://layers.openembedded.org. You can find the code for this +at :oe_layerindex:`/`. You can find the code for this layer index's web application at :yocto_git:`/layerindex-web/`. When you tie a layer source into Toaster, it can query the layer source through a -`REST `__ +`REST `__ API, store the information about the layers in the Toaster database, and then show the information to users. Users are then able to view that information and build layers from Toaster itself without worrying about @@ -81,7 +81,7 @@ describes two methods by which you can configure and use your layer index. In the previous section, the code for the OpenEmbedded Metadata Index -(i.e. http://layers.openembedded.org) was referenced. You can use +(i.e. :oe_layerindex:`/`) was referenced. You can use this code, which is at :yocto_git:`/layerindex-web/`, as a base to create your own layer index. @@ -370,7 +370,7 @@ Remote Toaster Monitoring Toaster has an API that allows remote management applications to directly query the state of the Toaster server and its builds in a machine-to-machine manner. This API uses the -`REST `__ +`REST `__ interface and the transfer of JSON files. For example, you might monitor a build inside a container through well supported known HTTP ports in order to easily access a Toaster server inside the container. In this diff --git a/poky/documentation/toaster-manual/setup-and-use.rst b/poky/documentation/toaster-manual/setup-and-use.rst index 2cb7884eb..ded771e79 100644 --- a/poky/documentation/toaster-manual/setup-and-use.rst +++ b/poky/documentation/toaster-manual/setup-and-use.rst @@ -462,9 +462,8 @@ Using the Toaster Web Interface The Toaster web interface allows you to do the following: -- Browse published layers in the `OpenEmbedded Layer - Index `__ that are available for your - selected version of the build system. +- Browse published layers in the :oe_layerindex:`OpenEmbedded Layer Index <>` + that are available for your selected version of the build system. - Import your own layers for building. @@ -573,11 +572,11 @@ However, the "Local Yocto Project" release will not provide you with any compatible layers, other than the three core layers that come with the Yocto Project: -- `openembedded-core `__ +- :oe_layer:`openembedded-core ` -- `meta-poky `__ +- :oe_layer:`meta-poky ` -- `meta-yocto-bsp `__ +- :oe_layer:`meta-yocto-bsp ` .. image:: figures/compatible-layers.png :align: center diff --git a/poky/documentation/transitioning-to-a-custom-environment.rst b/poky/documentation/transitioning-to-a-custom-environment.rst index 415f295b3..abbd74ca1 100644 --- a/poky/documentation/transitioning-to-a-custom-environment.rst +++ b/poky/documentation/transitioning-to-a-custom-environment.rst @@ -29,8 +29,8 @@ Transitioning to a custom environment for systems development #. **Find and acquire the best BSP for your target**. Use the :yocto_home:`Yocto Project curated layer index - ` or even the `OpenEmbedded layer index - `_ to find and acquire the best BSP for your + ` or even the :oe_layerindex:`OpenEmbedded + layer index <>` to find and acquire the best BSP for your target board. The Yocto Project layer index BSPs are regularly validated. The best place to get your first BSP is from your silicon manufacturer or board vendor – they can point you to their most qualified efforts. In general, for diff --git a/poky/documentation/what-i-wish-id-known.rst b/poky/documentation/what-i-wish-id-known.rst index a051036bb..143f9fbfe 100644 --- a/poky/documentation/what-i-wish-id-known.rst +++ b/poky/documentation/what-i-wish-id-known.rst @@ -27,11 +27,10 @@ contact us with other suggestions. to be responsible for your own updates. #. **Get to know the layer index:** - All layers can be found in the `layer index - `_. Layers which have applied for Yocto - Project Compatible status (structure continuity assurance and testing) can be - found in the :yocto_home:`Yocto Project Compatible index - `. Generally check the Compatible layer index first, + All layers can be found in the :oe_layerindex:`layer index <>`. Layers which + have applied for Yocto Project Compatible status (structure continuity + assurance and testing) can be found in the :yocto_home:`Yocto Project Compatible index + `. Generally check the Compatible layer index first, and if you don't find the necessary layer check the general layer index. The layer index is an original artifact from the Open Embedded Project. As such, that index doesn't have the curating and testing that the Yocto Project @@ -172,7 +171,7 @@ contact us with other suggestions. * add an ssh server to an image (enable transferring of files to target) * know the anatomy of a recipe * know how to create and use layers - * find recipes (with the `OpenEmbedded Layer index `_) + * find recipes (with the :oe_layerindex:`OpenEmbedded Layer index <>`) * understand difference between machine and distro settings * find and use the right BSP (machine) for your hardware * find examples of distro features and know where to set them diff --git a/poky/meta-poky/conf/distro/include/gcsections.inc b/poky/meta-poky/conf/distro/include/gcsections.inc index dd98943ac..7157373aa 100644 --- a/poky/meta-poky/conf/distro/include/gcsections.inc +++ b/poky/meta-poky/conf/distro/include/gcsections.inc @@ -13,6 +13,16 @@ LDFLAGS_SECTION_REMOVAL_pn-grub-efi = "" CFLAGS_SECTION_REMOVAL_pn-grub = "" LDFLAGS_SECTION_REMOVAL_pn-grub = "" +# SDK packages with build problems using sections +CFLAGS_SECTION_REMOVAL_pn-nativesdk-glibc = "" +LDFLAGS_SECTION_REMOVAL_pn-nativesdk-glibc = "" +CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" +LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" +CFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" +LDFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" +CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" +LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" + # set default for target CFLAGS_append_class-target = " ${CFLAGS_SECTION_REMOVAL}" LDFLAGS_append_class-target = " ${LDFLAGS_SECTION_REMOVAL}" diff --git a/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc index 0b0412e60..273ebfdfe 100644 --- a/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc +++ b/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc @@ -2,7 +2,7 @@ DISTRO_FEATURES_append = " pam" # Use the LTSI Kernel -PREFERRED_VERSION_linux-yocto ?= "5.4%" +PREFERRED_VERSION_linux-yocto = "5.4%" # Ensure the kernel nfs server is enabled KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index e125b23d4..5a867b1de 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -43,7 +43,7 @@ FULL_OPTIMIZATION="-Os -pipe ${DEBUG_FLAGS}" # Distro config is evaluated after the machine config, so we have to explicitly # set the kernel provider to override a machine config. PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" -PREFERRED_VERSION_linux-yocto-tiny ?= "5.8%" +PREFERRED_VERSION_linux-yocto-tiny ?= "5.10%" # We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny #POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot" diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index b33df3c17..623f39da6 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -19,8 +19,8 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" -PREFERRED_VERSION_linux-yocto ?= "5.8%" -PREFERRED_VERSION_linux-yocto-rt ?= "5.4%" +PREFERRED_VERSION_linux-yocto ?= "5.10%" +PREFERRED_VERSION_linux-yocto-rt ?= "5.10%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample index 68e71b930..096359ee8 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -112,7 +112,7 @@ PACKAGE_CLASSES ?= "package_rpm" # This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 +# Supported values are i686, x86_64, aarch64 #SDKMACHINE ?= "i686" # diff --git a/poky/meta-selftest/classes/test-mkimage-wrapper.bbclass b/poky/meta-selftest/classes/test-mkimage-wrapper.bbclass new file mode 100644 index 000000000..7c98d7b71 --- /dev/null +++ b/poky/meta-selftest/classes/test-mkimage-wrapper.bbclass @@ -0,0 +1,19 @@ +# Class to test UBOOT_MKIMAGE and UBOOT_MKIMAGE_SIGN +# (in conjunction with kernel-fitimage.bbclass) +# +# SPDX-License-Identifier: MIT +# + +UBOOT_MKIMAGE = "test_mkimage_wrapper" +UBOOT_MKIMAGE_SIGN = "test_mkimage_signing_wrapper" + +test_mkimage_wrapper() { + echo "### uboot-mkimage wrapper message" + uboot-mkimage "$@" +} + +test_mkimage_signing_wrapper() { + echo "### uboot-mkimage signing wrapper message" + uboot-mkimage "$@" +} + diff --git a/poky/meta-selftest/files/static-group b/poky/meta-selftest/files/static-group index 9213b8e9b..892231b6e 100644 --- a/poky/meta-selftest/files/static-group +++ b/poky/meta-selftest/files/static-group @@ -11,4 +11,11 @@ avahi:x:509: avahi-autoipd:x:510: rpc:x:511: rpcuser:x:513: - +dhcpcd:x:514: +sshd:x:516: +lpadmin:x:517: +crontab:x:518: +tracing:x:519: +pulse:x:520: +bind:x:521: +builder:x:522: diff --git a/poky/meta-selftest/files/static-passwd b/poky/meta-selftest/files/static-passwd index 412f85d46..babbfbc9d 100644 --- a/poky/meta-selftest/files/static-passwd +++ b/poky/meta-selftest/files/static-passwd @@ -9,3 +9,9 @@ avahi-autoipd:x:510:510::/:/bin/nologin rpc:x:511:511::/:/bin/nologin distcc:x:512:nogroup::/:/bin/nologin rpcuser:x:513:513::/var/lib/nfs:/bin/nologin +dhcpcd:x:514:514::/:/bin/nologin +tester:x:515:515::/:/bin/nologin +sshd:x:516:516::/:/bin/nologin +pulse:x:520:520::/:/bin/nologin +bind:x:521:521::/:/bin/nologin +builder:x:522:522::/:/bin/nologin diff --git a/poky/meta-selftest/lib/pseudo_pyc_test1.py b/poky/meta-selftest/lib/pseudo_pyc_test1.py new file mode 100644 index 000000000..b59abdd53 --- /dev/null +++ b/poky/meta-selftest/lib/pseudo_pyc_test1.py @@ -0,0 +1 @@ +STRING = "pseudo_pyc_test1" diff --git a/poky/meta-selftest/lib/pseudo_pyc_test2.py b/poky/meta-selftest/lib/pseudo_pyc_test2.py new file mode 100644 index 000000000..fb67a978e --- /dev/null +++ b/poky/meta-selftest/lib/pseudo_pyc_test2.py @@ -0,0 +1 @@ +STRING = "pseudo_pyc_test2" diff --git a/poky/meta-selftest/recipes-test/images/wic-image-minimal.bb b/poky/meta-selftest/recipes-test/images/wic-image-minimal.bb index e1da203b5..1cb019898 100644 --- a/poky/meta-selftest/recipes-test/images/wic-image-minimal.bb +++ b/poky/meta-selftest/recipes-test/images/wic-image-minimal.bb @@ -6,7 +6,10 @@ IMAGE_INSTALL = "packagegroup-core-boot" IMAGE_FSTYPES = "wic" -WKS_FILE_DEPENDS = "syslinux syslinux-native dosfstools-native mtools-native gptfdisk-native" +WKS_FILE_DEPENDS = "dosfstools-native mtools-native gptfdisk-native" +WKS_FILE_DEPENDS_append_x86 = " syslinux-native syslinux" +WKS_FILE_DEPENDS_append_x86-64 = " syslinux-native syslinux" +WKS_FILE_DEPENDS_append_x86-x32 = " syslinux-native syslinux" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" diff --git a/poky/meta-selftest/recipes-test/pseudo-pyc-test/pseudo-pyc-test.bb b/poky/meta-selftest/recipes-test/pseudo-pyc-test/pseudo-pyc-test.bb new file mode 100644 index 000000000..12dc91a8f --- /dev/null +++ b/poky/meta-selftest/recipes-test/pseudo-pyc-test/pseudo-pyc-test.bb @@ -0,0 +1,15 @@ +SUMMARY = "pseudo env test" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +INHIBIT_DEFAULT_DEPS = "1" + +python do_compile() { + import pseudo_pyc_test1 + print(pseudo_pyc_test1.STRING) +} + +python do_install() { + import pseudo_pyc_test2 + print(pseudo_pyc_test2.STRING) +} diff --git a/poky/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb b/poky/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb index 87bf9438b..440471fe8 100644 --- a/poky/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb +++ b/poky/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb @@ -3,6 +3,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda LICENSE = "MIT" +DEPENDS += "coreutils-native" + S = "${WORKDIR}" inherit useradd allarch @@ -16,10 +18,13 @@ do_install() { install -d ${TESTDIR}/dir touch ${TESTDIR}/file ln -s ./file ${TESTDIR}/symlink + install -d ${TESTDIR}/fifotest + mkfifo ${TESTDIR}/fifotest/fifo chown test:test ${TESTDIR}/file chown -R test:test ${TESTDIR}/dir chown -h test:test ${TESTDIR}/symlink + chown -R test:test ${TESTDIR}/fifotest } FILES_${PN} = "${sysconfdir}/selftest-chown/*" diff --git a/poky/meta-selftest/wic/test_empty_plugin.wks b/poky/meta-selftest/wic/test_empty_plugin.wks new file mode 100644 index 000000000..4e91e04e1 --- /dev/null +++ b/poky/meta-selftest/wic/test_empty_plugin.wks @@ -0,0 +1,4 @@ +# short-description: image for checking empty partition creation + +part / --source rootfs --fstype=ext4 --align 1024 --use-uuid +part empty --source empty --ondisk sda --size 1024 --align 1024 diff --git a/poky/meta-yocto-bsp/README.hardware b/poky/meta-yocto-bsp/README.hardware index 5996be764..9803af006 100644 --- a/poky/meta-yocto-bsp/README.hardware +++ b/poky/meta-yocto-bsp/README.hardware @@ -120,7 +120,7 @@ USB Device: Texas Instruments Beaglebone (beaglebone-yocto) -========================================= +=============================================== The Beaglebone is an ARM Cortex-A8 development board with USB, Ethernet, 2D/3D accelerated graphics, audio, serial, JTAG, and SD/MMC. The Black adds a faster @@ -150,7 +150,7 @@ From a Linux system with access to the image files perform the following steps: 2. Use the "dd" utility to write the image to the SD card. For example: - # dd core-image-minimal-beaglebone-yocto.wic of=/dev/sdb + # dd if=core-image-minimal-beaglebone-yocto.wic of=/dev/sdb 3. Insert the SD card into the Beaglebone and boot the board. diff --git a/poky/meta-yocto-bsp/conf/layer.conf b/poky/meta-yocto-bsp/conf/layer.conf index bf0c1bfec..eb9f55ea9 100644 --- a/poky/meta-yocto-bsp/conf/layer.conf +++ b/poky/meta-yocto-bsp/conf/layer.conf @@ -5,6 +5,12 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" + +PREFERRED_VERSION_linux-yocto_genericx86 ?= "5.8%" +PREFERRED_VERSION_linux-yocto_genericx86-64 ?= "5.8%" +PREFERRED_VERSION_linux-yocto_edgerouter ?= "5.8%" +PREFERRED_VERSION_linux-yocto_beaglebone-yocto ?= "5.8%" + BBFILE_COLLECTIONS += "yoctobsp" BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" BBFILE_PRIORITY_yoctobsp = "5" diff --git a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index b7defb0d0..523472ab1 100644 --- a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -38,7 +38,7 @@ UBOOT_LOADADDRESS = "0x80008000" MACHINE_FEATURES = "usbgadget usbhost vfat alsa" -IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} MLO zImage am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" +IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE}" # support runqemu EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" diff --git a/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks b/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks index 97bd480a0..701ae0b3d 100644 --- a/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks +++ b/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks @@ -3,5 +3,5 @@ # Boot files are located in the first vfat partition. part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4 --size 16 --sourceparams="loader=u-boot" --use-uuid -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4 --use-uuid +part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 4 --use-uuid bootloader --append="console=ttyS0,115200" diff --git a/poky/meta/classes/archiver.bbclass b/poky/meta/classes/archiver.bbclass index 598298ef6..858507b34 100644 --- a/poky/meta/classes/archiver.bbclass +++ b/poky/meta/classes/archiver.bbclass @@ -590,6 +590,7 @@ addtask do_dumpdata addtask do_ar_recipe addtask do_deploy_archives do_build[recrdeptask] += "do_deploy_archives" +do_rootfs[recrdeptask] += "do_deploy_archives" do_populate_sdk[recrdeptask] += "do_deploy_archives" python () { diff --git a/poky/meta/classes/ccache.bbclass b/poky/meta/classes/ccache.bbclass index b5457359c..f00fafc29 100644 --- a/poky/meta/classes/ccache.bbclass +++ b/poky/meta/classes/ccache.bbclass @@ -1,5 +1,7 @@ # # Usage: +# - Install ccache package on the host distribution and set up a build directory +# # - Enable ccache # Add the following line to a conffile such as conf/local.conf: # INHERIT += "ccache" @@ -33,6 +35,10 @@ export CCACHE_CONFIGPATH ?= "${COREBASE}/meta/conf/ccache.conf" export CCACHE_DIR ?= "${CCACHE_TOP_DIR}/${MULTIMACH_TARGET_SYS}/${PN}" +# Fixed errors: +# ccache: error: Failed to create directory /run/user/0/ccache-tmp: Permission denied +export CCACHE_TEMPDIR ?= "${CCACHE_DIR}/tmp" + # We need to stop ccache considering the current directory or the # debug-prefix-map target directory to be significant when calculating # its hash. Without this the cache would be invalidated every time @@ -47,7 +53,6 @@ python() { # quilt-native doesn't need ccache since no c files if not (pn in ('ccache-native', 'quilt-native') or bb.utils.to_boolean(d.getVar('CCACHE_DISABLE'))): - d.appendVar('DEPENDS', ' ccache-native') d.setVar('CCACHE', 'ccache ') } diff --git a/poky/meta/classes/distutils3.bbclass b/poky/meta/classes/distutils3.bbclass index 7356b5245..a916a8000 100644 --- a/poky/meta/classes/distutils3.bbclass +++ b/poky/meta/classes/distutils3.bbclass @@ -12,28 +12,30 @@ DISTUTILS_INSTALL_ARGS ?= "--root=${D} \ DISTUTILS_PYTHON = "python3" DISTUTILS_PYTHON_class-native = "nativepython3" +DISTUTILS_SETUP_PATH ?= "${S}" + distutils3_do_configure() { : } distutils3_do_compile() { - cd ${S} + cd ${DISTUTILS_SETUP_PATH} NO_FETCH_BUILD=1 \ STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} ${S}/setup.py \ + ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ build --build-base=${B} ${DISTUTILS_BUILD_ARGS} || \ bbfatal_log "'${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS}' execution failed." } distutils3_do_compile[vardepsexclude] = "MACHINE" distutils3_do_install() { - cd ${S} + cd ${DISTUTILS_SETUP_PATH} install -d ${D}${PYTHON_SITEPACKAGES_DIR} STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} ${S}/setup.py \ + ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ build --build-base=${B} install --skip-build ${DISTUTILS_INSTALL_ARGS} || \ bbfatal_log "'${PYTHON_PN} setup.py install ${DISTUTILS_INSTALL_ARGS}' execution failed." diff --git a/poky/meta/classes/go.bbclass b/poky/meta/classes/go.bbclass index a9e31b50e..5b26378a4 100644 --- a/poky/meta/classes/go.bbclass +++ b/poky/meta/classes/go.bbclass @@ -40,6 +40,7 @@ GO_RPATH_LINK_class-native = "${@'-Wl,-rpath-link=${STAGING_LIBDIR_NATIVE}/go/pk GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${GO_RPATH_LINK} ${LDFLAGS}" GO_LINKMODE ?= "" GO_LINKMODE_class-nativesdk = "--linkmode=external" +GO_LINKMODE_class-native = "--linkmode=external" GO_LDFLAGS ?= '-ldflags="${GO_RPATH} ${GO_LINKMODE} -extldflags '${GO_EXTLDFLAGS}'"' export GOBUILDFLAGS ?= "-v ${GO_LDFLAGS} -trimpath" export GOPATH_OMIT_IN_ACTIONID ?= "1" diff --git a/poky/meta/classes/grub-efi-cfg.bbclass b/poky/meta/classes/grub-efi-cfg.bbclass index 3a2cdd698..ea21b3de3 100644 --- a/poky/meta/classes/grub-efi-cfg.bbclass +++ b/poky/meta/classes/grub-efi-cfg.bbclass @@ -120,3 +120,4 @@ python build_efi_cfg() { cfgfile.close() } +build_efi_cfg[vardepsexclude] += "OVERRIDES" diff --git a/poky/meta/classes/insane.bbclass b/poky/meta/classes/insane.bbclass index cf2165c51..105d2a5ce 100644 --- a/poky/meta/classes/insane.bbclass +++ b/poky/meta/classes/insane.bbclass @@ -87,7 +87,8 @@ def package_qa_add_message(messages, section, new_msg): QAPATHTEST[shebang-size] = "package_qa_check_shebang_size" def package_qa_check_shebang_size(path, name, d, elf, messages): - if os.path.islink(path) or elf: + import stat + if os.path.islink(path) or stat.S_ISFIFO(os.stat(path).st_mode) or elf: return try: diff --git a/poky/meta/classes/kernel-fitimage.bbclass b/poky/meta/classes/kernel-fitimage.bbclass index bb2f3c4cc..9fa302a5c 100644 --- a/poky/meta/classes/kernel-fitimage.bbclass +++ b/poky/meta/classes/kernel-fitimage.bbclass @@ -72,6 +72,19 @@ FIT_KEY_REQ_ARGS ?= "-batch -new" # Standard format for public key certificate FIT_KEY_SIGN_PKCS ?= "-x509" +# Description string +FIT_DESC ?= "U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}" + +# Sign individual images as well +FIT_SIGN_INDIVIDUAL ?= "0" + +# mkimage command +UBOOT_MKIMAGE ?= "uboot-mkimage" +UBOOT_MKIMAGE_SIGN ?= "${UBOOT_MKIMAGE}" + +# Arguments passed to mkimage for signing +UBOOT_MKIMAGE_SIGN_ARGS ?= "" + # # Emit the fitImage ITS header # @@ -81,7 +94,7 @@ fitimage_emit_fit_header() { /dts-v1/; / { - description = "U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}"; + description = "${FIT_DESC}"; #address-cells = <1>; EOF } @@ -132,6 +145,8 @@ EOF fitimage_emit_section_kernel() { kernel_csum="${FIT_HASH_ALG}" + kernel_sign_algo="${FIT_SIGN_ALG}" + kernel_sign_keyname="${UBOOT_SIGN_KEYNAME}" ENTRYPOINT="${UBOOT_ENTRYPOINT}" if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then @@ -154,6 +169,17 @@ fitimage_emit_section_kernel() { }; }; EOF + + if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${kernel_sign_keyname}" ] ; then + sed -i '$ d' ${1} + cat << EOF >> ${1} + signature@1 { + algo = "${kernel_csum},${kernel_sign_algo}"; + key-name-hint = "${kernel_sign_keyname}"; + }; + }; +EOF + fi } # @@ -165,6 +191,8 @@ EOF fitimage_emit_section_dtb() { dtb_csum="${FIT_HASH_ALG}" + dtb_sign_algo="${FIT_SIGN_ALG}" + dtb_sign_keyname="${UBOOT_SIGN_KEYNAME}" dtb_loadline="" dtb_ext=${DTB##*.} @@ -188,6 +216,17 @@ fitimage_emit_section_dtb() { }; }; EOF + + if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${dtb_sign_keyname}" ] ; then + sed -i '$ d' ${1} + cat << EOF >> ${1} + signature@1 { + algo = "${dtb_csum},${dtb_sign_algo}"; + key-name-hint = "${dtb_sign_keyname}"; + }; + }; +EOF + fi } # @@ -226,6 +265,8 @@ EOF fitimage_emit_section_ramdisk() { ramdisk_csum="${FIT_HASH_ALG}" + ramdisk_sign_algo="${FIT_SIGN_ALG}" + ramdisk_sign_keyname="${UBOOT_SIGN_KEYNAME}" ramdisk_loadline="" ramdisk_entryline="" @@ -251,6 +292,17 @@ fitimage_emit_section_ramdisk() { }; }; EOF + + if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${ramdisk_sign_keyname}" ] ; then + sed -i '$ d' ${1} + cat << EOF >> ${1} + signature@1 { + algo = "${ramdisk_csum},${ramdisk_sign_algo}"; + key-name-hint = "${ramdisk_sign_keyname}"; + }; + }; +EOF + fi } # @@ -270,6 +322,13 @@ fitimage_emit_section_config() { conf_sign_keyname="${UBOOT_SIGN_KEYNAME}" fi + its_file="${1}" + kernel_id="${2}" + dtb_image="${3}" + ramdisk_id="${4}" + config_id="${5}" + default_flag="${6}" + # Test if we have any DTBs at all sep="" conf_desc="" @@ -282,49 +341,49 @@ fitimage_emit_section_config() { # conf node name is selected based on dtb ID if it is present, # otherwise its selected based on kernel ID - if [ -n "${3}" ]; then - conf_node=$conf_node${3} + if [ -n "${dtb_image}" ]; then + conf_node=$conf_node${dtb_image} else - conf_node=$conf_node${2} + conf_node=$conf_node${kernel_id} fi - if [ -n "${2}" ]; then + if [ -n "${kernel_id}" ]; then conf_desc="Linux kernel" sep=", " - kernel_line="kernel = \"kernel@${2}\";" + kernel_line="kernel = \"kernel@${kernel_id}\";" fi - if [ -n "${3}" ]; then + if [ -n "${dtb_image}" ]; then conf_desc="${conf_desc}${sep}FDT blob" sep=", " - fdt_line="fdt = \"fdt@${3}\";" + fdt_line="fdt = \"fdt@${dtb_image}\";" fi - if [ -n "${4}" ]; then + if [ -n "${ramdisk_id}" ]; then conf_desc="${conf_desc}${sep}ramdisk" sep=", " - ramdisk_line="ramdisk = \"ramdisk@${4}\";" + ramdisk_line="ramdisk = \"ramdisk@${ramdisk_id}\";" fi - if [ -n "${5}" ]; then + if [ -n "${config_id}" ]; then conf_desc="${conf_desc}${sep}setup" - setup_line="setup = \"setup@${5}\";" + setup_line="setup = \"setup@${config_id}\";" fi - if [ "${6}" = "1" ]; then + if [ "${default_flag}" = "1" ]; then # default node is selected based on dtb ID if it is present, # otherwise its selected based on kernel ID - if [ -n "${3}" ]; then - default_line="default = \"conf@${3}\";" + if [ -n "${dtb_image}" ]; then + default_line="default = \"conf@${dtb_image}\";" else - default_line="default = \"conf@${2}\";" + default_line="default = \"conf@${kernel_id}\";" fi fi - cat << EOF >> ${1} + cat << EOF >> ${its_file} ${default_line} $conf_node { - description = "${6} ${conf_desc}"; + description = "${default_flag} ${conf_desc}"; ${kernel_line} ${fdt_line} ${ramdisk_line} @@ -339,28 +398,28 @@ EOF sign_line="sign-images = " sep="" - if [ -n "${2}" ]; then + if [ -n "${kernel_id}" ]; then sign_line="${sign_line}${sep}\"kernel\"" sep=", " fi - if [ -n "${3}" ]; then + if [ -n "${dtb_image}" ]; then sign_line="${sign_line}${sep}\"fdt\"" sep=", " fi - if [ -n "${4}" ]; then + if [ -n "${ramdisk_id}" ]; then sign_line="${sign_line}${sep}\"ramdisk\"" sep=", " fi - if [ -n "${5}" ]; then + if [ -n "${config_id}" ]; then sign_line="${sign_line}${sep}\"setup\"" fi sign_line="${sign_line};" - cat << EOF >> ${1} + cat << EOF >> ${its_file} signature@1 { algo = "${conf_csum},${conf_sign_algo}"; key-name-hint = "${conf_sign_keyname}"; @@ -369,7 +428,7 @@ EOF EOF fi - cat << EOF >> ${1} + cat << EOF >> ${its_file} }; EOF } @@ -495,7 +554,7 @@ fitimage_assemble() { # # Step 6: Assemble the image # - uboot-mkimage \ + ${UBOOT_MKIMAGE} \ ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ -f ${1} \ arch/${ARCH}/boot/${2} @@ -511,11 +570,12 @@ fitimage_assemble() { cp -P ${STAGING_DATADIR}/u-boot*.dtb ${B} add_key_to_u_boot="-K ${B}/${UBOOT_DTB_BINARY}" fi - uboot-mkimage \ + ${UBOOT_MKIMAGE_SIGN} \ ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ -F -k "${UBOOT_SIGN_KEYDIR}" \ $add_key_to_u_boot \ - -r arch/${ARCH}/boot/${2} + -r arch/${ARCH}/boot/${2} \ + ${UBOOT_MKIMAGE_SIGN_ARGS} fi } diff --git a/poky/meta/classes/kernel.bbclass b/poky/meta/classes/kernel.bbclass index 1a444efab..2f1006ddf 100644 --- a/poky/meta/classes/kernel.bbclass +++ b/poky/meta/classes/kernel.bbclass @@ -1,5 +1,7 @@ inherit linux-kernel-base kernel-module-split +COMPATIBLE_HOST = ".*-linux" + KERNEL_PACKAGE_NAME ??= "kernel" KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }" diff --git a/poky/meta/classes/license.bbclass b/poky/meta/classes/license.bbclass index f90176d6c..dc9111834 100644 --- a/poky/meta/classes/license.bbclass +++ b/poky/meta/classes/license.bbclass @@ -31,6 +31,7 @@ python do_populate_lic() { f.write("%s: %s\n" % (key, info[key])) } +PSEUDO_IGNORE_PATHS .= ",${@','.join(((d.getVar('COMMON_LICENSE_DIR') or '') + ' ' + (d.getVar('LICENSE_PATH') or '')).split())}" # it would be better to copy them in do_install_append, but find_license_filesa is python python perform_packagecopy_prepend () { enabled = oe.data.typed_value('LICENSE_CREATE_PACKAGE', d) diff --git a/poky/meta/classes/linuxloader.bbclass b/poky/meta/classes/linuxloader.bbclass index 720e5dfad..b161c51a5 100644 --- a/poky/meta/classes/linuxloader.bbclass +++ b/poky/meta/classes/linuxloader.bbclass @@ -1,6 +1,6 @@ def get_musl_loader_arch(d): import re - ldso_arch = None + ldso_arch = "NotSupported" targetarch = d.getVar("TARGET_ARCH") if targetarch.startswith("microblaze"): @@ -32,7 +32,7 @@ def get_musl_loader(d): def get_glibc_loader(d): import re - dynamic_loader = None + dynamic_loader = "NotSupported" targetarch = d.getVar("TARGET_ARCH") if targetarch in ["powerpc", "microblaze"]: dynamic_loader = "${base_libdir}/ld.so.1" @@ -58,7 +58,7 @@ def get_linuxloader(d): overrides = d.getVar("OVERRIDES").split(":") if "libc-baremetal" in overrides: - return None + return "NotSupported" if "libc-musl" in overrides: dynamic_loader = get_musl_loader(d) diff --git a/poky/meta/classes/populate_sdk_base.bbclass b/poky/meta/classes/populate_sdk_base.bbclass index 49b183326..4db0511db 100644 --- a/poky/meta/classes/populate_sdk_base.bbclass +++ b/poky/meta/classes/populate_sdk_base.bbclass @@ -263,7 +263,7 @@ fakeroot create_shar() { rm -f ${T}/pre_install_command ${T}/post_install_command - if [ ${SDK_RELOCATE_AFTER_INSTALL} -eq 1 ] ; then + if [ "${SDK_RELOCATE_AFTER_INSTALL}" = "1" ] ; then cp ${TOOLCHAIN_SHAR_REL_TMPL} ${T}/post_install_command fi cat << "EOF" >> ${T}/pre_install_command diff --git a/poky/meta/classes/sanity.bbclass b/poky/meta/classes/sanity.bbclass index 3262d08fb..d134b40a8 100644 --- a/poky/meta/classes/sanity.bbclass +++ b/poky/meta/classes/sanity.bbclass @@ -770,10 +770,10 @@ def check_sanity_everybuild(status, d): if 0 == os.getuid(): raise_sanity_error("Do not use Bitbake as root.", d) - # Check the Python version, we now have a minimum of Python 3.4 + # Check the Python version, we now have a minimum of Python 3.6 import sys - if sys.hexversion < 0x030500F0: - status.addresult('The system requires at least Python 3.5 to run. Please update your Python interpreter.\n') + if sys.hexversion < 0x030600F0: + status.addresult('The system requires at least Python 3.6 to run. Please update your Python interpreter.\n') # Check the bitbake version meets minimum requirements from distutils.version import LooseVersion diff --git a/poky/meta/classes/uboot-extlinux-config.bbclass b/poky/meta/classes/uboot-extlinux-config.bbclass index f4bf94be0..be285daa0 100644 --- a/poky/meta/classes/uboot-extlinux-config.bbclass +++ b/poky/meta/classes/uboot-extlinux-config.bbclass @@ -153,5 +153,6 @@ python do_create_extlinux_config() { } UBOOT_EXTLINUX_VARS = "CONSOLE MENU_DESCRIPTION ROOT KERNEL_IMAGE FDTDIR FDT KERNEL_ARGS INITRD" do_create_extlinux_config[vardeps] += "${@' '.join(['UBOOT_EXTLINUX_%s_%s' % (v, l) for v in d.getVar('UBOOT_EXTLINUX_VARS').split() for l in d.getVar('UBOOT_EXTLINUX_LABELS').split()])}" +do_create_extlinux_config[vardepsexclude] += "OVERRIDES" addtask create_extlinux_config before do_install do_deploy after do_compile diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index 0d38eac09..be94b78eb 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -136,7 +136,7 @@ TARGET_CC_ARCH = "${TUNE_CCARGS}" TARGET_LD_ARCH = "${TUNE_LDARGS}" TARGET_AS_ARCH = "${TUNE_ASARGS}" -SDKMACHINE ??= "x86_64" +SDKMACHINE ??= "${BUILD_ARCH}" SDK_OS = "${BUILD_OS}" SDK_VENDOR = "-oesdk" SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}" @@ -486,7 +486,7 @@ HOSTTOOLS += " \ [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ 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 \ + head hostname iconv id install ld ldd ln ls make md5sum mkdir mkfifo mknod \ mktemp mv nm objcopy objdump od patch perl pr printf pwd \ python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh \ sha1sum sha224sum sha256sum sha384sum sha512sum \ @@ -498,7 +498,7 @@ HOSTTOOLS += " \ HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}" # Link to these if present -HOSTTOOLS_NONFATAL += "aws gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo" +HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo" # Temporary add few more detected in bitbake world HOSTTOOLS_NONFATAL += "join nl size yes zcat" @@ -685,15 +685,15 @@ SRC_URI = "" PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}" PSEUDO_SYSROOT = "${COMPONENTS_DIR}/${BUILD_ARCH}/pseudo-native" -PSEUDO_IGNORE_PATHS = "/usr/,/etc/,/lib,/dev/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR},${WORKDIR}/pkgdata-sysroot,${TMPDIR}/sstate-control,${DEPLOY_DIR},${WORKDIR}/deploy-,${TMPDIR}/buildstats,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/sstate-build-image_complete,${TMPDIR}/sysroots-components,${BUILDHISTORY_DIR},${TMPDIR}/pkgdata,${TOPDIR}/cache,${COREBASE}/scripts,${COREBASE}/meta,${CCACHE_DIR}" +PSEUDO_IGNORE_PATHS = "/usr/,/etc/,/lib,/dev/,/run/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR},${WORKDIR}/pkgdata-sysroot,${TMPDIR}/sstate-control,${DEPLOY_DIR},${WORKDIR}/deploy-,${TMPDIR}/buildstats,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/sstate-build-image_complete,${TMPDIR}/sysroots-components,${BUILDHISTORY_DIR},${TMPDIR}/pkgdata,${TOPDIR}/cache,${COREBASE}/scripts,${CCACHE_DIR}" export PSEUDO_DISABLED = "1" #export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}" #export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}" #export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib -FAKEROOTBASEENV = "PSEUDO_BINDIR=${PSEUDO_SYSROOT}${bindir_native} PSEUDO_LIBDIR=${PSEUDO_SYSROOT}${prefix_native}/lib/pseudo/lib PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_IGNORE_PATHS=${PSEUDO_IGNORE_PATHS} PSEUDO_DISABLED=1" +FAKEROOTBASEENV = "PSEUDO_BINDIR=${PSEUDO_SYSROOT}${bindir_native} PSEUDO_LIBDIR=${PSEUDO_SYSROOT}${prefix_native}/lib/pseudo/lib PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_IGNORE_PATHS=${@oe.path.canonicalize(d.getVar('PSEUDO_IGNORE_PATHS'))} PSEUDO_DISABLED=1 PYTHONDONTWRITEBYTECODE=1" FAKEROOTCMD = "${PSEUDO_SYSROOT}${bindir_native}/pseudo" -FAKEROOTENV = "PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_IGNORE_PATHS=${PSEUDO_IGNORE_PATHS} PSEUDO_DISABLED=0" +FAKEROOTENV = "PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_IGNORE_PATHS=${@oe.path.canonicalize(d.getVar('PSEUDO_IGNORE_PATHS'))} PSEUDO_DISABLED=0" FAKEROOTNOENV = "PSEUDO_UNLOAD=1" FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index e9c69b2e6..b0ddfb89a 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -31,14 +31,14 @@ RECIPE_MAINTAINER_pn-acl = "Chen Qi " RECIPE_MAINTAINER_pn-acpica = "Ross Burton " RECIPE_MAINTAINER_pn-acpid = "Ross Burton " RECIPE_MAINTAINER_pn-adwaita-icon-theme = "Ross Burton " -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-topology-conf = "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-alsa-lib = "Unassigned " +RECIPE_MAINTAINER_pn-alsa-plugins = "Unassigned " +RECIPE_MAINTAINER_pn-alsa-state = "Unassigned " +RECIPE_MAINTAINER_pn-alsa-tools = "Unassigned " +RECIPE_MAINTAINER_pn-alsa-topology-conf = "Unassigned " +RECIPE_MAINTAINER_pn-alsa-ucm-conf = "Unassigned " +RECIPE_MAINTAINER_pn-alsa-utils = "Unassigned " +RECIPE_MAINTAINER_pn-alsa-utils-scripts = "Unassigned " RECIPE_MAINTAINER_pn-apmd = "Anuj Mittal " RECIPE_MAINTAINER_pn-apr = "Hongxu Jia " RECIPE_MAINTAINER_pn-apr-util = "Hongxu Jia " @@ -175,7 +175,7 @@ RECIPE_MAINTAINER_pn-expect = "Alexander Kanavin " RECIPE_MAINTAINER_pn-ffmpeg = "Alexander Kanavin " RECIPE_MAINTAINER_pn-file = "Yi Zhao " RECIPE_MAINTAINER_pn-findutils = "Chen Qi " -RECIPE_MAINTAINER_pn-flac = "Tanu Kaskinen " +RECIPE_MAINTAINER_pn-flac = "Unassigned " RECIPE_MAINTAINER_pn-flex = "Chen Qi " RECIPE_MAINTAINER_pn-font-alias = "Armin Kuster " RECIPE_MAINTAINER_pn-font-util = "Armin Kuster " @@ -297,10 +297,10 @@ RECIPE_MAINTAINER_pn-kmod = "Chen Qi " RECIPE_MAINTAINER_pn-kmod-native = "Chen Qi " RECIPE_MAINTAINER_pn-kmscube = "Carlos Rafael Giani " RECIPE_MAINTAINER_pn-l3afpad = "Anuj Mittal " -RECIPE_MAINTAINER_pn-lame = "Tanu Kaskinen " +RECIPE_MAINTAINER_pn-lame = "Unassigned " RECIPE_MAINTAINER_pn-ldconfig-native = "Khem Raj " RECIPE_MAINTAINER_pn-less = "Yi Zhao " -RECIPE_MAINTAINER_pn-liba52 = "Tanu Kaskinen " +RECIPE_MAINTAINER_pn-liba52 = "Unassigned " RECIPE_MAINTAINER_pn-libacpi = "Anuj Mittal " RECIPE_MAINTAINER_pn-libaio = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libarchive = "Otavio Salvador " @@ -343,7 +343,7 @@ RECIPE_MAINTAINER_pn-libgudev = "Ross Burton " RECIPE_MAINTAINER_pn-libhandy = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libical = "Ross Burton " RECIPE_MAINTAINER_pn-libice = "Armin Kuster " -RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen " +RECIPE_MAINTAINER_pn-libid3tag = "Unassigned " RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton " RECIPE_MAINTAINER_pn-libinput = "Ross Burton " RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton " @@ -374,11 +374,11 @@ RECIPE_MAINTAINER_pn-libpthread-stubs = "Alexander Kanavin " RECIPE_MAINTAINER_pn-psplash = "Yi Zhao " RECIPE_MAINTAINER_pn-ptest-runner = "Ross Burton " -RECIPE_MAINTAINER_pn-pulseaudio = "Tanu Kaskinen " -RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen " +RECIPE_MAINTAINER_pn-pulseaudio = "Unassigned " +RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Unassigned " RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal " RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk " RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk " @@ -651,7 +651,7 @@ RECIPE_MAINTAINER_pn-ruby = "Ross Burton " RECIPE_MAINTAINER_pn-run-postinsts = "Ross Burton " RECIPE_MAINTAINER_pn-rxvt-unicode = "Armin Kuster " RECIPE_MAINTAINER_pn-sato-screenshot = "Ross Burton " -RECIPE_MAINTAINER_pn-sbc = "Tanu Kaskinen " +RECIPE_MAINTAINER_pn-sbc = "Unassigned " RECIPE_MAINTAINER_pn-screen = "Anuj Mittal " RECIPE_MAINTAINER_pn-sed = "Chen Qi " RECIPE_MAINTAINER_pn-serf = "Anuj Mittal " @@ -666,8 +666,8 @@ RECIPE_MAINTAINER_pn-shutdown-desktop = "Alexander Kanavin + """ + config = """ +# Enable creation of fitImage +KERNEL_IMAGETYPE = "Image" +KERNEL_IMAGETYPES += " fitImage " +KERNEL_CLASSES = " kernel-fitimage " + +# RAM disk variables including load address and entrypoint for kernel and RAM disk +IMAGE_FSTYPES += "cpio.gz" +INITRAMFS_IMAGE = "core-image-minimal" +UBOOT_RD_LOADADDRESS = "0x88000000" +UBOOT_RD_ENTRYPOINT = "0x88000000" +UBOOT_LOADADDRESS = "0x80080000" +UBOOT_ENTRYPOINT = "0x80080000" +FIT_DESC = "A model description" +""" + self.write_config(config) + + # fitImage is created as part of linux recipe + bitbake("virtual/kernel") + + image_type = "core-image-minimal" + deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') + machine = get_bb_var('MACHINE') + fitimage_its_path = os.path.join(deploy_dir_image, + "fitImage-its-%s-%s-%s" % (image_type, machine, machine)) + fitimage_path = os.path.join(deploy_dir_image, + "fitImage-%s-%s-%s" % (image_type, machine, machine)) + + self.assertTrue(os.path.exists(fitimage_its_path), + "%s image tree source doesn't exist" % (fitimage_its_path)) + self.assertTrue(os.path.exists(fitimage_path), + "%s FIT image doesn't exist" % (fitimage_path)) + + # Check that the type, load address, entrypoint address and default + # values for kernel and ramdisk in Image Tree Source are as expected. + # The order of fields in the below array is important. Not all the + # fields are tested, only the key fields that wont vary between + # different architectures. + its_field_check = [ + 'description = "A model description";', + 'type = "kernel";', + 'load = <0x80080000>;', + 'entry = <0x80080000>;', + 'type = "ramdisk";', + 'load = <0x88000000>;', + 'entry = <0x88000000>;', + 'default = "conf@1";', + 'kernel = "kernel@1";', + 'ramdisk = "ramdisk@1";' + ] + + with open(fitimage_its_path) as its_file: + field_index = 0 + for line in its_file: + if field_index == len(its_field_check): + break + if its_field_check[field_index] in line: + field_index +=1 + + if field_index != len(its_field_check): # if its equal, the test passed + self.assertTrue(field_index == len(its_field_check), + "Fields in Image Tree Source File %s did not match, error in finding %s" + % (fitimage_its_path, its_field_check[field_index])) + + + def test_sign_fit_image(self): + """ + Summary: Check if FIT image and Image Tree Source (its) are created + and signed correctly. + Expected: 1) its and FIT image are built successfully + 2) Scanning the its file indicates signing is enabled + as requested by UBOOT_SIGN_ENABLE (using keys generated + via FIT_GENERATE_KEYS) + 3) Dumping the FIT image indicates signature values + are present (including for images as enabled via + FIT_SIGN_INDIVIDUAL) + 4) Examination of the do_assemble_fitimage runfile/logfile + indicate that UBOOT_MKIMAGE, UBOOT_MKIMAGE_SIGN and + UBOOT_MKIMAGE_SIGN_ARGS are working as expected. + Product: oe-core + Author: Paul Eggleton based upon + work by Usama Arif + """ + config = """ +# Enable creation of fitImage +MACHINE = "beaglebone-yocto" +KERNEL_IMAGETYPES += " fitImage " +KERNEL_CLASSES = " kernel-fitimage test-mkimage-wrapper " +UBOOT_SIGN_ENABLE = "1" +FIT_GENERATE_KEYS = "1" +UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys" +UBOOT_SIGN_KEYNAME = "oe-selftest" +FIT_SIGN_INDIVIDUAL = "1" +UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'" +""" + self.write_config(config) + + # fitImage is created as part of linux recipe + bitbake("virtual/kernel") + + image_type = "core-image-minimal" + deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') + machine = get_bb_var('MACHINE') + fitimage_its_path = os.path.join(deploy_dir_image, + "fitImage-its-%s" % (machine,)) + fitimage_path = os.path.join(deploy_dir_image, + "fitImage-%s.bin" % (machine,)) + + self.assertTrue(os.path.exists(fitimage_its_path), + "%s image tree source doesn't exist" % (fitimage_its_path)) + self.assertTrue(os.path.exists(fitimage_path), + "%s FIT image doesn't exist" % (fitimage_path)) + + req_itspaths = [ + ['/', 'images', 'kernel@1'], + ['/', 'images', 'kernel@1', 'signature@1'], + ['/', 'images', 'fdt@am335x-boneblack.dtb'], + ['/', 'images', 'fdt@am335x-boneblack.dtb', 'signature@1'], + ['/', 'configurations', 'conf@am335x-boneblack.dtb'], + ['/', 'configurations', 'conf@am335x-boneblack.dtb', 'signature@1'], + ] + + itspath = [] + itspaths = [] + linect = 0 + sigs = {} + with open(fitimage_its_path) as its_file: + linect += 1 + for line in its_file: + line = line.strip() + if line.endswith('};'): + itspath.pop() + elif line.endswith('{'): + itspath.append(line[:-1].strip()) + itspaths.append(itspath[:]) + elif itspath and itspath[-1] == 'signature@1': + itsdotpath = '.'.join(itspath) + if not itsdotpath in sigs: + sigs[itsdotpath] = {} + if not '=' in line or not line.endswith(';'): + self.fail('Unexpected formatting in %s sigs section line %d:%s' % (fitimage_its_path, linect, line)) + key, value = line.split('=', 1) + sigs[itsdotpath][key.rstrip()] = value.lstrip().rstrip(';') + + for reqpath in req_itspaths: + if not reqpath in itspaths: + self.fail('Missing section in its file: %s' % reqpath) + + reqsigvalues_image = { + 'algo': '"sha256,rsa2048"', + 'key-name-hint': '"oe-selftest"', + } + reqsigvalues_config = { + 'algo': '"sha256,rsa2048"', + 'key-name-hint': '"oe-selftest"', + 'sign-images': '"kernel", "fdt"', + } + + for itspath, values in sigs.items(): + if 'conf@' in itspath: + reqsigvalues = reqsigvalues_config + else: + reqsigvalues = reqsigvalues_image + for reqkey, reqvalue in reqsigvalues.items(): + value = values.get(reqkey, None) + if value is None: + self.fail('Missing key "%s" in its file signature section %s' % (reqkey, itspath)) + self.assertEqual(value, reqvalue) + + # Dump the image to see if it really got signed + bitbake("u-boot-tools-native -c addto_recipe_sysroot") + result = runCmd('bitbake -e u-boot-tools-native | grep ^RECIPE_SYSROOT_NATIVE=') + recipe_sysroot_native = result.output.split('=')[1].strip('"') + dumpimage_path = os.path.join(recipe_sysroot_native, 'usr', 'bin', 'dumpimage') + result = runCmd('%s -l %s' % (dumpimage_path, fitimage_path)) + in_signed = None + signed_sections = {} + for line in result.output.splitlines(): + if line.startswith((' Configuration', ' Image')): + in_signed = re.search('\((.*)\)', line).groups()[0] + elif re.match('^ *', line) in (' ', ''): + in_signed = None + elif in_signed: + if not in_signed in signed_sections: + signed_sections[in_signed] = {} + key, value = line.split(':', 1) + signed_sections[in_signed][key.strip()] = value.strip() + self.assertIn('kernel@1', signed_sections) + self.assertIn('fdt@am335x-boneblack.dtb', signed_sections) + self.assertIn('conf@am335x-boneblack.dtb', signed_sections) + for signed_section, values in signed_sections.items(): + value = values.get('Sign algo', None) + self.assertEqual(value, 'sha256,rsa2048:oe-selftest', 'Signature algorithm for %s not expected value' % signed_section) + value = values.get('Sign value', None) + self.assertEqual(len(value), 512, 'Signature value for section %s not expected length' % signed_section) + + # Check for UBOOT_MKIMAGE_SIGN_ARGS + result = runCmd('bitbake -e virtual/kernel | grep ^T=') + tempdir = result.output.split('=', 1)[1].strip().strip('') + result = runCmd('grep "a smart comment" %s/run.do_assemble_fitimage' % tempdir, ignore_status=True) + self.assertEqual(result.status, 0, 'UBOOT_MKIMAGE_SIGN_ARGS value did not get used') + + # Check for evidence of test-mkimage-wrapper class + result = runCmd('grep "### uboot-mkimage wrapper message" %s/log.do_assemble_fitimage' % tempdir, ignore_status=True) + self.assertEqual(result.status, 0, 'UBOOT_MKIMAGE did not work') + result = runCmd('grep "### uboot-mkimage signing wrapper message" %s/log.do_assemble_fitimage' % tempdir, ignore_status=True) + self.assertEqual(result.status, 0, 'UBOOT_MKIMAGE_SIGN did not work') + diff --git a/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py index 415e0315f..6723a8198 100644 --- a/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py +++ b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py @@ -264,80 +264,6 @@ PNBLACKLIST[busybox] = "Don't build this" bitbake("--graphviz core-image-sato") - def test_fit_image(self): - """ - Summary: Check if FIT image and Image Tree Source (its) are built - and the Image Tree Source has the correct fields. - Expected: 1. fitImage and fitImage-its can be built - 2. The type, load address, entrypoint address and - default values of kernel and ramdisk are as expected - in the Image Tree Source. Not all the fields are tested, - only the key fields that wont vary between different - architectures. - Product: oe-core - Author: Usama Arif - """ - config = """ -# Enable creation of fitImage -KERNEL_IMAGETYPE = "Image" -KERNEL_IMAGETYPES += " fitImage " -KERNEL_CLASSES = " kernel-fitimage " - -# RAM disk variables including load address and entrypoint for kernel and RAM disk -IMAGE_FSTYPES += "cpio.gz" -INITRAMFS_IMAGE = "core-image-minimal" -UBOOT_RD_LOADADDRESS = "0x88000000" -UBOOT_RD_ENTRYPOINT = "0x88000000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_ENTRYPOINT = "0x80080000" -""" - self.write_config(config) - - # fitImage is created as part of linux recipe - bitbake("virtual/kernel") - - image_type = "core-image-minimal" - deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') - machine = get_bb_var('MACHINE') - fitimage_its_path = os.path.join(deploy_dir_image, - "fitImage-its-%s-%s-%s" % (image_type, machine, machine)) - fitimage_path = os.path.join(deploy_dir_image, - "fitImage-%s-%s-%s" % (image_type, machine, machine)) - - self.assertTrue(os.path.exists(fitimage_its_path), - "%s image tree source doesn't exist" % (fitimage_its_path)) - self.assertTrue(os.path.exists(fitimage_path), - "%s FIT image doesn't exist" % (fitimage_path)) - - # Check that the type, load address, entrypoint address and default - # values for kernel and ramdisk in Image Tree Source are as expected. - # The order of fields in the below array is important. Not all the - # fields are tested, only the key fields that wont vary between - # different architectures. - its_field_check = ['type = "kernel";', - 'load = <0x80080000>;', - 'entry = <0x80080000>;', - 'type = "ramdisk";', - 'load = <0x88000000>;', - 'entry = <0x88000000>;', - 'default = "conf@1";', - 'kernel = "kernel@1";', - 'ramdisk = "ramdisk@1";' - ] - - with open(fitimage_its_path) as its_file: - field_index = 0 - for line in its_file: - if field_index == len(its_field_check): - break - if its_field_check[field_index] in line: - field_index +=1 - - if field_index != len(its_field_check): # if its equal, the test passed - self.assertTrue(field_index == len(its_field_check), - "Fields in Image Tree Source File %s did not match, error in finding %s" - % (fitimage_its_path, its_field_check[field_index])) - def test_image_gen_debugfs(self): """ Summary: Check debugfs generation diff --git a/poky/meta/lib/oeqa/selftest/cases/oelib/elf.py b/poky/meta/lib/oeqa/selftest/cases/oelib/elf.py index d0a28090f..5a5f9b4fd 100644 --- a/poky/meta/lib/oeqa/selftest/cases/oelib/elf.py +++ b/poky/meta/lib/oeqa/selftest/cases/oelib/elf.py @@ -21,6 +21,6 @@ class TestElf(TestCase): self.assertEqual(oe.qa.elf_machine_to_string(0xB7), "AArch64") self.assertEqual(oe.qa.elf_machine_to_string(0xF7), "BPF") - self.assertEqual(oe.qa.elf_machine_to_string(0x00), "Unknown (0)") + self.assertEqual(oe.qa.elf_machine_to_string(0x00), "Unset") self.assertEqual(oe.qa.elf_machine_to_string(0xDEADBEEF), "Unknown (3735928559)") self.assertEqual(oe.qa.elf_machine_to_string("foobar"), "Unknown ('foobar')") diff --git a/poky/meta/lib/oeqa/selftest/cases/package.py b/poky/meta/lib/oeqa/selftest/cases/package.py index 3010b1af4..7166c3991 100644 --- a/poky/meta/lib/oeqa/selftest/cases/package.py +++ b/poky/meta/lib/oeqa/selftest/cases/package.py @@ -168,6 +168,7 @@ class PackageTests(OESelftestTestCase): with runqemu('core-image-minimal') as qemu: for path in [ sysconfdir + "/selftest-chown/file", sysconfdir + "/selftest-chown/dir", - sysconfdir + "/selftest-chown/symlink"]: + sysconfdir + "/selftest-chown/symlink", + sysconfdir + "/selftest-chown/fifotest/fifo"]: if not check_ownership(qemu, "test", "test", path): self.fail('Test ownership %s failed' % path) diff --git a/poky/meta/lib/oeqa/selftest/cases/pkgdata.py b/poky/meta/lib/oeqa/selftest/cases/pkgdata.py index 833a1803b..254abc40c 100644 --- a/poky/meta/lib/oeqa/selftest/cases/pkgdata.py +++ b/poky/meta/lib/oeqa/selftest/cases/pkgdata.py @@ -218,3 +218,9 @@ class OePkgdataUtilTests(OESelftestTestCase): def test_specify_pkgdatadir(self): result = runCmd('oe-pkgdata-util -p %s lookup-pkg zlib' % get_bb_var('PKGDATA_DIR')) self.assertEqual(result.output, 'libz1') + + def test_no_param(self): + result = runCmd('oe-pkgdata-util', ignore_status=True) + self.assertEqual(result.status, 2, "Status different than 2. output: %s" % result.output) + currpos = result.output.find('usage: oe-pkgdata-util') + self.assertTrue(currpos != -1, msg = "Test is Failed. Help is not Displayed in %s" % result.output) diff --git a/poky/meta/lib/oeqa/selftest/cases/pseudo.py b/poky/meta/lib/oeqa/selftest/cases/pseudo.py new file mode 100644 index 000000000..33593d5ce --- /dev/null +++ b/poky/meta/lib/oeqa/selftest/cases/pseudo.py @@ -0,0 +1,27 @@ +# +# SPDX-License-Identifier: MIT +# + +import glob +import os +import shutil +from oeqa.utils.commands import bitbake, get_test_layer +from oeqa.selftest.case import OESelftestTestCase + +class Pseudo(OESelftestTestCase): + + def test_pseudo_pyc_creation(self): + self.write_config("") + + metaselftestpath = get_test_layer() + pycache_path = os.path.join(metaselftestpath, 'lib/__pycache__') + if os.path.exists(pycache_path): + shutil.rmtree(pycache_path) + + bitbake('pseudo-pyc-test -c install') + + test1_pyc_present = len(glob.glob(os.path.join(pycache_path, 'pseudo_pyc_test1.*.pyc'))) + self.assertTrue(test1_pyc_present, 'test1 pyc file missing, should be created outside of pseudo context.') + + test2_pyc_present = len(glob.glob(os.path.join(pycache_path, 'pseudo_pyc_test2.*.pyc'))) + self.assertFalse(test2_pyc_present, 'test2 pyc file present, should not be created in pseudo context.') diff --git a/poky/meta/lib/oeqa/selftest/cases/reproducible.py b/poky/meta/lib/oeqa/selftest/cases/reproducible.py index a7ef33614..eee494e5c 100644 --- a/poky/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/poky/meta/lib/oeqa/selftest/cases/reproducible.py @@ -17,6 +17,72 @@ import stat import os import datetime +# For sample packages, see: +# https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201127-0t7wr_oo/ +# https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201127-4s9ejwyp/ +# https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201127-haiwdlbr/ +# https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201127-hwds3mcl/ +# https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201203-sua0pzvc/ +# (both packages/ and packages-excluded/) +exclude_packages = [ + 'acpica-src', + 'babeltrace2-ptest', + 'bootchart2-doc', + 'cups', + 'cwautomacros', + 'dtc', + 'efivar', + 'epiphany', + 'gcr', + 'git', + 'glide', + 'go-dep', + 'go-helloworld', + 'go-runtime', + 'go_', + 'groff', + 'gst-devtools', + 'gstreamer1.0-python', + 'gtk-doc', + 'igt-gpu-tools', + 'kernel-devsrc', + 'libaprutil', + 'libcap-ng', + 'libhandy-1-src', + 'libid3tag', + 'libproxy', + 'libsecret-dev', + 'libsecret-src', + 'lttng-tools-dbg', + 'lttng-tools-ptest', + 'ltp', + 'meson', + 'ovmf-shell-efi', + 'parted-ptest', + 'perf', + 'python3-cython', + 'qemu', + 'quilt-ptest', + 'rsync', + 'ruby', + 'spirv-tools-dev', + 'swig', + 'syslinux-misc', + 'systemd-bootchart', + 'valgrind-ptest', + 'vim', + 'watchdog', + 'xmlto', + 'xorg-minimal-fonts' + ] + +def is_excluded(package): + package_name = os.path.basename(package) + for i in exclude_packages: + if package_name.startswith(i): + return True + return False + MISSING = 'MISSING' DIFFERENT = 'DIFFERENT' SAME = 'SAME' @@ -39,6 +105,7 @@ class PackageCompareResults(object): self.total = [] self.missing = [] self.different = [] + self.different_excluded = [] self.same = [] def add_result(self, r): @@ -46,7 +113,10 @@ class PackageCompareResults(object): if r.status == MISSING: self.missing.append(r) elif r.status == DIFFERENT: - self.different.append(r) + if is_excluded(r.reference): + self.different_excluded.append(r) + else: + self.different.append(r) else: self.same.append(r) @@ -54,10 +124,11 @@ class PackageCompareResults(object): self.total.sort() self.missing.sort() self.different.sort() + self.different_excluded.sort() self.same.sort() def __str__(self): - return 'same=%i different=%i missing=%i total=%i' % (len(self.same), len(self.different), len(self.missing), len(self.total)) + return 'same=%i different=%i different_excluded=%i missing=%i total=%i' % (len(self.same), len(self.different), len(self.different_excluded), len(self.missing), len(self.total)) def compare_file(reference, test, diffutils_sysroot): result = CompareResult() @@ -105,7 +176,7 @@ class DiffoscopeTests(OESelftestTestCase): class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] - images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] + images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline', 'world'] save_results = False if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ: save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT'] @@ -176,6 +247,12 @@ class ReproducibleTests(OESelftestTestCase): PACKAGE_CLASSES = "{package_classes}" INHIBIT_PACKAGE_STRIP = "1" TMPDIR = "{tmpdir}" + LICENSE_FLAGS_WHITELIST = "commercial" + DISTRO_FEATURES_append = ' systemd pam' + USERADDEXTENSION = "useradd-staticids" + USERADD_ERROR_DYNAMIC = "skip" + USERADD_UID_TABLES += "files/static-passwd" + USERADD_GID_TABLES += "files/static-group" ''').format(package_classes=' '.join('package_%s' % c for c in self.package_classes), tmpdir=tmpdir) @@ -235,6 +312,7 @@ class ReproducibleTests(OESelftestTestCase): self.write_package_list(package_class, 'missing', result.missing) self.write_package_list(package_class, 'different', result.different) + self.write_package_list(package_class, 'different_excluded', result.different_excluded) self.write_package_list(package_class, 'same', result.same) if self.save_results: @@ -242,8 +320,12 @@ class ReproducibleTests(OESelftestTestCase): 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)])) + for d in result.different_excluded: + self.copy_file(d.reference, '/'.join([save_dir, 'packages-excluded', strip_topdir(d.reference)])) + self.copy_file(d.test, '/'.join([save_dir, 'packages-excluded', strip_topdir(d.test)])) + if result.missing or result.different: - fails.append("The following %s packages are missing or different: %s" % + fails.append("The following %s packages are missing or different and not in exclusion list: %s" % (c, '\n'.join(r.test for r in (result.missing + result.different)))) # Clean up empty directories diff --git a/poky/meta/lib/oeqa/selftest/cases/wic.py b/poky/meta/lib/oeqa/selftest/cases/wic.py index 714637ec1..091f0ab47 100644 --- a/poky/meta/lib/oeqa/selftest/cases/wic.py +++ b/poky/meta/lib/oeqa/selftest/cases/wic.py @@ -990,6 +990,26 @@ class Wic2(WicTestCase): out = glob(self.resultdir + "%s-*direct" % wksname) self.assertEqual(1, len(out)) + def test_empty_plugin(self): + """Test empty plugin""" + config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_empty_plugin.wks"\n' + self.append_config(config) + self.assertEqual(0, bitbake('core-image-minimal').status) + self.remove_config(config) + + bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'MACHINE']) + deploy_dir = bb_vars['DEPLOY_DIR_IMAGE'] + machine = bb_vars['MACHINE'] + image_path = os.path.join(deploy_dir, 'core-image-minimal-%s.wic' % machine) + self.assertEqual(True, os.path.exists(image_path)) + + sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') + + # Fstype column from 'wic ls' should be empty for the second partition + # as listed in test_empty_plugin.wks + result = runCmd("wic ls %s -n %s | awk -F ' ' '{print $1 \" \" $5}' | grep '^2' | wc -w" % (image_path, sysroot)) + self.assertEqual('1', result.output) + @only_for_arch(['i586', 'i686', 'x86_64']) def test_biosplusefi_plugin_qemu(self): """Test biosplusefi plugin in qemu""" diff --git a/poky/meta/lib/oeqa/selftest/context.py b/poky/meta/lib/oeqa/selftest/context.py index dd3609c1d..165992697 100644 --- a/poky/meta/lib/oeqa/selftest/context.py +++ b/poky/meta/lib/oeqa/selftest/context.py @@ -34,7 +34,7 @@ class NonConcurrentTestSuite(unittest.TestSuite): (builddir, newbuilddir) = self.setupfunc("-st", None, self.suite) ret = super().run(result) os.chdir(builddir) - if newbuilddir and ret.wasSuccessful(): + if newbuilddir and ret.wasSuccessful() and self.removefunc: self.removefunc(newbuilddir) def removebuilddir(d): @@ -54,7 +54,7 @@ def removebuilddir(d): bb.utils.prunedir(d, ionice=True) class OESelftestTestContext(OETestContext): - def __init__(self, td=None, logger=None, machines=None, config_paths=None, newbuilddir=None): + def __init__(self, td=None, logger=None, machines=None, config_paths=None, newbuilddir=None, keep_builddir=None): super(OESelftestTestContext, self).__init__(td, logger) self.machines = machines @@ -62,6 +62,11 @@ class OESelftestTestContext(OETestContext): self.config_paths = config_paths self.newbuilddir = newbuilddir + if keep_builddir: + self.removebuilddir = None + else: + self.removebuilddir = removebuilddir + def setup_builddir(self, suffix, selftestdir, suite): builddir = os.environ['BUILDDIR'] if not selftestdir: @@ -119,9 +124,9 @@ class OESelftestTestContext(OETestContext): if processes: from oeqa.core.utils.concurrencytest import ConcurrentTestSuite - return ConcurrentTestSuite(suites, processes, self.setup_builddir, removebuilddir) + return ConcurrentTestSuite(suites, processes, self.setup_builddir, self.removebuilddir) else: - return NonConcurrentTestSuite(suites, processes, self.setup_builddir, removebuilddir) + return NonConcurrentTestSuite(suites, processes, self.setup_builddir, self.removebuilddir) def runTests(self, processes=None, machine=None, skips=[]): if machine: @@ -179,6 +184,9 @@ class OESelftestTestContextExecutor(OETestContextExecutor): action='append', default=None, help='Exclude all (unhidden) tests that match any of the specified tag(s). (exclude applies before select)') + parser.add_argument('-K', '--keep-builddir', action='store_true', + help='Keep the test build directory even if all tests pass') + parser.add_argument('-B', '--newbuilddir', help='New build directory to use for tests.') parser.add_argument('-v', '--verbose', action='store_true') parser.set_defaults(func=self.run) @@ -236,6 +244,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor): 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") self.tc_kwargs['init']['newbuilddir'] = args.newbuilddir + self.tc_kwargs['init']['keep_builddir'] = args.keep_builddir def tag_filter(tags): if args.exclude_tags: diff --git a/poky/meta/lib/oeqa/utils/commands.py b/poky/meta/lib/oeqa/utils/commands.py index 6c1535ddf..a71c16ab1 100644 --- a/poky/meta/lib/oeqa/utils/commands.py +++ b/poky/meta/lib/oeqa/utils/commands.py @@ -188,7 +188,10 @@ def runCmd(command, ignore_status=False, timeout=None, assert_error=True, sync=T # call sync around the tests to ensure the IO queue doesn't get too large, taking any IO # hit here rather than in bitbake shutdown. if sync: + p = os.environ['PATH'] + os.environ['PATH'] = "/usr/bin:/bin:/usr/sbin:/sbin:" + p os.system("sync") + os.environ['PATH'] = p result.command = command result.status = cmd.status diff --git a/poky/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch b/poky/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch index 896a2145d..7214ead9a 100644 --- a/poky/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch +++ b/poky/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch @@ -30,7 +30,7 @@ Signed-off-by: Peter Jones Reviewed-by: Daniel Kiper Upstream-Status: Backport -CVE: CVE-2020-14309, CVE-2020-14310, CVE-2020-14311 +CVE: CVE-2020-14309 CVE-2020-14310 CVE-2020-14311 Reference to upstream patch: https://git.savannah.gnu.org/cgit/grub.git/commit/?id=3f05d693d1274965ffbe4ba99080dc2c570944c6 diff --git a/poky/meta/recipes-bsp/grub/files/determinism.patch b/poky/meta/recipes-bsp/grub/files/determinism.patch new file mode 100644 index 000000000..3c1f562c7 --- /dev/null +++ b/poky/meta/recipes-bsp/grub/files/determinism.patch @@ -0,0 +1,56 @@ +The output in moddep.lst generated from syminfo.lst using genmoddep.awk is +not deterministic since the order of the dependencies on each line can vary +depending on how awk sorts the values in the array. + +Be deterministic in the output by sorting the dependencies on each line. + +Also, the output of the SOURCES lines in grub-core/Makefile.core.am, generated +from grub-core/Makefile.core.def with gentpl.py is not deterministic due to +missing sorting of the list used to generate it. Add such a sort. + +Also ensure the generated unidata.c file is deterministic by sorting the +keys of the dict. + +Upstream-Status: Pending +Richard Purdie + +Index: grub-2.04/grub-core/genmoddep.awk +=================================================================== +--- grub-2.04.orig/grub-core/genmoddep.awk ++++ grub-2.04/grub-core/genmoddep.awk +@@ -59,7 +59,9 @@ END { + } + modlist = "" + depcount[mod] = 0 +- for (depmod in uniqmods) { ++ n = asorti(uniqmods, w) ++ for (i = 1; i <= n; i++) { ++ depmod = w[i] + modlist = modlist " " depmod; + inverse_dependencies[depmod] = inverse_dependencies[depmod] " " mod + depcount[mod]++ +Index: grub-2.04/gentpl.py +=================================================================== +--- grub-2.04.orig/gentpl.py ++++ grub-2.04/gentpl.py +@@ -568,6 +568,7 @@ def foreach_platform_value(defn, platfor + for group in RMAP[platform]: + for value in defn.find_all(group + suffix): + r.append(closure(value)) ++ r.sort() + return ''.join(r) + + def platform_conditional(platform, closure): +Index: grub-2.04/util/import_unicode.py +=================================================================== +--- grub-2.04.orig/util/import_unicode.py ++++ grub-2.04/util/import_unicode.py +@@ -174,7 +174,7 @@ infile.close () + + outfile.write ("struct grub_unicode_arabic_shape grub_unicode_arabic_shapes[] = {\n ") + +-for x in arabicsubst: ++for x in sorted(arabicsubst): + try: + if arabicsubst[x]['join'] == "DUAL": + outfile.write ("{0x%x, 0x%x, 0x%x, 0x%x, 0x%x},\n " % (arabicsubst[x][0], arabicsubst[x][1], arabicsubst[x][2], arabicsubst[x][3], arabicsubst[x][4])) diff --git a/poky/meta/recipes-bsp/grub/grub2.inc b/poky/meta/recipes-bsp/grub/grub2.inc index d02010360..49c869b5d 100644 --- a/poky/meta/recipes-bsp/grub/grub2.inc +++ b/poky/meta/recipes-bsp/grub/grub2.inc @@ -27,6 +27,7 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ file://script-Remove-unused-fields-from-grub_script_functio.patch \ file://CVE-2020-15706-script-Avoid-a-use-after-free-when-redefining-a-func.patch \ file://CVE-2020-15707-linux-Fix-integer-overflows-in-initrd-size-handling.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc b/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc index 8ae290acc..4ed936a70 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc @@ -23,6 +23,21 @@ SED_CONFIG_EFI_armeb = '' SED_CONFIG_EFI_aarch64 = '' do_compile () { + # Yes, this is crazy. If you build on a system with git < 2.14 from scratch, the tree will + # be marked as "dirty" and the version will include "-dirty", leading to a reproducibility problem. + # The issue is the inode count for Licnses/README changing due to do_populate_lic hardlinking a + # copy of the file. We avoid this by ensuring the index is updated with a "git diff" before the + # u-boot machinery tries to determine the version. + # + # build$ ../git/scripts/setlocalversion ../git + # "" + # build$ ln ../git/ + # build$ ln ../git/README ../foo + # build$ ../git/scripts/setlocalversion ../git + # ""-dirty + # (i.e. creating a hardlink dirties the index) + cd ${S}; git diff; cd ${B} + oe_runmake -C ${S} sandbox_defconfig O=${B} # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.10/0001-avoid-start-failure-with-bind-user.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.10/0001-avoid-start-failure-with-bind-user.patch new file mode 100644 index 000000000..8db96ec04 --- /dev/null +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/0001-avoid-start-failure-with-bind-user.patch @@ -0,0 +1,27 @@ +From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Mon, 15 Oct 2018 16:55:09 +0800 +Subject: [PATCH] avoid start failure with bind user + +Upstream-Status: Pending + +Signed-off-by: Chen Qi +--- + init.d | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/init.d b/init.d +index b2eec60..6e03936 100644 +--- a/init.d ++++ b/init.d +@@ -57,6 +57,7 @@ case "$1" in + modprobe capability >/dev/null 2>&1 || true + if [ ! -f /etc/bind/rndc.key ]; then + /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom ++ chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true + chmod 0640 /etc/bind/rndc.key + fi + if [ -f /var/run/named/named.pid ]; then +-- +2.7.4 + diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch new file mode 100644 index 000000000..5bcc16c9b --- /dev/null +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch @@ -0,0 +1,35 @@ +From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 27 Aug 2018 21:24:20 +0800 +Subject: [PATCH] `named/lwresd -V' and start log hide build options + +The build options expose build path directories, so hide them. +[snip] +$ named -V +|built by make with *** (options are hidden) +[snip] + +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(-) + +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/poky/meta/recipes-connectivity/bind/bind-9.16.10/bind-ensure-searching-for-json-headers-searches-sysr.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.10/bind-ensure-searching-for-json-headers-searches-sysr.patch new file mode 100644 index 000000000..f9cdc7ca4 --- /dev/null +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/bind-ensure-searching-for-json-headers-searches-sysr.patch @@ -0,0 +1,47 @@ +From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker +Date: Tue, 9 Jun 2015 11:22:00 -0400 +Subject: [PATCH] bind: ensure searching for json headers searches sysroot + +Bind can fail configure by detecting headers w/o libs[1], or +it can fail the host contamination check as per below: + +ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. +Rerun configure task after fixing this. The path was 'build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/build' +ERROR: Function failed: do_qa_configure +ERROR: Logfile of failure stored in: build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/temp/log.do_configure.5242 +ERROR: Task 5 (meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure) failed with exit code '1' +NOTE: Tasks Summary: Attempted 773 tasks of which 768 didn't need to be rerun and 1 failed. +No currently running tasks (773 of 781) + +Summary: 1 task failed: + /meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure + +One way to fix it would be to unconditionally disable json in bind +configure[2] but here we fix it by using the path to where we would +put the header if we had json in the sysroot, in case someone wants +to make use of the combination some day. + +[1] https://trac.macports.org/ticket/45305 +[2] https://trac.macports.org/changeset/126406 + +Upstream-Status: Inappropriate [OE Specific] +Signed-off-by: Paul Gortmaker + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: bind-9.16.4/configure.ac +=================================================================== +--- bind-9.16.4.orig/configure.ac ++++ bind-9.16.4/configure.ac +@@ -1232,7 +1232,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/lmdb.h" + then diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.10/bind9 b/poky/meta/recipes-connectivity/bind/bind-9.16.10/bind9 new file mode 100644 index 000000000..968679ff7 --- /dev/null +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/bind9 @@ -0,0 +1,2 @@ +# startup options for the server +OPTIONS="-u bind" diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.10/conf.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.10/conf.patch new file mode 100644 index 000000000..aad345f9f --- /dev/null +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/conf.patch @@ -0,0 +1,330 @@ +Upstream-Status: Inappropriate [configuration] + +the patch is imported from openembedded project + +11/30/2010 - Qing He + +diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0 +--- bind-9.3.1.orig/conf/db.0 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/db.0 2005-07-10 22:14:00.000000000 +0200 +@@ -0,0 +1,12 @@ ++; ++; BIND reverse data file for broadcast zone ++; ++$TTL 604800 ++@ IN SOA localhost. root.localhost. ( ++ 1 ; Serial ++ 604800 ; Refresh ++ 86400 ; Retry ++ 2419200 ; Expire ++ 604800 ) ; Negative Cache TTL ++; ++@ IN NS localhost. +diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127 +--- bind-9.3.1.orig/conf/db.127 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/db.127 2005-07-10 22:14:00.000000000 +0200 +@@ -0,0 +1,13 @@ ++; ++; BIND reverse data file for local loopback interface ++; ++$TTL 604800 ++@ IN SOA localhost. root.localhost. ( ++ 1 ; Serial ++ 604800 ; Refresh ++ 86400 ; Retry ++ 2419200 ; Expire ++ 604800 ) ; Negative Cache TTL ++; ++@ IN NS localhost. ++1.0.0 IN PTR localhost. +diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty +--- bind-9.3.1.orig/conf/db.empty 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/db.empty 2005-07-10 22:14:00.000000000 +0200 +@@ -0,0 +1,14 @@ ++; BIND reverse data file for empty rfc1918 zone ++; ++; DO NOT EDIT THIS FILE - it is used for multiple zones. ++; Instead, copy it, edit named.conf, and use that copy. ++; ++$TTL 86400 ++@ IN SOA localhost. root.localhost. ( ++ 1 ; Serial ++ 604800 ; Refresh ++ 86400 ; Retry ++ 2419200 ; Expire ++ 86400 ) ; Negative Cache TTL ++; ++@ IN NS localhost. +diff -urN bind-9.3.1.orig/conf/db.255 bind-9.3.1/conf/db.255 +--- bind-9.3.1.orig/conf/db.255 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/db.255 2005-07-10 22:14:00.000000000 +0200 +@@ -0,0 +1,12 @@ ++; ++; BIND reserve data file for broadcast zone ++; ++$TTL 604800 ++@ IN SOA localhost. root.localhost. ( ++ 1 ; Serial ++ 604800 ; Refresh ++ 86400 ; Retry ++ 2419200 ; Expire ++ 604800 ) ; Negative Cache TTL ++; ++@ IN NS localhost. +diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local +--- bind-9.3.1.orig/conf/db.local 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/db.local 2005-07-10 22:14:00.000000000 +0200 +@@ -0,0 +1,13 @@ ++; ++; BIND data file for local loopback interface ++; ++$TTL 604800 ++@ IN SOA localhost. root.localhost. ( ++ 1 ; Serial ++ 604800 ; Refresh ++ 86400 ; Retry ++ 2419200 ; Expire ++ 604800 ) ; Negative Cache TTL ++; ++@ IN NS localhost. ++@ IN A 127.0.0.1 +diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root +--- bind-9.3.1.orig/conf/db.root 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/db.root 2005-07-10 22:14:00.000000000 +0200 +@@ -0,0 +1,45 @@ ++ ++; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net. ++;; global options: printcmd ++;; Got answer: ++;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944 ++;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13 ++ ++;; QUESTION SECTION: ++;. IN NS ++ ++;; ANSWER SECTION: ++. 518400 IN NS A.ROOT-SERVERS.NET. ++. 518400 IN NS B.ROOT-SERVERS.NET. ++. 518400 IN NS C.ROOT-SERVERS.NET. ++. 518400 IN NS D.ROOT-SERVERS.NET. ++. 518400 IN NS E.ROOT-SERVERS.NET. ++. 518400 IN NS F.ROOT-SERVERS.NET. ++. 518400 IN NS G.ROOT-SERVERS.NET. ++. 518400 IN NS H.ROOT-SERVERS.NET. ++. 518400 IN NS I.ROOT-SERVERS.NET. ++. 518400 IN NS J.ROOT-SERVERS.NET. ++. 518400 IN NS K.ROOT-SERVERS.NET. ++. 518400 IN NS L.ROOT-SERVERS.NET. ++. 518400 IN NS M.ROOT-SERVERS.NET. ++ ++;; ADDITIONAL SECTION: ++A.ROOT-SERVERS.NET. 3600000 IN A 198.41.0.4 ++B.ROOT-SERVERS.NET. 3600000 IN A 192.228.79.201 ++C.ROOT-SERVERS.NET. 3600000 IN A 192.33.4.12 ++D.ROOT-SERVERS.NET. 3600000 IN A 128.8.10.90 ++E.ROOT-SERVERS.NET. 3600000 IN A 192.203.230.10 ++F.ROOT-SERVERS.NET. 3600000 IN A 192.5.5.241 ++G.ROOT-SERVERS.NET. 3600000 IN A 192.112.36.4 ++H.ROOT-SERVERS.NET. 3600000 IN A 128.63.2.53 ++I.ROOT-SERVERS.NET. 3600000 IN A 192.36.148.17 ++J.ROOT-SERVERS.NET. 3600000 IN A 192.58.128.30 ++K.ROOT-SERVERS.NET. 3600000 IN A 193.0.14.129 ++L.ROOT-SERVERS.NET. 3600000 IN A 198.32.64.12 ++M.ROOT-SERVERS.NET. 3600000 IN A 202.12.27.33 ++ ++;; Query time: 81 msec ++;; SERVER: 198.41.0.4#53(a.root-servers.net.) ++;; WHEN: Sun Feb 1 11:27:14 2004 ++;; MSG SIZE rcvd: 436 ++ +diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf +--- bind-9.3.1.orig/conf/named.conf 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/named.conf 2005-07-10 22:33:46.000000000 +0200 +@@ -0,0 +1,49 @@ ++// This is the primary configuration file for the BIND DNS server named. ++// ++// If you are just adding zones, please do that in /etc/bind/named.conf.local ++ ++include "/etc/bind/named.conf.options"; ++ ++// prime the server with knowledge of the root servers ++zone "." { ++ type hint; ++ file "/etc/bind/db.root"; ++}; ++ ++// be authoritative for the localhost forward and reverse zones, and for ++// broadcast zones as per RFC 1912 ++ ++zone "localhost" { ++ type master; ++ file "/etc/bind/db.local"; ++}; ++ ++zone "127.in-addr.arpa" { ++ type master; ++ file "/etc/bind/db.127"; ++}; ++ ++zone "0.in-addr.arpa" { ++ type master; ++ file "/etc/bind/db.0"; ++}; ++ ++zone "255.in-addr.arpa" { ++ type master; ++ file "/etc/bind/db.255"; ++}; ++ ++// zone "com" { type delegation-only; }; ++// zone "net" { type delegation-only; }; ++ ++// From the release notes: ++// Because many of our users are uncomfortable receiving undelegated answers ++// from root or top level domains, other than a few for whom that behaviour ++// has been trusted and expected for quite some length of time, we have now ++// introduced the "root-delegations-only" feature which applies delegation-only ++// logic to all top level domains, and to the root domain. An exception list ++// should be specified, including "MUSEUM" and "DE", and any other top level ++// domains from whom undelegated responses are expected and trusted. ++// root-delegation-only exclude { "DE"; "MUSEUM"; }; ++ ++include "/etc/bind/named.conf.local"; +diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local +--- bind-9.3.1.orig/conf/named.conf.local 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/named.conf.local 2005-07-10 22:14:06.000000000 +0200 +@@ -0,0 +1,8 @@ ++// ++// Do any local configuration here ++// ++ ++// Consider adding the 1918 zones here, if they are not used in your ++// organization ++//include "/etc/bind/zones.rfc1918"; ++ +diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options +--- bind-9.3.1.orig/conf/named.conf.options 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/named.conf.options 2005-07-10 22:14:06.000000000 +0200 +@@ -0,0 +1,24 @@ ++options { ++ directory "/var/cache/bind"; ++ ++ // If there is a firewall between you and nameservers you want ++ // to talk to, you might need to uncomment the query-source ++ // directive below. Previous versions of BIND always asked ++ // questions using port 53, but BIND 8.1 and later use an unprivileged ++ // port by default. ++ ++ // query-source address * port 53; ++ ++ // If your ISP provided one or more IP addresses for stable ++ // nameservers, you probably want to use them as forwarders. ++ // Uncomment the following block, and insert the addresses replacing ++ // the all-0's placeholder. ++ ++ // forwarders { ++ // 0.0.0.0; ++ // }; ++ ++ auth-nxdomain no; # conform to RFC1035 ++ ++}; ++ +diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918 +--- bind-9.3.1.orig/conf/zones.rfc1918 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/zones.rfc1918 2005-07-10 22:14:10.000000000 +0200 +@@ -0,0 +1,20 @@ ++zone "10.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++ ++zone "16.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "17.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "18.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "19.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "20.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "21.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "22.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "23.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "24.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "25.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "26.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "27.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "28.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "29.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "30.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "31.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++ ++zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; +diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d +--- bind-9.3.1.orig/init.d 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/init.d 2005-07-10 23:09:58.000000000 +0200 +@@ -0,0 +1,70 @@ ++#!/bin/sh ++ ++PATH=/sbin:/bin:/usr/sbin:/usr/bin ++ ++# for a chrooted server: "-u bind -t /var/lib/named" ++# Don't modify this line, change or create /etc/default/bind9. ++OPTIONS="" ++ ++test -f /etc/default/bind9 && . /etc/default/bind9 ++ ++test -x /usr/sbin/rndc || exit 0 ++ ++case "$1" in ++ start) ++ echo -n "Starting domain name service: named" ++ ++ modprobe capability >/dev/null 2>&1 || true ++ if [ ! -f /etc/bind/rndc.key ]; then ++ /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom ++ chmod 0640 /etc/bind/rndc.key ++ fi ++ if [ -f /var/run/named/named.pid ]; then ++ ps `cat /var/run/named/named.pid` > /dev/null && exit 1 ++ fi ++ ++ # dirs under /var/run can go away on reboots. ++ mkdir -p /var/run/named ++ mkdir -p /var/cache/bind ++ chmod 775 /var/run/named ++ chown root:bind /var/run/named >/dev/null 2>&1 || true ++ ++ if [ ! -x /usr/sbin/named ]; then ++ echo "named binary missing - not starting" ++ exit 1 ++ fi ++ if start-stop-daemon --start --quiet --exec /usr/sbin/named \ ++ --pidfile /var/run/named/named.pid -- $OPTIONS; then ++ if [ -x /sbin/resolvconf ] ; then ++ echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo ++ fi ++ fi ++ echo "." ++ ;; ++ ++ stop) ++ echo -n "Stopping domain name service: named" ++ if [ -x /sbin/resolvconf ]; then ++ /sbin/resolvconf -d lo ++ fi ++ /usr/sbin/rndc stop >/dev/null 2>&1 ++ echo "." ++ ;; ++ ++ reload) ++ /usr/sbin/rndc reload ++ ;; ++ ++ restart|force-reload) ++ $0 stop ++ sleep 2 ++ $0 start ++ ;; ++ ++ *) ++ echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2 ++ exit 1 ++ ;; ++esac ++ ++exit 0 diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.10/generate-rndc-key.sh b/poky/meta/recipes-connectivity/bind/bind-9.16.10/generate-rndc-key.sh new file mode 100644 index 000000000..633e29c0e --- /dev/null +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/generate-rndc-key.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ ! -s /etc/bind/rndc.key ]; then + echo -n "Generating /etc/bind/rndc.key:" + /usr/sbin/rndc-confgen -a -b 512 + chown root:bind /etc/bind/rndc.key + chmod 0640 /etc/bind/rndc.key +fi diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.10/init.d-add-support-for-read-only-rootfs.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.10/init.d-add-support-for-read-only-rootfs.patch new file mode 100644 index 000000000..11db95ede --- /dev/null +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/init.d-add-support-for-read-only-rootfs.patch @@ -0,0 +1,65 @@ +Subject: init.d: add support for read-only rootfs + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Chen Qi +--- + init.d | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +diff --git a/init.d b/init.d +index 0111ed4..24677c8 100644 +--- a/init.d ++++ b/init.d +@@ -6,8 +6,48 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin + # Don't modify this line, change or create /etc/default/bind9. + OPTIONS="" + ++test -f /etc/default/rcS && . /etc/default/rcS + test -f /etc/default/bind9 && . /etc/default/bind9 + ++# This function is here because it's possible that /var and / are on different partitions. ++is_on_read_only_partition () { ++ DIRECTORY=$1 ++ dir=`readlink -f $DIRECTORY` ++ while true; do ++ if [ ! -d "$dir" ]; then ++ echo "ERROR: $dir is not a directory" ++ exit 1 ++ else ++ for flag in `awk -v dir=$dir '{ if ($2 == dir) { print "FOUND"; split($4,FLAGS,",") } }; \ ++ END { for (f in FLAGS) print FLAGS[f] }' < /proc/mounts`; do ++ [ "$flag" = "FOUND" ] && partition="read-write" ++ [ "$flag" = "ro" ] && { partition="read-only"; break; } ++ done ++ if [ "$dir" = "/" -o -n "$partition" ]; then ++ break ++ else ++ dir=`dirname $dir` ++ fi ++ fi ++ done ++ [ "$partition" = "read-only" ] && echo "yes" || echo "no" ++} ++ ++bind_mount () { ++ olddir=$1 ++ newdir=$2 ++ mkdir -p $olddir ++ cp -a $newdir/* $olddir ++ mount --bind $olddir $newdir ++} ++ ++# Deal with read-only rootfs ++if [ "$ROOTFS_READ_ONLY" = "yes" ]; then ++ [ "$VERBOSE" != "no" ] && echo "WARN: start bind service in read-only rootfs" ++ [ `is_on_read_only_partition /etc/bind` = "yes" ] && bind_mount /var/volatile/bind/etc /etc/bind ++ [ `is_on_read_only_partition /var/named` = "yes" ] && bind_mount /var/volatile/bind/named /var/named ++fi ++ + test -x /usr/sbin/rndc || exit 0 + + case "$1" in +-- +1.7.9.5 + diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.10/make-etc-initd-bind-stop-work.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.10/make-etc-initd-bind-stop-work.patch new file mode 100644 index 000000000..146f3e35d --- /dev/null +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/make-etc-initd-bind-stop-work.patch @@ -0,0 +1,42 @@ +bind: make "/etc/init.d/bind stop" work + +Upstream-Status: Inappropriate [configuration] + +Add some configurations, make rndc command be able to controls +the named daemon. + +Signed-off-by: Roy Li +--- + conf/named.conf | 5 +++++ + conf/rndc.conf | 5 +++++ + 2 files changed, 10 insertions(+), 0 deletions(-) + create mode 100644 conf/rndc.conf + +diff --git a/conf/named.conf b/conf/named.conf +index 95829cf..c8899e7 100644 +--- a/conf/named.conf ++++ b/conf/named.conf +@@ -47,3 +47,8 @@ zone "255.in-addr.arpa" { + // root-delegation-only exclude { "DE"; "MUSEUM"; }; + + include "/etc/bind/named.conf.local"; ++include "/etc/bind/rndc.key" ; ++controls { ++ inet 127.0.0.1 allow { localhost; } ++ keys { rndc-key; }; ++}; +diff --git a/conf/rndc.conf b/conf/rndc.conf +new file mode 100644 +index 0000000..a0b481d +--- /dev/null ++++ b/conf/rndc.conf +@@ -0,0 +1,5 @@ ++include "/etc/bind/rndc.key"; ++options { ++ default-server localhost; ++ default-key rndc-key; ++}; + +-- +1.7.5.4 + diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.10/named.service b/poky/meta/recipes-connectivity/bind/bind-9.16.10/named.service new file mode 100644 index 000000000..cda56ef01 --- /dev/null +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/named.service @@ -0,0 +1,22 @@ +[Unit] +Description=Berkeley Internet Name Domain (DNS) +Wants=nss-lookup.target +Before=nss-lookup.target +After=network.target + +[Service] +Type=forking +EnvironmentFile=-/etc/default/bind9 +PIDFile=/run/named/named.pid + +ExecStartPre=@SBINDIR@/generate-rndc-key.sh +ExecStart=@SBINDIR@/named $OPTIONS + +ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID' + +ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID' + +PrivateTmp=true + +[Install] +WantedBy=multi-user.target diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/0001-avoid-start-failure-with-bind-user.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.9/0001-avoid-start-failure-with-bind-user.patch deleted file mode 100644 index 8db96ec04..000000000 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/0001-avoid-start-failure-with-bind-user.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 15 Oct 2018 16:55:09 +0800 -Subject: [PATCH] avoid start failure with bind user - -Upstream-Status: Pending - -Signed-off-by: Chen Qi ---- - init.d | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/init.d b/init.d -index b2eec60..6e03936 100644 ---- a/init.d -+++ b/init.d -@@ -57,6 +57,7 @@ case "$1" in - modprobe capability >/dev/null 2>&1 || true - if [ ! -f /etc/bind/rndc.key ]; then - /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom -+ chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true - chmod 0640 /etc/bind/rndc.key - fi - if [ -f /var/run/named/named.pid ]; then --- -2.7.4 - diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.9/0001-named-lwresd-V-and-start-log-hide-build-options.patch deleted file mode 100644 index 5bcc16c9b..000000000 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/0001-named-lwresd-V-and-start-log-hide-build-options.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 27 Aug 2018 21:24:20 +0800 -Subject: [PATCH] `named/lwresd -V' and start log hide build options - -The build options expose build path directories, so hide them. -[snip] -$ named -V -|built by make with *** (options are hidden) -[snip] - -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(-) - -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/poky/meta/recipes-connectivity/bind/bind-9.16.9/bind-ensure-searching-for-json-headers-searches-sysr.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.9/bind-ensure-searching-for-json-headers-searches-sysr.patch deleted file mode 100644 index f9cdc7ca4..000000000 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/bind-ensure-searching-for-json-headers-searches-sysr.patch +++ /dev/null @@ -1,47 +0,0 @@ -From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001 -From: Paul Gortmaker -Date: Tue, 9 Jun 2015 11:22:00 -0400 -Subject: [PATCH] bind: ensure searching for json headers searches sysroot - -Bind can fail configure by detecting headers w/o libs[1], or -it can fail the host contamination check as per below: - -ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. -Rerun configure task after fixing this. The path was 'build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/build' -ERROR: Function failed: do_qa_configure -ERROR: Logfile of failure stored in: build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/temp/log.do_configure.5242 -ERROR: Task 5 (meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure) failed with exit code '1' -NOTE: Tasks Summary: Attempted 773 tasks of which 768 didn't need to be rerun and 1 failed. -No currently running tasks (773 of 781) - -Summary: 1 task failed: - /meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure - -One way to fix it would be to unconditionally disable json in bind -configure[2] but here we fix it by using the path to where we would -put the header if we had json in the sysroot, in case someone wants -to make use of the combination some day. - -[1] https://trac.macports.org/ticket/45305 -[2] https://trac.macports.org/changeset/126406 - -Upstream-Status: Inappropriate [OE Specific] -Signed-off-by: Paul Gortmaker - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: bind-9.16.4/configure.ac -=================================================================== ---- bind-9.16.4.orig/configure.ac -+++ bind-9.16.4/configure.ac -@@ -1232,7 +1232,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/lmdb.h" - then diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/bind9 b/poky/meta/recipes-connectivity/bind/bind-9.16.9/bind9 deleted file mode 100644 index 968679ff7..000000000 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/bind9 +++ /dev/null @@ -1,2 +0,0 @@ -# startup options for the server -OPTIONS="-u bind" diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/conf.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.9/conf.patch deleted file mode 100644 index aad345f9f..000000000 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/conf.patch +++ /dev/null @@ -1,330 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -the patch is imported from openembedded project - -11/30/2010 - Qing He - -diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0 ---- bind-9.3.1.orig/conf/db.0 1970-01-01 01:00:00.000000000 +0100 -+++ bind-9.3.1/conf/db.0 2005-07-10 22:14:00.000000000 +0200 -@@ -0,0 +1,12 @@ -+; -+; BIND reverse data file for broadcast zone -+; -+$TTL 604800 -+@ IN SOA localhost. root.localhost. ( -+ 1 ; Serial -+ 604800 ; Refresh -+ 86400 ; Retry -+ 2419200 ; Expire -+ 604800 ) ; Negative Cache TTL -+; -+@ IN NS localhost. -diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127 ---- bind-9.3.1.orig/conf/db.127 1970-01-01 01:00:00.000000000 +0100 -+++ bind-9.3.1/conf/db.127 2005-07-10 22:14:00.000000000 +0200 -@@ -0,0 +1,13 @@ -+; -+; BIND reverse data file for local loopback interface -+; -+$TTL 604800 -+@ IN SOA localhost. root.localhost. ( -+ 1 ; Serial -+ 604800 ; Refresh -+ 86400 ; Retry -+ 2419200 ; Expire -+ 604800 ) ; Negative Cache TTL -+; -+@ IN NS localhost. -+1.0.0 IN PTR localhost. -diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty ---- bind-9.3.1.orig/conf/db.empty 1970-01-01 01:00:00.000000000 +0100 -+++ bind-9.3.1/conf/db.empty 2005-07-10 22:14:00.000000000 +0200 -@@ -0,0 +1,14 @@ -+; BIND reverse data file for empty rfc1918 zone -+; -+; DO NOT EDIT THIS FILE - it is used for multiple zones. -+; Instead, copy it, edit named.conf, and use that copy. -+; -+$TTL 86400 -+@ IN SOA localhost. root.localhost. ( -+ 1 ; Serial -+ 604800 ; Refresh -+ 86400 ; Retry -+ 2419200 ; Expire -+ 86400 ) ; Negative Cache TTL -+; -+@ IN NS localhost. -diff -urN bind-9.3.1.orig/conf/db.255 bind-9.3.1/conf/db.255 ---- bind-9.3.1.orig/conf/db.255 1970-01-01 01:00:00.000000000 +0100 -+++ bind-9.3.1/conf/db.255 2005-07-10 22:14:00.000000000 +0200 -@@ -0,0 +1,12 @@ -+; -+; BIND reserve data file for broadcast zone -+; -+$TTL 604800 -+@ IN SOA localhost. root.localhost. ( -+ 1 ; Serial -+ 604800 ; Refresh -+ 86400 ; Retry -+ 2419200 ; Expire -+ 604800 ) ; Negative Cache TTL -+; -+@ IN NS localhost. -diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local ---- bind-9.3.1.orig/conf/db.local 1970-01-01 01:00:00.000000000 +0100 -+++ bind-9.3.1/conf/db.local 2005-07-10 22:14:00.000000000 +0200 -@@ -0,0 +1,13 @@ -+; -+; BIND data file for local loopback interface -+; -+$TTL 604800 -+@ IN SOA localhost. root.localhost. ( -+ 1 ; Serial -+ 604800 ; Refresh -+ 86400 ; Retry -+ 2419200 ; Expire -+ 604800 ) ; Negative Cache TTL -+; -+@ IN NS localhost. -+@ IN A 127.0.0.1 -diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root ---- bind-9.3.1.orig/conf/db.root 1970-01-01 01:00:00.000000000 +0100 -+++ bind-9.3.1/conf/db.root 2005-07-10 22:14:00.000000000 +0200 -@@ -0,0 +1,45 @@ -+ -+; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net. -+;; global options: printcmd -+;; Got answer: -+;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944 -+;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13 -+ -+;; QUESTION SECTION: -+;. IN NS -+ -+;; ANSWER SECTION: -+. 518400 IN NS A.ROOT-SERVERS.NET. -+. 518400 IN NS B.ROOT-SERVERS.NET. -+. 518400 IN NS C.ROOT-SERVERS.NET. -+. 518400 IN NS D.ROOT-SERVERS.NET. -+. 518400 IN NS E.ROOT-SERVERS.NET. -+. 518400 IN NS F.ROOT-SERVERS.NET. -+. 518400 IN NS G.ROOT-SERVERS.NET. -+. 518400 IN NS H.ROOT-SERVERS.NET. -+. 518400 IN NS I.ROOT-SERVERS.NET. -+. 518400 IN NS J.ROOT-SERVERS.NET. -+. 518400 IN NS K.ROOT-SERVERS.NET. -+. 518400 IN NS L.ROOT-SERVERS.NET. -+. 518400 IN NS M.ROOT-SERVERS.NET. -+ -+;; ADDITIONAL SECTION: -+A.ROOT-SERVERS.NET. 3600000 IN A 198.41.0.4 -+B.ROOT-SERVERS.NET. 3600000 IN A 192.228.79.201 -+C.ROOT-SERVERS.NET. 3600000 IN A 192.33.4.12 -+D.ROOT-SERVERS.NET. 3600000 IN A 128.8.10.90 -+E.ROOT-SERVERS.NET. 3600000 IN A 192.203.230.10 -+F.ROOT-SERVERS.NET. 3600000 IN A 192.5.5.241 -+G.ROOT-SERVERS.NET. 3600000 IN A 192.112.36.4 -+H.ROOT-SERVERS.NET. 3600000 IN A 128.63.2.53 -+I.ROOT-SERVERS.NET. 3600000 IN A 192.36.148.17 -+J.ROOT-SERVERS.NET. 3600000 IN A 192.58.128.30 -+K.ROOT-SERVERS.NET. 3600000 IN A 193.0.14.129 -+L.ROOT-SERVERS.NET. 3600000 IN A 198.32.64.12 -+M.ROOT-SERVERS.NET. 3600000 IN A 202.12.27.33 -+ -+;; Query time: 81 msec -+;; SERVER: 198.41.0.4#53(a.root-servers.net.) -+;; WHEN: Sun Feb 1 11:27:14 2004 -+;; MSG SIZE rcvd: 436 -+ -diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf ---- bind-9.3.1.orig/conf/named.conf 1970-01-01 01:00:00.000000000 +0100 -+++ bind-9.3.1/conf/named.conf 2005-07-10 22:33:46.000000000 +0200 -@@ -0,0 +1,49 @@ -+// This is the primary configuration file for the BIND DNS server named. -+// -+// If you are just adding zones, please do that in /etc/bind/named.conf.local -+ -+include "/etc/bind/named.conf.options"; -+ -+// prime the server with knowledge of the root servers -+zone "." { -+ type hint; -+ file "/etc/bind/db.root"; -+}; -+ -+// be authoritative for the localhost forward and reverse zones, and for -+// broadcast zones as per RFC 1912 -+ -+zone "localhost" { -+ type master; -+ file "/etc/bind/db.local"; -+}; -+ -+zone "127.in-addr.arpa" { -+ type master; -+ file "/etc/bind/db.127"; -+}; -+ -+zone "0.in-addr.arpa" { -+ type master; -+ file "/etc/bind/db.0"; -+}; -+ -+zone "255.in-addr.arpa" { -+ type master; -+ file "/etc/bind/db.255"; -+}; -+ -+// zone "com" { type delegation-only; }; -+// zone "net" { type delegation-only; }; -+ -+// From the release notes: -+// Because many of our users are uncomfortable receiving undelegated answers -+// from root or top level domains, other than a few for whom that behaviour -+// has been trusted and expected for quite some length of time, we have now -+// introduced the "root-delegations-only" feature which applies delegation-only -+// logic to all top level domains, and to the root domain. An exception list -+// should be specified, including "MUSEUM" and "DE", and any other top level -+// domains from whom undelegated responses are expected and trusted. -+// root-delegation-only exclude { "DE"; "MUSEUM"; }; -+ -+include "/etc/bind/named.conf.local"; -diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local ---- bind-9.3.1.orig/conf/named.conf.local 1970-01-01 01:00:00.000000000 +0100 -+++ bind-9.3.1/conf/named.conf.local 2005-07-10 22:14:06.000000000 +0200 -@@ -0,0 +1,8 @@ -+// -+// Do any local configuration here -+// -+ -+// Consider adding the 1918 zones here, if they are not used in your -+// organization -+//include "/etc/bind/zones.rfc1918"; -+ -diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options ---- bind-9.3.1.orig/conf/named.conf.options 1970-01-01 01:00:00.000000000 +0100 -+++ bind-9.3.1/conf/named.conf.options 2005-07-10 22:14:06.000000000 +0200 -@@ -0,0 +1,24 @@ -+options { -+ directory "/var/cache/bind"; -+ -+ // If there is a firewall between you and nameservers you want -+ // to talk to, you might need to uncomment the query-source -+ // directive below. Previous versions of BIND always asked -+ // questions using port 53, but BIND 8.1 and later use an unprivileged -+ // port by default. -+ -+ // query-source address * port 53; -+ -+ // If your ISP provided one or more IP addresses for stable -+ // nameservers, you probably want to use them as forwarders. -+ // Uncomment the following block, and insert the addresses replacing -+ // the all-0's placeholder. -+ -+ // forwarders { -+ // 0.0.0.0; -+ // }; -+ -+ auth-nxdomain no; # conform to RFC1035 -+ -+}; -+ -diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918 ---- bind-9.3.1.orig/conf/zones.rfc1918 1970-01-01 01:00:00.000000000 +0100 -+++ bind-9.3.1/conf/zones.rfc1918 2005-07-10 22:14:10.000000000 +0200 -@@ -0,0 +1,20 @@ -+zone "10.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+ -+zone "16.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "17.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "18.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "19.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "20.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "21.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "22.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "23.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "24.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "25.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "26.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "27.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "28.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "29.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "30.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+zone "31.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -+ -+zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; -diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d ---- bind-9.3.1.orig/init.d 1970-01-01 01:00:00.000000000 +0100 -+++ bind-9.3.1/init.d 2005-07-10 23:09:58.000000000 +0200 -@@ -0,0 +1,70 @@ -+#!/bin/sh -+ -+PATH=/sbin:/bin:/usr/sbin:/usr/bin -+ -+# for a chrooted server: "-u bind -t /var/lib/named" -+# Don't modify this line, change or create /etc/default/bind9. -+OPTIONS="" -+ -+test -f /etc/default/bind9 && . /etc/default/bind9 -+ -+test -x /usr/sbin/rndc || exit 0 -+ -+case "$1" in -+ start) -+ echo -n "Starting domain name service: named" -+ -+ modprobe capability >/dev/null 2>&1 || true -+ if [ ! -f /etc/bind/rndc.key ]; then -+ /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom -+ chmod 0640 /etc/bind/rndc.key -+ fi -+ if [ -f /var/run/named/named.pid ]; then -+ ps `cat /var/run/named/named.pid` > /dev/null && exit 1 -+ fi -+ -+ # dirs under /var/run can go away on reboots. -+ mkdir -p /var/run/named -+ mkdir -p /var/cache/bind -+ chmod 775 /var/run/named -+ chown root:bind /var/run/named >/dev/null 2>&1 || true -+ -+ if [ ! -x /usr/sbin/named ]; then -+ echo "named binary missing - not starting" -+ exit 1 -+ fi -+ if start-stop-daemon --start --quiet --exec /usr/sbin/named \ -+ --pidfile /var/run/named/named.pid -- $OPTIONS; then -+ if [ -x /sbin/resolvconf ] ; then -+ echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo -+ fi -+ fi -+ echo "." -+ ;; -+ -+ stop) -+ echo -n "Stopping domain name service: named" -+ if [ -x /sbin/resolvconf ]; then -+ /sbin/resolvconf -d lo -+ fi -+ /usr/sbin/rndc stop >/dev/null 2>&1 -+ echo "." -+ ;; -+ -+ reload) -+ /usr/sbin/rndc reload -+ ;; -+ -+ restart|force-reload) -+ $0 stop -+ sleep 2 -+ $0 start -+ ;; -+ -+ *) -+ echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2 -+ exit 1 -+ ;; -+esac -+ -+exit 0 diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/generate-rndc-key.sh b/poky/meta/recipes-connectivity/bind/bind-9.16.9/generate-rndc-key.sh deleted file mode 100644 index 633e29c0e..000000000 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/generate-rndc-key.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ ! -s /etc/bind/rndc.key ]; then - echo -n "Generating /etc/bind/rndc.key:" - /usr/sbin/rndc-confgen -a -b 512 - chown root:bind /etc/bind/rndc.key - chmod 0640 /etc/bind/rndc.key -fi diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/init.d-add-support-for-read-only-rootfs.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.9/init.d-add-support-for-read-only-rootfs.patch deleted file mode 100644 index 11db95ede..000000000 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/init.d-add-support-for-read-only-rootfs.patch +++ /dev/null @@ -1,65 +0,0 @@ -Subject: init.d: add support for read-only rootfs - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Chen Qi ---- - init.d | 40 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 40 insertions(+) - -diff --git a/init.d b/init.d -index 0111ed4..24677c8 100644 ---- a/init.d -+++ b/init.d -@@ -6,8 +6,48 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin - # Don't modify this line, change or create /etc/default/bind9. - OPTIONS="" - -+test -f /etc/default/rcS && . /etc/default/rcS - test -f /etc/default/bind9 && . /etc/default/bind9 - -+# This function is here because it's possible that /var and / are on different partitions. -+is_on_read_only_partition () { -+ DIRECTORY=$1 -+ dir=`readlink -f $DIRECTORY` -+ while true; do -+ if [ ! -d "$dir" ]; then -+ echo "ERROR: $dir is not a directory" -+ exit 1 -+ else -+ for flag in `awk -v dir=$dir '{ if ($2 == dir) { print "FOUND"; split($4,FLAGS,",") } }; \ -+ END { for (f in FLAGS) print FLAGS[f] }' < /proc/mounts`; do -+ [ "$flag" = "FOUND" ] && partition="read-write" -+ [ "$flag" = "ro" ] && { partition="read-only"; break; } -+ done -+ if [ "$dir" = "/" -o -n "$partition" ]; then -+ break -+ else -+ dir=`dirname $dir` -+ fi -+ fi -+ done -+ [ "$partition" = "read-only" ] && echo "yes" || echo "no" -+} -+ -+bind_mount () { -+ olddir=$1 -+ newdir=$2 -+ mkdir -p $olddir -+ cp -a $newdir/* $olddir -+ mount --bind $olddir $newdir -+} -+ -+# Deal with read-only rootfs -+if [ "$ROOTFS_READ_ONLY" = "yes" ]; then -+ [ "$VERBOSE" != "no" ] && echo "WARN: start bind service in read-only rootfs" -+ [ `is_on_read_only_partition /etc/bind` = "yes" ] && bind_mount /var/volatile/bind/etc /etc/bind -+ [ `is_on_read_only_partition /var/named` = "yes" ] && bind_mount /var/volatile/bind/named /var/named -+fi -+ - test -x /usr/sbin/rndc || exit 0 - - case "$1" in --- -1.7.9.5 - diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/make-etc-initd-bind-stop-work.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.9/make-etc-initd-bind-stop-work.patch deleted file mode 100644 index 146f3e35d..000000000 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/make-etc-initd-bind-stop-work.patch +++ /dev/null @@ -1,42 +0,0 @@ -bind: make "/etc/init.d/bind stop" work - -Upstream-Status: Inappropriate [configuration] - -Add some configurations, make rndc command be able to controls -the named daemon. - -Signed-off-by: Roy Li ---- - conf/named.conf | 5 +++++ - conf/rndc.conf | 5 +++++ - 2 files changed, 10 insertions(+), 0 deletions(-) - create mode 100644 conf/rndc.conf - -diff --git a/conf/named.conf b/conf/named.conf -index 95829cf..c8899e7 100644 ---- a/conf/named.conf -+++ b/conf/named.conf -@@ -47,3 +47,8 @@ zone "255.in-addr.arpa" { - // root-delegation-only exclude { "DE"; "MUSEUM"; }; - - include "/etc/bind/named.conf.local"; -+include "/etc/bind/rndc.key" ; -+controls { -+ inet 127.0.0.1 allow { localhost; } -+ keys { rndc-key; }; -+}; -diff --git a/conf/rndc.conf b/conf/rndc.conf -new file mode 100644 -index 0000000..a0b481d ---- /dev/null -+++ b/conf/rndc.conf -@@ -0,0 +1,5 @@ -+include "/etc/bind/rndc.key"; -+options { -+ default-server localhost; -+ default-key rndc-key; -+}; - --- -1.7.5.4 - diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/named.service b/poky/meta/recipes-connectivity/bind/bind-9.16.9/named.service deleted file mode 100644 index cda56ef01..000000000 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/named.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=Berkeley Internet Name Domain (DNS) -Wants=nss-lookup.target -Before=nss-lookup.target -After=network.target - -[Service] -Type=forking -EnvironmentFile=-/etc/default/bind9 -PIDFile=/run/named/named.pid - -ExecStartPre=@SBINDIR@/generate-rndc-key.sh -ExecStart=@SBINDIR@/named $OPTIONS - -ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID' - -ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID' - -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/poky/meta/recipes-connectivity/bind/bind_9.16.10.bb b/poky/meta/recipes-connectivity/bind/bind_9.16.10.bb new file mode 100644 index 000000000..71194a61b --- /dev/null +++ b/poky/meta/recipes-connectivity/bind/bind_9.16.10.bb @@ -0,0 +1,123 @@ +SUMMARY = "ISC Internet Domain Name Server" +HOMEPAGE = "https://www.isc.org/bind/" +SECTION = "console/network" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4673dc07337cace3b93c65e9ffe57b60" + +DEPENDS = "openssl libcap zlib libuv" + +SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ + file://conf.patch \ + file://named.service \ + file://bind9 \ + file://generate-rndc-key.sh \ + 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-named-lwresd-V-and-start-log-hide-build-options.patch \ + file://0001-avoid-start-failure-with-bind-user.patch \ + " + +SRC_URI[sha256sum] = "bc47fc019c6205e6a6bfb839c544a1472321df0537ba905b846a4cbffe3362b3" + +UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" +# stay at 9.16 follow the ESV versions divisible by 4 +UPSTREAM_CHECK_REGEX = "(?P9.(16|20|24|28)(\.\d+)+(-P\d+)*)/" + +inherit autotools update-rc.d systemd useradd pkgconfig multilib_header update-alternatives + +# PACKAGECONFIGs readline and libedit should NOT be set at same time +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[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native," + +EXTRA_OECONF = " --with-libtool --disable-devpoll --disable-auto-validation --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)} + +# dhcp needs .la so keep them +REMOVE_LIBTOOL_LA = "0" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \ + --user-group bind" + +INITSCRIPT_NAME = "bind" +INITSCRIPT_PARAMS = "defaults" + +SYSTEMD_SERVICE_${PN} = "named.service" + +do_install_append() { + + rmdir "${D}${localstatedir}/run" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" + install -d -o bind "${D}${localstatedir}/cache/bind" + install -d "${D}${sysconfdir}/bind" + install -d "${D}${sysconfdir}/init.d" + install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/" + install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind" + if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then + sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \ + ${D}${sbindir}/dnssec-coverage \ + ${D}${sbindir}/dnssec-checkds \ + ${D}${sbindir}/dnssec-keymgr + fi + + # Install systemd related files + install -d ${D}${sbindir} + install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir} + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${systemd_unitdir}/system/named.service + + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + 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} = " \ + ${sysconfdir}/bind/named.conf \ + ${sysconfdir}/bind/named.conf.local \ + ${sysconfdir}/bind/named.conf.options \ + ${sysconfdir}/bind/db.0 \ + ${sysconfdir}/bind/db.127 \ + ${sysconfdir}/bind/db.empty \ + ${sysconfdir}/bind/db.local \ + ${sysconfdir}/bind/db.root \ + " + +ALTERNATIVE_${PN}-utils = "nslookup" +ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup" +ALTERNATIVE_PRIORITY = "100" + +PACKAGE_BEFORE_PN += "${PN}-utils" +FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate" +FILES_${PN}-dev += "${bindir}/isc-config.h" +FILES_${PN} += "${sbindir}/generate-rndc-key.sh" + +PACKAGE_BEFORE_PN += "${PN}-libs" +FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.so*" +FILES_${PN}-staticdev += "${libdir}/*.la" + +PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}" +FILES_python3-bind = "${sbindir}/dnssec-coverage ${sbindir}/dnssec-checkds \ + ${sbindir}/dnssec-keymgr ${PYTHON_SITEPACKAGES_DIR}" + +RDEPENDS_${PN}-dev = "" +RDEPENDS_python3-bind = "python3-core python3-ply" diff --git a/poky/meta/recipes-connectivity/bind/bind_9.16.9.bb b/poky/meta/recipes-connectivity/bind/bind_9.16.9.bb deleted file mode 100644 index be8a294a4..000000000 --- a/poky/meta/recipes-connectivity/bind/bind_9.16.9.bb +++ /dev/null @@ -1,123 +0,0 @@ -SUMMARY = "ISC Internet Domain Name Server" -HOMEPAGE = "https://www.isc.org/bind/" -SECTION = "console/network" - -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4673dc07337cace3b93c65e9ffe57b60" - -DEPENDS = "openssl libcap zlib libuv" - -SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ - file://conf.patch \ - file://named.service \ - file://bind9 \ - file://generate-rndc-key.sh \ - 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-named-lwresd-V-and-start-log-hide-build-options.patch \ - file://0001-avoid-start-failure-with-bind-user.patch \ - " - -SRC_URI[sha256sum] = "bcb292c4d738a46e3cbcb8afaa25ecf54f77652fa575135da9a2a1d525304a5a" - -UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" -# stay at 9.16 follow the ESV versions divisible by 4 -UPSTREAM_CHECK_REGEX = "(?P9.(16|20|24|28)(\.\d+)+(-P\d+)*)/" - -inherit autotools update-rc.d systemd useradd pkgconfig multilib_header update-alternatives - -# PACKAGECONFIGs readline and libedit should NOT be set at same time -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[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native," - -EXTRA_OECONF = " --with-libtool --disable-devpoll --disable-auto-validation --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)} - -# dhcp needs .la so keep them -REMOVE_LIBTOOL_LA = "0" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \ - --user-group bind" - -INITSCRIPT_NAME = "bind" -INITSCRIPT_PARAMS = "defaults" - -SYSTEMD_SERVICE_${PN} = "named.service" - -do_install_append() { - - rmdir "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" - install -d -o bind "${D}${localstatedir}/cache/bind" - install -d "${D}${sysconfdir}/bind" - install -d "${D}${sysconfdir}/init.d" - install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/" - install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind" - if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then - sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \ - ${D}${sbindir}/dnssec-coverage \ - ${D}${sbindir}/dnssec-checkds \ - ${D}${sbindir}/dnssec-keymgr - fi - - # Install systemd related files - install -d ${D}${sbindir} - install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir} - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ - -e 's,@SBINDIR@,${sbindir},g' \ - ${D}${systemd_unitdir}/system/named.service - - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - 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} = " \ - ${sysconfdir}/bind/named.conf \ - ${sysconfdir}/bind/named.conf.local \ - ${sysconfdir}/bind/named.conf.options \ - ${sysconfdir}/bind/db.0 \ - ${sysconfdir}/bind/db.127 \ - ${sysconfdir}/bind/db.empty \ - ${sysconfdir}/bind/db.local \ - ${sysconfdir}/bind/db.root \ - " - -ALTERNATIVE_${PN}-utils = "nslookup" -ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup" -ALTERNATIVE_PRIORITY = "100" - -PACKAGE_BEFORE_PN += "${PN}-utils" -FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate" -FILES_${PN}-dev += "${bindir}/isc-config.h" -FILES_${PN} += "${sbindir}/generate-rndc-key.sh" - -PACKAGE_BEFORE_PN += "${PN}-libs" -FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.so*" -FILES_${PN}-staticdev += "${libdir}/*.la" - -PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}" -FILES_python3-bind = "${sbindir}/dnssec-coverage ${sbindir}/dnssec-checkds \ - ${sbindir}/dnssec-keymgr ${PYTHON_SITEPACKAGES_DIR}" - -RDEPENDS_${PN}-dev = "" -RDEPENDS_python3-bind = "python3-core python3-ply" diff --git a/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb b/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb deleted file mode 100644 index cca60ddae..000000000 --- a/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb +++ /dev/null @@ -1,57 +0,0 @@ -SECTION = "console/network" -SUMMARY = "dhcpcd - a DHCP client" -DESCRIPTION = "dhcpcd runs on your machine and silently configures your \ - computer to work on the attached networks without trouble \ - and mostly without configuration." - -HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9674cc803c5d71306941e6e8b5c002f2" - -UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" - -SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ - file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ - file://dhcpcd.service \ - file://dhcpcd@.service \ - " - -SRC_URI[sha256sum] = "6d49af5e766a2515e6366e4f669663df04ecdf90a1a60ddb1d7a2feb4b5d2566" - -inherit pkgconfig autotools-brokensep systemd useradd - -SYSTEMD_SERVICE_${PN} = "dhcpcd.service" - -PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" - -PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" -# ntp conflicts with chrony -PACKAGECONFIG[ntp] = "--with-hook=ntp, , ,ntp" -PACKAGECONFIG[chrony] = "--with-hook=ntp, , ,chrony" -PACKAGECONFIG[ypbind] = "--with-eghook=yp, , ,ypbind-mt" - -EXTRA_OECONF = "--enable-ipv4 \ - --dbdir=${localstatedir}/lib/${BPN} \ - --sbindir=${base_sbindir} \ - --runstatedir=/run \ - --enable-privsep \ - --privsepuser=dhcpcd \ - --with-hooks \ - --with-eghooks \ - " - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system -d ${localstatedir}/lib/${BPN} -M -s /bin/false -U dhcpcd" - -do_install_append () { - # install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dhcpcd*.service ${D}${systemd_unitdir}/system - - chmod 700 ${D}${localstatedir}/lib/${BPN} - chown dhcpcd:dhcpcd ${D}${localstatedir}/lib/${BPN} -} - -FILES_${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" diff --git a/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb b/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb new file mode 100644 index 000000000..56fcf5cc0 --- /dev/null +++ b/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb @@ -0,0 +1,57 @@ +SECTION = "console/network" +SUMMARY = "dhcpcd - a DHCP client" +DESCRIPTION = "dhcpcd runs on your machine and silently configures your \ + computer to work on the attached networks without trouble \ + and mostly without configuration." + +HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9674cc803c5d71306941e6e8b5c002f2" + +UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" + +SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ + file://dhcpcd.service \ + file://dhcpcd@.service \ + " + +SRC_URI[sha256sum] = "41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513" + +inherit pkgconfig autotools-brokensep systemd useradd + +SYSTEMD_SERVICE_${PN} = "dhcpcd.service" + +PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" + +PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" +# ntp conflicts with chrony +PACKAGECONFIG[ntp] = "--with-hook=ntp, , ,ntp" +PACKAGECONFIG[chrony] = "--with-hook=ntp, , ,chrony" +PACKAGECONFIG[ypbind] = "--with-eghook=yp, , ,ypbind-mt" + +EXTRA_OECONF = "--enable-ipv4 \ + --dbdir=${localstatedir}/lib/${BPN} \ + --sbindir=${base_sbindir} \ + --runstatedir=/run \ + --enable-privsep \ + --privsepuser=dhcpcd \ + --with-hooks \ + --with-eghooks \ + " + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system -d ${localstatedir}/lib/${BPN} -M -s /bin/false -U dhcpcd" + +do_install_append () { + # install systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhcpcd*.service ${D}${systemd_unitdir}/system + + chmod 700 ${D}${localstatedir}/lib/${BPN} + chown dhcpcd:dhcpcd ${D}${localstatedir}/lib/${BPN} +} + +FILES_${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" diff --git a/poky/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/poky/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb index adf6d4414..09a196ad9 100644 --- a/poky/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb +++ b/poky/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb @@ -71,6 +71,7 @@ do_install_append () { install -m 0755 -d ${D}${base_bindir} mv ${D}${bindir}/ping* ${D}${base_bindir}/ mv ${D}${bindir}/hostname ${D}${base_bindir}/ + mv ${D}${bindir}/dnsdomainname ${D}${base_bindir}/ fi mv ${D}${bindir}/ifconfig ${D}${base_sbindir}/ mv ${D}${libexecdir}/syslogd ${D}${base_sbindir}/ @@ -118,8 +119,9 @@ PACKAGES =+ "${PN}-tftpd-dbg ${PN}-telnetd-dbg ${PN}-rshd-dbg" NOAUTOPACKAGEDEBUG = "1" ALTERNATIVE_PRIORITY = "79" -ALTERNATIVE_${PN} = "whois" +ALTERNATIVE_${PN} = "whois dnsdomainname" ALTERNATIVE_LINK_NAME[uucpd] = "${sbindir}/in.uucpd" +ALTERNATIVE_LINK_NAME[dnsdomainname] = "${base_bindir}/dnsdomainname" ALTERNATIVE_PRIORITY_${PN}-logger = "60" ALTERNATIVE_${PN}-logger = "logger" diff --git a/poky/meta/recipes-connectivity/iproute2/iproute2.inc b/poky/meta/recipes-connectivity/iproute2/iproute2.inc index 403d26430..7a22fe925 100644 --- a/poky/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/poky/meta/recipes-connectivity/iproute2/iproute2.inc @@ -20,11 +20,13 @@ PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," PACKAGECONFIG[devlink] = ",,libmnl," +IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}" + 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)}' \ + SUBDIRS='${IPROUTE2_MAKE_SUBDIRS}' \ SBINDIR='${base_sbindir}' \ LIBDIR='${libdir}' \ " diff --git a/poky/meta/recipes-connectivity/kea/kea_1.7.10.bb b/poky/meta/recipes-connectivity/kea/kea_1.7.10.bb deleted file mode 100644 index c9a11908e..000000000 --- a/poky/meta/recipes-connectivity/kea/kea_1.7.10.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "ISC Kea DHCP Server" -DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It supports both DHCPv4 and DHCPv6 protocols along with their extensions, e.g. prefix delegation and dynamic updates to DNS." -HOMEPAGE = "http://kea.isc.org" -SECTION = "connectivity" -LICENSE = "MPL-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=68d95543d2096459290a4e6b9ceccffa" - -DEPENDS = "boost log4cplus openssl" - -SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ - file://0001-keactrl.in-create-var-lib-kea-and-var-run-kea-folder.patch \ - file://kea-dhcp4.service \ - file://kea-dhcp6.service \ - file://kea-dhcp-ddns.service \ - file://kea-dhcp4-server \ - file://kea-dhcp6-server \ - file://kea-dhcp-ddns-server \ - file://fix-multilib-conflict.patch \ - file://fix_pid_keactrl.patch \ - file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ - " -SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82" - -inherit autotools systemd update-rc.d upstream-version-is-even - -INITSCRIPT_NAME = "kea-dhcp4-server" -INITSCRIPT_PARAMS = "defaults 30" - -SYSTEMD_SERVICE_${PN} = "kea-dhcp4.service kea-dhcp6.service kea-dhcp-ddns.service" -SYSTEMD_AUTO_ENABLE = "disable" - -DEBUG_OPTIMIZATION_remove_mips = " -Og" -DEBUG_OPTIMIZATION_append_mips = " -O" -BUILD_OPTIMIZATION_remove_mips = " -Og" -BUILD_OPTIMIZATION_append_mips = " -O" - -DEBUG_OPTIMIZATION_remove_mipsel = " -Og" -DEBUG_OPTIMIZATION_append_mipsel = " -O" -BUILD_OPTIMIZATION_remove_mipsel = " -Og" -BUILD_OPTIMIZATION_append_mipsel = " -O" - -EXTRA_OECONF = "--with-boost-libs=-lboost_system \ - --with-log4cplus=${STAGING_DIR_TARGET}${prefix} \ - --with-openssl=${STAGING_DIR_TARGET}${prefix}" - -do_configure_prepend() { - # replace abs_top_builddir to avoid introducing the build path - # don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target - find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" - sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in -} - -# patch out build host paths for reproducibility -do_compile_prepend_class-target() { - sed -i -e "s,${WORKDIR},,g" ${B}/config.report -} - -do_install_append() { - install -d ${D}${sysconfdir}/init.d - install -d ${D}${systemd_system_unitdir} - - install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} - install -m 0755 ${WORKDIR}/kea-*-server ${D}${sysconfdir}/init.d - sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ - -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl -} - -do_install_append() { - rm -rf "${D}${localstatedir}" -} - -CONFFILES_${PN} = "${sysconfdir}/kea/keactrl.conf" - -FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" -FILES_${PN} += "${libdir}/hooks/*.so" - -PARALLEL_MAKEINST = "" diff --git a/poky/meta/recipes-connectivity/kea/kea_1.8.2.bb b/poky/meta/recipes-connectivity/kea/kea_1.8.2.bb new file mode 100644 index 000000000..3dc4f6af7 --- /dev/null +++ b/poky/meta/recipes-connectivity/kea/kea_1.8.2.bb @@ -0,0 +1,78 @@ +SUMMARY = "ISC Kea DHCP Server" +DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It supports both DHCPv4 and DHCPv6 protocols along with their extensions, e.g. prefix delegation and dynamic updates to DNS." +HOMEPAGE = "http://kea.isc.org" +SECTION = "connectivity" +LICENSE = "MPL-2.0 & Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=68d95543d2096459290a4e6b9ceccffa" + +DEPENDS = "boost log4cplus openssl" + +SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ + file://0001-keactrl.in-create-var-lib-kea-and-var-run-kea-folder.patch \ + file://kea-dhcp4.service \ + file://kea-dhcp6.service \ + file://kea-dhcp-ddns.service \ + file://kea-dhcp4-server \ + file://kea-dhcp6-server \ + file://kea-dhcp-ddns-server \ + file://fix-multilib-conflict.patch \ + file://fix_pid_keactrl.patch \ + file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ + " +SRC_URI[sha256sum] = "486ca7abedb9d6fdf8e4344ad8688d1171f2ef0f5506d118988aadeae80a1d39" + +inherit autotools systemd update-rc.d upstream-version-is-even + +INITSCRIPT_NAME = "kea-dhcp4-server" +INITSCRIPT_PARAMS = "defaults 30" + +SYSTEMD_SERVICE_${PN} = "kea-dhcp4.service kea-dhcp6.service kea-dhcp-ddns.service" +SYSTEMD_AUTO_ENABLE = "disable" + +DEBUG_OPTIMIZATION_remove_mips = " -Og" +DEBUG_OPTIMIZATION_append_mips = " -O" +BUILD_OPTIMIZATION_remove_mips = " -Og" +BUILD_OPTIMIZATION_append_mips = " -O" + +DEBUG_OPTIMIZATION_remove_mipsel = " -Og" +DEBUG_OPTIMIZATION_append_mipsel = " -O" +BUILD_OPTIMIZATION_remove_mipsel = " -Og" +BUILD_OPTIMIZATION_append_mipsel = " -O" + +EXTRA_OECONF = "--with-boost-libs=-lboost_system \ + --with-log4cplus=${STAGING_DIR_TARGET}${prefix} \ + --with-openssl=${STAGING_DIR_TARGET}${prefix}" + +do_configure_prepend() { + # replace abs_top_builddir to avoid introducing the build path + # don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target + find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" + sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in +} + +# patch out build host paths for reproducibility +do_compile_prepend_class-target() { + sed -i -e "s,${WORKDIR},,g" ${B}/config.report +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -d ${D}${systemd_system_unitdir} + + install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} + install -m 0755 ${WORKDIR}/kea-*-server ${D}${sysconfdir}/init.d + sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl +} + +do_install_append() { + rm -rf "${D}${localstatedir}" +} + +CONFFILES_${PN} = "${sysconfdir}/kea/keactrl.conf" + +FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" +FILES_${PN} += "${libdir}/hooks/*.so" + +PARALLEL_MAKEINST = "" diff --git a/poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb index 0b0bbab16..7dccc15e0 100644 --- a/poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +++ b/poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProvider SECTION = "network" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04" -SRCREV = "22b49d86fb7aded2c195a9d49e5924da696b3228" -PV = "20190618" +SRCREV = "90f3fe28aa25135b7e4a54a7816388913bfd4a2a" +PV = "20201225" PE = "1" SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https" diff --git a/poky/meta/recipes-connectivity/openssh/openssh_8.4p1.bb b/poky/meta/recipes-connectivity/openssh/openssh_8.4p1.bb index 676a8a653..688fc8a02 100644 --- a/poky/meta/recipes-connectivity/openssh/openssh_8.4p1.bb +++ b/poky/meta/recipes-connectivity/openssh/openssh_8.4p1.bb @@ -67,8 +67,8 @@ EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ --disable-strip \ " -# musl doesn't implement wtmp/utmp -EXTRA_OECONF_append_libc-musl = " --disable-wtmp" +# musl doesn't implement wtmp/utmp and logwtmp +EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" # Since we do not depend on libbsd, we do not want configure to use it # just because it finds libutil.h. But, specifying --disable-libutil diff --git a/poky/meta/recipes-connectivity/openssl/openssl_1.1.1h.bb b/poky/meta/recipes-connectivity/openssl/openssl_1.1.1h.bb deleted file mode 100644 index 182716720..000000000 --- a/poky/meta/recipes-connectivity/openssl/openssl_1.1.1h.bb +++ /dev/null @@ -1,216 +0,0 @@ -SUMMARY = "Secure Socket Layer" -DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools." -HOMEPAGE = "http://www.openssl.org/" -BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html" -SECTION = "libs/network" - -# "openssl" here actually means both OpenSSL and SSLeay licenses apply -# (see meta/files/common-licenses/OpenSSL to which "openssl" is SPDXLICENSEMAPped) -LICENSE = "openssl" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d343e62fc9c833710bbbed25f27364c8" - -DEPENDS = "hostperl-runtime-native" - -SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ - file://run-ptest \ - file://0001-skip-test_symbol_presence.patch \ - file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ - file://afalg.patch \ - file://reproducible.patch \ - " - -SRC_URI_append_class-nativesdk = " \ - file://environment.d-openssl.sh \ - " - -SRC_URI[sha256sum] = "5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9" - -inherit lib_package multilib_header multilib_script ptest -MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" - -PACKAGECONFIG ?= "" -PACKAGECONFIG_class-native = "" -PACKAGECONFIG_class-nativesdk = "" - -PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module" - -B = "${WORKDIR}/build" -do_configure[cleandirs] = "${B}" - -#| ./libcrypto.so: undefined reference to `getcontext' -#| ./libcrypto.so: undefined reference to `setcontext' -#| ./libcrypto.so: undefined reference to `makecontext' -EXTRA_OECONF_append_libc-musl = " no-async" -EXTRA_OECONF_append_libc-musl_powerpc64 = " no-asm" - -# adding devrandom prevents openssl from using getrandom() which is not available on older glibc versions -# (native versions can be built with newer glibc, but then relocated onto a system with older glibc) -EXTRA_OECONF_class-native = "--with-rand-seed=os,devrandom" -EXTRA_OECONF_class-nativesdk = "--with-rand-seed=os,devrandom" - -# Relying on hardcoded built-in paths causes openssl-native to not be relocateable from sstate. -CFLAGS_append_class-native = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" -CFLAGS_append_class-nativesdk = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" - -do_configure () { - os=${HOST_OS} - case $os in - linux-gnueabi |\ - linux-gnuspe |\ - linux-musleabi |\ - linux-muslspe |\ - linux-musl ) - os=linux - ;; - *) - ;; - esac - target="$os-${HOST_ARCH}" - case $target in - linux-arm*) - target=linux-armv4 - ;; - linux-aarch64*) - target=linux-aarch64 - ;; - linux-i?86 | linux-viac3) - target=linux-x86 - ;; - linux-gnux32-x86_64 | linux-muslx32-x86_64 ) - target=linux-x32 - ;; - linux-gnu64-x86_64) - target=linux-x86_64 - ;; - linux-mips | linux-mipsel) - # specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags - target="linux-mips32 ${TARGET_CC_ARCH}" - ;; - linux-gnun32-mips*) - target=linux-mips64 - ;; - linux-*-mips64 | linux-mips64 | linux-*-mips64el | linux-mips64el) - target=linux64-mips64 - ;; - linux-microblaze* | linux-nios2* | linux-sh3 | linux-sh4 | linux-arc*) - target=linux-generic32 - ;; - linux-powerpc) - target=linux-ppc - ;; - linux-powerpc64) - target=linux-ppc64 - ;; - linux-powerpc64le) - target=linux-ppc64le - ;; - linux-riscv32) - target=linux-generic32 - ;; - linux-riscv64) - target=linux-generic64 - ;; - linux-sparc | linux-supersparc) - target=linux-sparcv9 - ;; - esac - - useprefix=${prefix} - if [ "x$useprefix" = "x" ]; then - useprefix=/ - fi - # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the - # environment variables set by bitbake. Adjust the environment variables instead. - HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ - perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target - perl ${B}/configdata.pm --dump -} - -do_install () { - oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install - - oe_multilib_header openssl/opensslconf.h - - # Create SSL structure for packages such as ca-certificates which - # contain hard-coded paths to /etc/ssl. Debian does the same. - install -d ${D}${sysconfdir}/ssl - mv ${D}${libdir}/ssl-1.1/certs \ - ${D}${libdir}/ssl-1.1/private \ - ${D}${libdir}/ssl-1.1/openssl.cnf \ - ${D}${sysconfdir}/ssl/ - - # Although absolute symlinks would be OK for the target, they become - # invalid if native or nativesdk are relocated from sstate. - ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/certs')} ${D}${libdir}/ssl-1.1/certs - ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/private')} ${D}${libdir}/ssl-1.1/private - ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-1.1/openssl.cnf -} - -do_install_append_class-native () { - create_wrapper ${D}${bindir}/openssl \ - OPENSSL_CONF=${libdir}/ssl-1.1/openssl.cnf \ - SSL_CERT_DIR=${libdir}/ssl-1.1/certs \ - SSL_CERT_FILE=${libdir}/ssl-1.1/cert.pem \ - OPENSSL_ENGINES=${libdir}/engines-1.1 -} - -do_install_append_class-nativesdk () { - mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d - install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh - sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh -} - -PTEST_BUILD_HOST_FILES += "configdata.pm" -PTEST_BUILD_HOST_PATTERN = "perl_version =" -do_install_ptest () { - # Prune the build tree - rm -f ${B}/fuzz/*.* ${B}/test/*.* - - cp ${S}/Configure ${B}/configdata.pm ${D}${PTEST_PATH} - cp -r ${S}/external ${B}/test ${S}/test ${B}/fuzz ${S}/util ${B}/util ${D}${PTEST_PATH} - - # For test_shlibload - ln -s ${libdir}/libcrypto.so.1.1 ${D}${PTEST_PATH}/ - ln -s ${libdir}/libssl.so.1.1 ${D}${PTEST_PATH}/ - - install -d ${D}${PTEST_PATH}/apps - ln -s ${bindir}/openssl ${D}${PTEST_PATH}/apps - install -m644 ${S}/apps/*.pem ${S}/apps/*.srl ${S}/apps/openssl.cnf ${D}${PTEST_PATH}/apps - install -m755 ${B}/apps/CA.pl ${D}${PTEST_PATH}/apps - - install -d ${D}${PTEST_PATH}/engines - install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines -} - -# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto -# package RRECOMMENDS on this package. This will enable the configuration -# file to be installed for both the openssl-bin package and the libcrypto -# package since the openssl-bin package depends on the libcrypto package. - -PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc" - -FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" -FILES_libssl = "${libdir}/libssl${SOLIBS}" -FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf \ - ${libdir}/ssl-1.1/openssl.cnf* \ - " -FILES_${PN}-engines = "${libdir}/engines-1.1" -FILES_${PN}-misc = "${libdir}/ssl-1.1/misc ${bindir}/c_rehash" -FILES_${PN} =+ "${libdir}/ssl-1.1/*" -FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" - -CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" - -RRECOMMENDS_libcrypto += "openssl-conf" -RDEPENDS_${PN}-misc = "perl" -RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules bash" - -RDEPENDS_${PN}-bin += "openssl-conf" - -BBCLASSEXTEND = "native nativesdk" - -CVE_PRODUCT = "openssl:openssl" - -# Only affects OpenSSL >= 1.1.1 in combination with Apache < 2.4.37 -# Apache in meta-webserver is already recent enough -CVE_CHECK_WHITELIST += "CVE-2019-0190" diff --git a/poky/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb b/poky/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb new file mode 100644 index 000000000..c63ba3c8e --- /dev/null +++ b/poky/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb @@ -0,0 +1,221 @@ +SUMMARY = "Secure Socket Layer" +DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools." +HOMEPAGE = "http://www.openssl.org/" +BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html" +SECTION = "libs/network" + +# "openssl" here actually means both OpenSSL and SSLeay licenses apply +# (see meta/files/common-licenses/OpenSSL to which "openssl" is SPDXLICENSEMAPped) +LICENSE = "openssl" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d343e62fc9c833710bbbed25f27364c8" + +DEPENDS = "hostperl-runtime-native" + +SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ + file://run-ptest \ + file://0001-skip-test_symbol_presence.patch \ + file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ + file://afalg.patch \ + file://reproducible.patch \ + " + +SRC_URI_append_class-nativesdk = " \ + file://environment.d-openssl.sh \ + " + +SRC_URI[sha256sum] = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" + +inherit lib_package multilib_header multilib_script ptest +MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" + +PACKAGECONFIG ?= "" +PACKAGECONFIG_class-native = "" +PACKAGECONFIG_class-nativesdk = "" + +PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module" + +B = "${WORKDIR}/build" +do_configure[cleandirs] = "${B}" + +#| ./libcrypto.so: undefined reference to `getcontext' +#| ./libcrypto.so: undefined reference to `setcontext' +#| ./libcrypto.so: undefined reference to `makecontext' +EXTRA_OECONF_append_libc-musl = " no-async" +EXTRA_OECONF_append_libc-musl_powerpc64 = " no-asm" + +# adding devrandom prevents openssl from using getrandom() which is not available on older glibc versions +# (native versions can be built with newer glibc, but then relocated onto a system with older glibc) +EXTRA_OECONF_class-native = "--with-rand-seed=os,devrandom" +EXTRA_OECONF_class-nativesdk = "--with-rand-seed=os,devrandom" + +# Relying on hardcoded built-in paths causes openssl-native to not be relocateable from sstate. +CFLAGS_append_class-native = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" +CFLAGS_append_class-nativesdk = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" + +do_configure () { + os=${HOST_OS} + case $os in + linux-gnueabi |\ + linux-gnuspe |\ + linux-musleabi |\ + linux-muslspe |\ + linux-musl ) + os=linux + ;; + *) + ;; + esac + target="$os-${HOST_ARCH}" + case $target in + linux-arm*) + target=linux-armv4 + ;; + linux-aarch64*) + target=linux-aarch64 + ;; + linux-i?86 | linux-viac3) + target=linux-x86 + ;; + linux-gnux32-x86_64 | linux-muslx32-x86_64 ) + target=linux-x32 + ;; + linux-gnu64-x86_64) + target=linux-x86_64 + ;; + linux-mips | linux-mipsel) + # specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags + target="linux-mips32 ${TARGET_CC_ARCH}" + ;; + linux-gnun32-mips*) + target=linux-mips64 + ;; + linux-*-mips64 | linux-mips64 | linux-*-mips64el | linux-mips64el) + target=linux64-mips64 + ;; + linux-microblaze* | linux-nios2* | linux-sh3 | linux-sh4 | linux-arc*) + target=linux-generic32 + ;; + linux-powerpc) + target=linux-ppc + ;; + linux-powerpc64) + target=linux-ppc64 + ;; + linux-powerpc64le) + target=linux-ppc64le + ;; + linux-riscv32) + target=linux-generic32 + ;; + linux-riscv64) + target=linux-generic64 + ;; + linux-sparc | linux-supersparc) + target=linux-sparcv9 + ;; + mingw32-x86_64) + target=mingw64 + ;; + esac + + useprefix=${prefix} + if [ "x$useprefix" = "x" ]; then + useprefix=/ + fi + # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the + # environment variables set by bitbake. Adjust the environment variables instead. + HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ + perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target + perl ${B}/configdata.pm --dump +} + +do_install () { + oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install + + oe_multilib_header openssl/opensslconf.h + + # Create SSL structure for packages such as ca-certificates which + # contain hard-coded paths to /etc/ssl. Debian does the same. + install -d ${D}${sysconfdir}/ssl + mv ${D}${libdir}/ssl-1.1/certs \ + ${D}${libdir}/ssl-1.1/private \ + ${D}${libdir}/ssl-1.1/openssl.cnf \ + ${D}${sysconfdir}/ssl/ + + # Although absolute symlinks would be OK for the target, they become + # invalid if native or nativesdk are relocated from sstate. + ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/certs')} ${D}${libdir}/ssl-1.1/certs + ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/private')} ${D}${libdir}/ssl-1.1/private + ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-1.1/openssl.cnf +} + +do_install_append_class-native () { + create_wrapper ${D}${bindir}/openssl \ + OPENSSL_CONF=${libdir}/ssl-1.1/openssl.cnf \ + SSL_CERT_DIR=${libdir}/ssl-1.1/certs \ + SSL_CERT_FILE=${libdir}/ssl-1.1/cert.pem \ + OPENSSL_ENGINES=${libdir}/engines-1.1 +} + +do_install_append_class-nativesdk () { + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d + install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh + sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh +} + +PTEST_BUILD_HOST_FILES += "configdata.pm" +PTEST_BUILD_HOST_PATTERN = "perl_version =" +do_install_ptest () { + # Prune the build tree + rm -f ${B}/fuzz/*.* ${B}/test/*.* + + cp ${S}/Configure ${B}/configdata.pm ${D}${PTEST_PATH} + cp -r ${S}/external ${B}/test ${S}/test ${B}/fuzz ${S}/util ${B}/util ${D}${PTEST_PATH} + + # For test_shlibload + ln -s ${libdir}/libcrypto.so.1.1 ${D}${PTEST_PATH}/ + ln -s ${libdir}/libssl.so.1.1 ${D}${PTEST_PATH}/ + + install -d ${D}${PTEST_PATH}/apps + ln -s ${bindir}/openssl ${D}${PTEST_PATH}/apps + install -m644 ${S}/apps/*.pem ${S}/apps/*.srl ${S}/apps/openssl.cnf ${D}${PTEST_PATH}/apps + install -m755 ${B}/apps/CA.pl ${D}${PTEST_PATH}/apps + + install -d ${D}${PTEST_PATH}/engines + install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines +} + +# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto +# package RRECOMMENDS on this package. This will enable the configuration +# file to be installed for both the openssl-bin package and the libcrypto +# package since the openssl-bin package depends on the libcrypto package. + +PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc" + +FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" +FILES_libssl = "${libdir}/libssl${SOLIBS}" +FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf \ + ${libdir}/ssl-1.1/openssl.cnf* \ + " +FILES_${PN}-engines = "${libdir}/engines-1.1" +# ${prefix} comes from what we pass into --prefix at configure time (which is used for INSTALLTOP) +FILES_${PN}-engines_append_mingw32_class-nativesdk = " ${prefix}${libdir}/engines-1_1" +FILES_${PN}-misc = "${libdir}/ssl-1.1/misc ${bindir}/c_rehash" +FILES_${PN} =+ "${libdir}/ssl-1.1/*" +FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" + +CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" + +RRECOMMENDS_libcrypto += "openssl-conf" +RDEPENDS_${PN}-misc = "perl" +RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules bash" + +RDEPENDS_${PN}-bin += "openssl-conf" + +BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT = "openssl:openssl" + +# Only affects OpenSSL >= 1.1.1 in combination with Apache < 2.4.37 +# Apache in meta-webserver is already recent enough +CVE_CHECK_WHITELIST += "CVE-2019-0190" diff --git a/poky/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch b/poky/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch deleted file mode 100644 index 65291368b..000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch +++ /dev/null @@ -1,124 +0,0 @@ -From e50cdaed07e51f2508f94eb1f34fe43776e4ca78 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 29 May 2015 14:57:05 -0700 -Subject: [PATCH] Fix build with musl - -There are several assumption about glibc - -Signed-off-by: Khem Raj -Upstream-Status: Pending ---- - include/net/ppp_defs.h | 2 ++ - pppd/Makefile.linux | 2 +- - pppd/plugins/rp-pppoe/config.h | 3 ++- - pppd/plugins/rp-pppoe/plugin.c | 1 - - pppd/plugins/rp-pppoe/pppoe-discovery.c | 8 ++++---- - pppd/plugins/rp-pppoe/pppoe.h | 2 +- - pppd/sys-linux.c | 3 ++- - 7 files changed, 12 insertions(+), 9 deletions(-) - -diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h -index b06eda5..dafa36c 100644 ---- a/include/net/ppp_defs.h -+++ b/include/net/ppp_defs.h -@@ -38,6 +38,8 @@ - #ifndef _PPP_DEFS_H_ - #define _PPP_DEFS_H_ - -+#include -+ - /* - * The basic PPP frame. - */ -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 4e485a1..76411bc 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -131,7 +131,7 @@ LIBS += -lcrypt - endif - - ifdef USE_LIBUTIL --CFLAGS += -DHAVE_LOGWTMP=1 -+#CFLAGS += -DHAVE_LOGWTMP=1 - LIBS += -lutil - endif - -diff --git a/pppd/plugins/rp-pppoe/config.h b/pppd/plugins/rp-pppoe/config.h -index a708859..4a16a88 100644 ---- a/pppd/plugins/rp-pppoe/config.h -+++ b/pppd/plugins/rp-pppoe/config.h -@@ -78,8 +78,9 @@ - #define HAVE_NET_IF_ARP_H 1 - - /* Define if you have the header file. */ -+#ifdef __GLIBC__ - #define HAVE_NET_ETHERNET_H 1 -- -+#endif - /* Define if you have the header file. */ - #define HAVE_NET_IF_H 1 - -diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c -index 44e0c31..93c0906 100644 ---- a/pppd/plugins/rp-pppoe/plugin.c -+++ b/pppd/plugins/rp-pppoe/plugin.c -@@ -46,7 +46,6 @@ static char const RCSID[] = - #include - #include - #include --#include - #include - #include - #include -diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c -index f19c6d8..f45df2c 100644 ---- a/pppd/plugins/rp-pppoe/pppoe-discovery.c -+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c -@@ -29,10 +29,6 @@ - #include - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include - #endif -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index a4e7d5c..de191c8 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -90,7 +90,7 @@ typedef unsigned long UINT32_t; - #ifdef HAVE_SYS_SOCKET_H - #include - #endif --#ifndef HAVE_SYS_DLPI_H -+#if !defined HAVE_SYS_DLPI_H && defined HAVE_NET_ETHERNET_H - #include - #endif - #endif -diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c -index a0531e9..84ee394 100644 ---- a/pppd/sys-linux.c -+++ b/pppd/sys-linux.c -@@ -112,7 +112,7 @@ - #include - #include - #include --#include -+/* #include */ - #include - #endif - #include -@@ -145,6 +145,7 @@ - #endif - - #ifdef INET6 -+#include - #ifndef _LINUX_IN6_H - /* - * This is in linux/include/net/ipv6.h. --- -2.17.1 - diff --git a/poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch b/poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch deleted file mode 100644 index a32f89fbc..000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit cd90fd147844a0cfec101f1e2db7a3c59d236621 -Author: Jussi Kukkonen -Date: Wed Dec 28 14:11:22 2016 +0200 - -pppol2tp plugin: Remove unneeded include - -The include is not required and will break compile on musl libc with - -| In file included from pppol2tp.c:34:0: -| /usr/include/linux/if.h:97:2: error: expected identifier before numeric constant -| IFF_LOWER_UP = 1<<16, /* __volatile__ */ - -Patch originally from Khem Raj. - -Upstream-Status: Pending [https://github.com/paulusmack/ppp/issues/73] -Signed-off-by: Jussi Kukkonen - -diff --git a/pppd/plugins/pppol2tp/openl2tp.c b/pppd/plugins/pppol2tp/openl2tp.c -index 9643b96..458316b 100644 ---- a/pppd/plugins/pppol2tp/openl2tp.c -+++ b/pppd/plugins/pppol2tp/openl2tp.c -@@ -47,7 +47,6 @@ - #include - #include - #include --#include - #include - - #include "l2tp_event.h" -diff --git a/pppd/plugins/pppol2tp/pppol2tp.c b/pppd/plugins/pppol2tp/pppol2tp.c -index 0e28606..4f6d98c 100644 ---- a/pppd/plugins/pppol2tp/pppol2tp.c -+++ b/pppd/plugins/pppol2tp/pppol2tp.c -@@ -46,7 +46,6 @@ - #include - #include - #include --#include - #include - - /* should be added to system's socket.h... */ ---- - diff --git a/poky/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch b/poky/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch deleted file mode 100644 index b7ba7ba64..000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch +++ /dev/null @@ -1,47 +0,0 @@ -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/poky/meta/recipes-connectivity/ppp/ppp/copts.patch b/poky/meta/recipes-connectivity/ppp/ppp/copts.patch deleted file mode 100644 index 53ff06e03..000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/copts.patch +++ /dev/null @@ -1,21 +0,0 @@ -ppp: use build system CFLAGS when compiling - -Upstream-Status: Pending - -Override the hard-coded COPTS make variables with -CFLAGS. Add COPTS into one Makefile that did not -use it. - -Signed-off-by: Joe Slater - ---- a/pppd/plugins/radius/Makefile.linux -+++ b/pppd/plugins/radius/Makefile.linux -@@ -12,7 +12,7 @@ VERSION = $(shell awk -F '"' '/VERSION/ - INSTALL = install - - PLUGIN=radius.so radattr.so radrealms.so --CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON -+CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON - - # Uncomment the next line to include support for Microsoft's - # MS-CHAP authentication protocol. diff --git a/poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch b/poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch deleted file mode 100644 index c5a0be86f..000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch +++ /dev/null @@ -1,30 +0,0 @@ -ppp: Buffer overflow in radius plugin - -From: https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=782450 - -Upstream-Status: Backport -CVE: CVE-2015-3310 - -On systems with more than 65535 processes running, pppd aborts when -sending a "start" accounting message to the RADIUS server because of a -buffer overflow in rc_mksid. - -The process id is used in rc_mksid to generate a pseudo-unique string, -assuming that the hex representation of the pid will be at most 4 -characters (FFFF). __sprintf_chk(), used when compiling with -optimization levels greater than 0 and FORTIFY_SOURCE, detects the -buffer overflow and makes pppd crash. - -The following patch fixes the problem. - ---- ppp-2.4.6.orig/pppd/plugins/radius/util.c -+++ ppp-2.4.6/pppd/plugins/radius/util.c -@@ -77,7 +77,7 @@ rc_mksid (void) - static unsigned short int cnt = 0; - sprintf (buf, "%08lX%04X%02hX", - (unsigned long int) time (NULL), -- (unsigned int) getpid (), -+ (unsigned int) getpid () % 65535, - cnt & 0xFF); - cnt++; - return buf; diff --git a/poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch b/poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch deleted file mode 100644 index 614a474c3..000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 505705d0e1b55ce3fdc10d0e5eab5488f869adb6 Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter -Date: Thu, 1 Jul 2010 14:34:12 +0800 -Subject: [PATCH] ppp: Upgraded to version 2.4.5 - -The patch comes from OpenEmbedded. -Rebased for ppp-2.4.5. Dongxiao Xu - -Updated from OE-Classic to include the pcap hunk. -Signed-off-by: Andreas Oberritter - -Upstream-Status: Inappropriate [configuration] - ---- - pppd/Makefile.linux | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 4e485a1..44c4193 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -188,10 +188,10 @@ LIBS += -ldl - endif - - ifdef FILTER --ifneq ($(wildcard /usr/include/pcap-bpf.h),) -+#ifneq ($(wildcard /usr/include/pcap-bpf.h),) - LIBS += -lpcap - CFLAGS += -DPPP_FILTER --endif -+#endif - endif - - ifdef HAVE_INET6 diff --git a/poky/meta/recipes-connectivity/ppp/ppp/makefile.patch b/poky/meta/recipes-connectivity/ppp/ppp/makefile.patch deleted file mode 100644 index 25b8ded44..000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/makefile.patch +++ /dev/null @@ -1,115 +0,0 @@ -From f7fb1d1abfa6d208fb40fca1602e0c488108f1b5 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Wed, 31 Aug 2005 10:45:47 +0000 -Subject: [PATCH] Initial population - -The patch comes from OpenEmbedded -Rebased for ppp-2.4.5. Dongxiao Xu - -Upstream-Status: Inappropriate [configuration] - ---- - chat/Makefile.linux | 2 +- - pppd/Makefile.linux | 4 ++-- - pppd/plugins/radius/Makefile.linux | 10 +++++----- - pppd/plugins/rp-pppoe/Makefile.linux | 4 ++-- - pppdump/Makefile.linux | 2 +- - pppstats/Makefile.linux | 2 +- - 6 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/chat/Makefile.linux b/chat/Makefile.linux -index 0732ec8..f082dab 100644 ---- a/chat/Makefile.linux -+++ b/chat/Makefile.linux -@@ -25,7 +25,7 @@ chat.o: chat.c - - install: chat - mkdir -p $(BINDIR) $(MANDIR) -- $(INSTALL) -s -c chat $(BINDIR) -+ $(INSTALL) -c chat $(BINDIR) - $(INSTALL) -c -m 644 chat.8 $(MANDIR) - - clean: -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 9664f70..4e485a1 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -107,7 +107,7 @@ ifdef USE_SRP - CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include - LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto - TARGETS += srp-entry --EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry -+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry - MANPAGES += srp-entry.8 - EXTRACLEAN += srp-entry.o - NEEDDES=y -@@ -219,7 +219,7 @@ all: $(TARGETS) - install: pppd - mkdir -p $(BINDIR) $(MANDIR) - $(EXTRAINSTALL) -- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd -+ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd - if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ - chmod o-rx,u+s $(BINDIR)/pppd; fi - $(INSTALL) -c -m 444 pppd.8 $(MANDIR) -diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux -index e702263..af57ae3 100644 ---- a/pppd/plugins/radius/Makefile.linux -+++ b/pppd/plugins/radius/Makefile.linux -@@ -36,11 +36,11 @@ all: $(PLUGIN) - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) -- $(INSTALL) -s -c -m 755 radius.so $(LIBDIR) -- $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR) -- $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR) -- $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR) -- $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) -+ $(INSTALL) -c -m 755 radius.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radattr.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radrealms.so $(LIBDIR) -+ $(INSTALL) -m 444 pppd-radius.8 $(MANDIR) -+ $(INSTALL) -m 444 pppd-radattr.8 $(MANDIR) - - radius.so: radius.o libradiusclient.a - $(CC) $(LDFLAGS) -o radius.so -shared radius.o libradiusclient.a -diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux -index 749ccc2..2c93f4a 100644 ---- a/pppd/plugins/rp-pppoe/Makefile.linux -+++ b/pppd/plugins/rp-pppoe/Makefile.linux -@@ -43,9 +43,9 @@ rp-pppoe.so: plugin.o discovery.o if.o common.o - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) -- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR) -+ $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR) - $(INSTALL) -d -m 755 $(BINDIR) -- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR) -+ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR) - - clean: - rm -f *.o *.so pppoe-discovery -diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux -index cdf7ac4..0457561 100644 ---- a/pppdump/Makefile.linux -+++ b/pppdump/Makefile.linux -@@ -17,5 +17,5 @@ clean: - - install: - mkdir -p $(BINDIR) $(MANDIR) -- $(INSTALL) -s -c pppdump $(BINDIR) -+ $(INSTALL) -c pppdump $(BINDIR) - $(INSTALL) -c -m 444 pppdump.8 $(MANDIR) -diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux -index 71afbe6..1819370 100644 ---- a/pppstats/Makefile.linux -+++ b/pppstats/Makefile.linux -@@ -22,7 +22,7 @@ all: pppstats - - install: pppstats - -mkdir -p $(MANDIR) -- $(INSTALL) -s -c pppstats $(BINDIR) -+ $(INSTALL) -c pppstats $(BINDIR) - $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) - - pppstats: $(PPPSTATSRCS) diff --git a/poky/meta/recipes-connectivity/ppp/ppp/makefix.patch b/poky/meta/recipes-connectivity/ppp/ppp/makefix.patch new file mode 100644 index 000000000..9471df32e --- /dev/null +++ b/poky/meta/recipes-connectivity/ppp/ppp/makefix.patch @@ -0,0 +1,40 @@ +We were seeing reproducibility issues where one host would use the internal +logwtmp wrapper, another would use the one in libutil. The issue was that in +some cases the "\#include" was making it to CC, in others, "#include". The +issue seems to be related to shell escaping. + +The root cause looks to be: +http://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b576b907b06aea5f4 + +Instead of relying on shell quoting, use make to indirect the variable +and avoid the problem. + +See https://github.com/paulusmack/ppp/issues/233 + +Upstream-Status: Backport [https://github.com/paulusmack/ppp/commit/b4430f7092ececdff2504d5f3393a4c6528c3686] +Signed-off-by: Richard Purdie + +Index: ppp-2.4.9/pppd/Makefile.linux +=================================================================== +--- ppp-2.4.9.orig/pppd/Makefile.linux ++++ ppp-2.4.9/pppd/Makefile.linux +@@ -80,7 +80,8 @@ PLUGIN=y + #USE_SRP=y + + # Use libutil; test if logwtmp is declared in to detect +-ifeq ($(shell echo '\#include ' | $(CC) -E - 2>/dev/null | grep -q logwtmp && echo yes),yes) ++UTMPHEADER = "\#include " ++ifeq ($(shell echo $(UTMPHEADER) | $(CC) -E - 2>/dev/null | grep -q logwtmp && echo yes),yes) + USE_LIBUTIL=y + endif + +@@ -143,7 +144,8 @@ CFLAGS += -DHAS_SHADOW + #LIBS += -lshadow $(LIBS) + endif + +-ifeq ($(shell echo '\#include ' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes) ++CRYPTHEADER = "\#include " ++ifeq ($(shell echo $(CRYPTHEADER) | $(CC) -E - >/dev/null 2>&1 && echo yes),yes) + CFLAGS += -DHAVE_CRYPT_H=1 + LIBS += -lcrypt + endif diff --git a/poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch b/poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch deleted file mode 100644 index a72414ff8..000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch +++ /dev/null @@ -1,45 +0,0 @@ -The patch comes from OpenEmbedded -Rebased for ppp-2.4.5. Dongxiao Xu - -Upstream-Status: Inappropriate [embedded specific] - -diff -ruN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c ---- ppp-2.4.5-orig/pppd/ipcp.c 2010-06-30 15:51:12.050166398 +0800 -+++ ppp-2.4.5/pppd/ipcp.c 2010-06-30 17:02:33.930393283 +0800 -@@ -55,6 +55,8 @@ - #include - #include - #include -+#include -+#include - - #include "pppd.h" - #include "fsm.h" -@@ -2095,6 +2097,14 @@ - u_int32_t peerdns1, peerdns2; - { - FILE *f; -+ struct stat dirinfo; -+ -+ if(stat(_PATH_OUTDIR, &dirinfo)) { -+ if(mkdir(_PATH_OUTDIR, 0775)) { -+ error("Failed to create directory %s: %m", _PATH_OUTDIR); -+ return; -+ } -+ } - - f = fopen(_PATH_RESOLV, "w"); - if (f == NULL) { -diff -ruN ppp-2.4.5-orig/pppd/pathnames.h ppp-2.4.5/pppd/pathnames.h ---- ppp-2.4.5-orig/pppd/pathnames.h 2010-06-30 15:51:12.043682063 +0800 -+++ ppp-2.4.5/pppd/pathnames.h 2010-06-30 17:03:20.594371055 +0800 -@@ -30,7 +30,8 @@ - #define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options." - #define _PATH_CONNERRS _ROOT_PATH "/etc/ppp/connect-errors" - #define _PATH_PEERFILES _ROOT_PATH "/etc/ppp/peers/" --#define _PATH_RESOLV _ROOT_PATH "/etc/ppp/resolv.conf" -+#define _PATH_OUTDIR _ROOT_PATH _PATH_VARRUN "/ppp" -+#define _PATH_RESOLV _PATH_OUTDIR "/resolv.conf" - - #define _PATH_USEROPT ".ppprc" - #define _PATH_PSEUDONYM ".ppp_pseudonym" diff --git a/poky/meta/recipes-connectivity/ppp/ppp_2.4.8.bb b/poky/meta/recipes-connectivity/ppp/ppp_2.4.8.bb deleted file mode 100644 index f9c60d6ba..000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp_2.4.8.bb +++ /dev/null @@ -1,103 +0,0 @@ -SUMMARY = "Point-to-Point Protocol (PPP) support" -DESCRIPTION = "ppp (Paul's PPP Package) is an open source package which implements \ -the Point-to-Point Protocol (PPP) on Linux and Solaris systems." -SECTION = "console/network" -HOMEPAGE = "http://samba.org/ppp/" -BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" -DEPENDS = "libpcap openssl virtual/crypt" -LICENSE = "BSD & GPLv2+ & LGPLv2+ & PD" -LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ - file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ - file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ - file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2" - -SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ - file://makefile.patch \ - file://pppd-resolv-varrun.patch \ - file://makefile-remove-hard-usr-reference.patch \ - file://pon \ - file://poff \ - file://init \ - file://ip-up \ - file://ip-down \ - file://08setupdns \ - file://92removedns \ - file://copts.patch \ - file://pap \ - file://ppp_on_boot \ - file://provider \ - file://ppp@.service \ - file://fix-CVE-2015-3310.patch \ - file://0001-ppp-Remove-unneeded-include.patch \ - file://0001-pppd-Fix-bounds-check-in-EAP-code.patch \ - " - -SRC_URI_append_libc-musl = "\ - file://0001-Fix-build-with-musl.patch \ -" -SRC_URI[md5sum] = "2ca8342b9804be15103fd3f687af701c" -SRC_URI[sha256sum] = "f6bf89beae26b2943dff8f1003533d6a5a4909a0fa6edfbec44fe039bbe61bc6" - -inherit autotools-brokensep systemd - -TARGET_CC_ARCH += " ${LDFLAGS}" -EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" -EXTRA_OECONF = "--disable-strip" - -# Package Makefile computes CFLAGS, referencing COPTS. -# Typically hard-coded to '-O2 -g' in the Makefile's. -# -EXTRA_OEMAKE += ' COPTS="${CFLAGS} -I${STAGING_INCDIR}/openssl -I${S}/include"' - -do_configure () { - oe_runconf -} - -do_install_append () { - make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp - mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d - mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/ - mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/ - install -m 0755 ${WORKDIR}/pon ${D}${bindir}/pon - install -m 0755 ${WORKDIR}/poff ${D}${bindir}/poff - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ppp - install -m 0755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/ - install -m 0755 ${WORKDIR}/ip-down ${D}${sysconfdir}/ppp/ - install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/ - install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ - mkdir -p ${D}${sysconfdir}/chatscripts - mkdir -p ${D}${sysconfdir}/ppp/peers - install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts - install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot - install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ppp@.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' \ - ${D}${systemd_unitdir}/system/ppp@.service - rm -rf ${D}/${mandir}/man8/man8 - chmod u+s ${D}${sbindir}/pppd -} - -do_install_append_libc-musl () { - install -Dm 0644 ${S}/include/net/ppp_defs.h ${D}${includedir}/net/ppp_defs.h -} - -CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" -PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools" -FILES_${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_unitdir}/system/ppp@.service" -FILES_${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so" -FILES_${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/rp-pppoe.so" -FILES_${PN}-radius = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so" -FILES_${PN}-winbind = "${libdir}/pppd/${PV}/winbind.so" -FILES_${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so" -FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so" -FILES_${PN}-l2tp = "${libdir}/pppd/${PV}/*l2tp.so" -FILES_${PN}-tools = "${sbindir}/pppstats ${sbindir}/pppdump" -SUMMARY_${PN}-oa = "Plugin for PPP for PPP-over-ATM support" -SUMMARY_${PN}-oe = "Plugin for PPP for PPP-over-Ethernet support" -SUMMARY_${PN}-radius = "Plugin for PPP for RADIUS support" -SUMMARY_${PN}-winbind = "Plugin for PPP to authenticate against Samba or Windows" -SUMMARY_${PN}-minconn = "Plugin for PPP to set a delay before the idle timeout applies" -SUMMARY_${PN}-password = "Plugin for PPP to get passwords via a pipe" -SUMMARY_${PN}-l2tp = "Plugin for PPP for l2tp support" -SUMMARY_${PN}-tools = "Additional tools for the PPP package" diff --git a/poky/meta/recipes-connectivity/ppp/ppp_2.4.9.bb b/poky/meta/recipes-connectivity/ppp/ppp_2.4.9.bb new file mode 100644 index 000000000..a78992fa5 --- /dev/null +++ b/poky/meta/recipes-connectivity/ppp/ppp_2.4.9.bb @@ -0,0 +1,96 @@ +SUMMARY = "Point-to-Point Protocol (PPP) support" +DESCRIPTION = "ppp (Paul's PPP Package) is an open source package which implements \ +the Point-to-Point Protocol (PPP) on Linux and Solaris systems." +SECTION = "console/network" +HOMEPAGE = "http://samba.org/ppp/" +BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" +DEPENDS = "libpcap openssl virtual/crypt" +LICENSE = "BSD & GPLv2+ & LGPLv2+ & PD" +LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ + file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ + file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ + file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2" + +SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ + file://makefix.patch \ + file://pon \ + file://poff \ + file://init \ + file://ip-up \ + file://ip-down \ + file://08setupdns \ + file://92removedns \ + file://pap \ + file://ppp_on_boot \ + file://provider \ + file://ppp@.service \ + " + +SRC_URI[sha256sum] = "f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d" + +inherit autotools-brokensep systemd + +TARGET_CC_ARCH += " ${LDFLAGS}" +EXTRA_OEMAKE = "CC='${CC}' STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" +EXTRA_OECONF = "--disable-strip" + +# Package Makefile computes CFLAGS, referencing COPTS. +# Typically hard-coded to '-O2 -g' in the Makefile's. +# +EXTRA_OEMAKE += ' COPTS="${CFLAGS} -I${STAGING_INCDIR}/openssl -I${S}/include"' + +do_configure () { + oe_runconf +} + +do_install_append () { + make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp + mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d + mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/ + mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/ + install -m 0755 ${WORKDIR}/pon ${D}${bindir}/pon + install -m 0755 ${WORKDIR}/poff ${D}${bindir}/poff + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ppp + install -m 0755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/ + install -m 0755 ${WORKDIR}/ip-down ${D}${sysconfdir}/ppp/ + install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/ + install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ + mkdir -p ${D}${sysconfdir}/chatscripts + mkdir -p ${D}${sysconfdir}/ppp/peers + install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts + install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot + install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/ppp@.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${systemd_unitdir}/system/ppp@.service + rm -rf ${D}/${mandir}/man8/man8 + chmod u+s ${D}${sbindir}/pppd +} + +do_install_append_libc-musl () { + install -Dm 0644 ${S}/include/net/ppp_defs.h ${D}${includedir}/net/ppp_defs.h +} + +CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" +PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools" +FILES_${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_unitdir}/system/ppp@.service" +FILES_${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so" +FILES_${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/*pppoe.so" +FILES_${PN}-radius = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so" +FILES_${PN}-winbind = "${libdir}/pppd/${PV}/winbind.so" +FILES_${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so" +FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so" +FILES_${PN}-l2tp = "${libdir}/pppd/${PV}/*l2tp.so" +FILES_${PN}-tools = "${sbindir}/pppstats ${sbindir}/pppdump" +SUMMARY_${PN}-oa = "Plugin for PPP for PPP-over-ATM support" +SUMMARY_${PN}-oe = "Plugin for PPP for PPP-over-Ethernet support" +SUMMARY_${PN}-radius = "Plugin for PPP for RADIUS support" +SUMMARY_${PN}-winbind = "Plugin for PPP to authenticate against Samba or Windows" +SUMMARY_${PN}-minconn = "Plugin for PPP to set a delay before the idle timeout applies" +SUMMARY_${PN}-password = "Plugin for PPP to get passwords via a pipe" +SUMMARY_${PN}-l2tp = "Plugin for PPP for l2tp support" +SUMMARY_${PN}-tools = "Additional tools for the PPP package" + +# Ignore compatibility symlink rp-pppoe.so->pppoe.so +INSANE_SKIP_${PN}-oe += "dev-so" diff --git a/poky/meta/recipes-core/busybox/busybox-inittab_1.32.0.bb b/poky/meta/recipes-core/busybox/busybox-inittab_1.32.0.bb index 61fb8cbad..8d0f419f4 100644 --- a/poky/meta/recipes-core/busybox/busybox-inittab_1.32.0.bb +++ b/poky/meta/recipes-core/busybox/busybox-inittab_1.32.0.bb @@ -23,6 +23,53 @@ do_install() { id=`echo ${i} | sed -e 's/^.*;//' -e 's/;.*//'` echo "$id::respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab done + if [ "${USE_VT}" = "1" ]; then + cat <>${D}${sysconfdir}/inittab +# ${base_sbindir}/getty invocations for the runlevels. +# +# The "id" field MUST be the same as the last +# characters of the device (after "tty"). +# +# Format: +# ::: +# + +EOF + + for n in ${SYSVINIT_ENABLED_GETTYS} + do + echo "tty$n:12345:respawn:${base_sbindir}/getty 38400 tty$n" >> ${D}${sysconfdir}/inittab + done + echo "" >> ${D}${sysconfdir}/inittab + fi + +} + +pkg_postinst_${PN} () { +# run this on host and on target +if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then + exit 0 +fi +} + +pkg_postinst_ontarget_${PN} () { +# run this on the target +if [ -e /proc/consoles ]; then + tmp="${SERIAL_CONSOLES_CHECK}" + for i in $tmp + do + j=`echo ${i} | sed -e s/^.*\;//g -e s/\:.*//g` + k=`echo ${i} | sed s/^.*\://g` + if [ -z "`grep ${j} /proc/consoles`" ]; then + if [ -z "${k}" ] || [ -z "`grep ${k} /proc/consoles`" ] || [ ! -e /dev/${j} ]; then + sed -i -e /^.*${j}\ /d -e /^.*${j}$/d /etc/inittab + fi + fi + done + kill -HUP 1 +else + exit 1 +fi } # SERIAL_CONSOLES is generally defined by the MACHINE .conf. @@ -33,3 +80,6 @@ FILES_${PN} = "${sysconfdir}/inittab" CONFFILES_${PN} = "${sysconfdir}/inittab" RCONFLICTS_${PN} = "sysvinit-inittab" + +USE_VT ?= "1" +SYSVINIT_ENABLED_GETTYS ?= "1" diff --git a/poky/meta/recipes-core/busybox/busybox.inc b/poky/meta/recipes-core/busybox/busybox.inc index e0522be72..47fcb5930 100644 --- a/poky/meta/recipes-core/busybox/busybox.inc +++ b/poky/meta/recipes-core/busybox/busybox.inc @@ -309,9 +309,10 @@ do_install () { install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev fi fi - if grep -q "CONFIG_INIT=y" ${B}/.config; then + if grep -q "CONFIG_INIT=y" ${B}/.config && ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','busybox','true','false',d)}; then install -D -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS install -D -m 0755 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK + install -D -m 0755 ${WORKDIR}/rcS.default ${D}${sysconfdir}/default/rcS fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then diff --git a/poky/meta/recipes-core/busybox/busybox/mdev.cfg b/poky/meta/recipes-core/busybox/busybox/mdev.cfg index 6aefe90e4..143e6097c 100644 --- a/poky/meta/recipes-core/busybox/busybox/mdev.cfg +++ b/poky/meta/recipes-core/busybox/busybox/mdev.cfg @@ -9,3 +9,5 @@ CONFIG_SETSID=y CONFIG_CTTYHACK=y CONFIG_FEATURE_SHADOWPASSWDS=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y +CONFIG_FEATURE_MDEV_DAEMON=y diff --git a/poky/meta/recipes-core/busybox/busybox_1.32.0.bb b/poky/meta/recipes-core/busybox/busybox_1.32.0.bb index 8e23b0d4a..3a669444d 100644 --- a/poky/meta/recipes-core/busybox/busybox_1.32.0.bb +++ b/poky/meta/recipes-core/busybox/busybox_1.32.0.bb @@ -33,6 +33,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://getopts.cfg \ file://resize.cfg \ ${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \ + ${@["", "file://rcS.default"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \ ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == 'busybox-mdev')]} \ file://syslog.cfg \ file://unicode.cfg \ diff --git a/poky/meta/recipes-core/busybox/files/mdev b/poky/meta/recipes-core/busybox/files/mdev index 8c9c06e96..2fbdfb073 100755 --- a/poky/meta/recipes-core/busybox/files/mdev +++ b/poky/meta/recipes-core/busybox/files/mdev @@ -1,21 +1,43 @@ #!/bin/sh -mount -t proc proc /proc -mount -t sysfs sysfs /sys -mount -t tmpfs tmpfs /dev -o size=64k,mode=0755 -mkdir /dev/pts /dev/shm -chmod 777 /dev/shm -mount -t devpts devpts /dev/pts -touch /dev/mdev.seq -#sysctl -w kernel.hotplug=/sbin/mdev -echo "/sbin/mdev" > /proc/sys/kernel/hotplug -mdev -s - # -# We might have mounted something over /dev, see if /dev/initctl is there. +# Run the mdev daemon # -if test ! -p /dev/initctl -then - rm -f /dev/initctl - mknod -m 600 /dev/initctl p -fi + +DAEMON="mdev" +PIDFILE="/var/run/$DAEMON.pid" + + +start() { + echo -n "Starting $DAEMON... " + start-stop-daemon -S -b -m -p $PIDFILE -x /sbin/mdev -- -df + [ $? -eq 0 ] && echo "OK" || echo "ERROR" + + # coldplug modules + find /sys/ -name modalias -print0 | \ + xargs -0 sort -u | \ + tr '\n' '\0' | \ + xargs -0 modprobe -abq +} + +stop() { + echo -n "Stopping $DAEMON... " + start-stop-daemon -K -p $PIDFILE + [ $? -eq 0 ] && echo "OK" || echo "ERROR" +} + +restart() { + stop + start +} + +case "$1" in + start|stop|restart) + "$1" + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/poky/meta/recipes-core/busybox/files/rcS.default b/poky/meta/recipes-core/busybox/files/rcS.default new file mode 100644 index 000000000..44c9747e3 --- /dev/null +++ b/poky/meta/recipes-core/busybox/files/rcS.default @@ -0,0 +1,31 @@ +# +# Defaults for the boot scripts in /etc/rcS.d +# + +# Time files in /tmp are kept in days. +TMPTIME=0 +# Set to yes if you want sulogin to be spawned on bootup +SULOGIN=no +# Set to no if you want to be able to login over telnet/rlogin +# before system startup is complete (as soon as inetd is started) +DELAYLOGIN=no +# Assume that the BIOS clock is set to UTC time (recommended) +UTC=yes +# Set VERBOSE to "no" if you would like a more quiet bootup. +VERBOSE=no +# Set EDITMOTD to "no" if you don't want /etc/motd to be edited automatically +EDITMOTD=no +# Whether to fsck root on boot +ENABLE_ROOTFS_FSCK=no +# Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup. +FSCKFIX=yes +# Set TICKADJ to the correct tick value for this specific machine +#TICKADJ=10000 +# Enable caching in populate-volatile.sh +VOLATILE_ENABLE_CACHE=yes +# Indicate whether the rootfs is intended to be read-only or not. +# Setting ROOTFS_READ_ONLY to yes and rebooting will give you a read-only rootfs. +# Normally you should not change this value. +ROOTFS_READ_ONLY=no +# Indicate init system type +INIT_SYSTEM=busybox diff --git a/poky/meta/recipes-core/coreutils/coreutils_8.32.bb b/poky/meta/recipes-core/coreutils/coreutils_8.32.bb index 4eb357e31..320f93bdc 100644 --- a/poky/meta/recipes-core/coreutils/coreutils_8.32.bb +++ b/poky/meta/recipes-core/coreutils/coreutils_8.32.bb @@ -39,6 +39,9 @@ PACKAGECONFIG_class-target ??= "\ # The lib/oe/path.py requires xattr PACKAGECONFIG_class-native ??= "xattr" +# oe-core builds need xattr support +PACKAGECONFIG_class-nativesdk ??= "xattr" + # with, without, depends, rdepends # PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," diff --git a/poky/meta/recipes-core/dropbear/dropbear.inc b/poky/meta/recipes-core/dropbear/dropbear.inc index 080ee26b2..a30f98faa 100644 --- a/poky/meta/recipes-core/dropbear/dropbear.inc +++ b/poky/meta/recipes-core/dropbear/dropbear.inc @@ -58,6 +58,9 @@ EXTRA_OECONF += "\ # This is causing [textrel] QA warning EXTRA_OECONF += "--disable-harden" +# musl does not implement wtmp/logwtmp APIs +EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" + do_install() { install -d ${D}${sysconfdir} \ ${D}${sysconfdir}/init.d \ diff --git a/poky/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch b/poky/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch new file mode 100644 index 000000000..2460d26bd --- /dev/null +++ b/poky/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch @@ -0,0 +1,23 @@ +From dd350f4e2258b5a638bc8fb26a6193147902d292 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89rico=20Nogueira?= +Date: Mon, 30 Nov 2020 18:40:33 -0300 +Subject: [PATCH] ell: add missing include in dhcp-server. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + ell/dhcp-server.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c +index c983ed4..144e83e 100644 +--- a/ell/dhcp-server.c ++++ b/ell/dhcp-server.c +@@ -24,6 +24,7 @@ + #include + #endif + ++#include + #include + #include + #include diff --git a/poky/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch b/poky/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch new file mode 100644 index 000000000..f0ce6f136 --- /dev/null +++ b/poky/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch @@ -0,0 +1,27 @@ +From 277e1eca67fcc23cb31be7b826d83a19d9b89bd2 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 22 Dec 2020 10:30:54 +0000 +Subject: [PATCH] pem.c: do not use rawmemchr() + +This is a glibc-only function, and causes build failures with +alternative libc implementations such as musl. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + ell/pem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ell/pem.c b/ell/pem.c +index 790f2c2..237ae02 100644 +--- a/ell/pem.c ++++ b/ell/pem.c +@@ -224,7 +224,7 @@ static uint8_t *pem_load_buffer(const void *buf, size_t buf_len, + + /* Check that each header line has a key and a colon */ + while (start < end) { +- const char *lf = rawmemchr(start, '\n'); ++ const char *lf = memchr(start, '\n', end - start); + const char *colon = memchr(start, ':', lf - start); + + if (!colon) diff --git a/poky/meta/recipes-core/ell/ell_0.33.bb b/poky/meta/recipes-core/ell/ell_0.33.bb deleted file mode 100644 index 2fa05104f..000000000 --- a/poky/meta/recipes-core/ell/ell_0.33.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Embedded Linux Library" -DESCRIPTION = "The Embedded Linux Library (ELL) provides core, \ -low-level functionality for system daemons. It typically has no \ -dependencies other than the Linux kernel, C standard library, and \ -libdl (for dynamic linking). While ELL is designed to be efficient \ -and compact enough for use on embedded Linux platforms, it is not \ -limited to resource-constrained systems." -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" - -DEPENDS = "dbus" - -inherit autotools pkgconfig - -SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "d9e40e641164150394b74b719b9726fc734f24b2cde679cf5f3be6915c34eded" - -do_configure_prepend () { - mkdir -p ${S}/build-aux -} diff --git a/poky/meta/recipes-core/ell/ell_0.35.bb b/poky/meta/recipes-core/ell/ell_0.35.bb new file mode 100644 index 000000000..ccc54b5ff --- /dev/null +++ b/poky/meta/recipes-core/ell/ell_0.35.bb @@ -0,0 +1,24 @@ +SUMMARY = "Embedded Linux Library" +DESCRIPTION = "The Embedded Linux Library (ELL) provides core, \ +low-level functionality for system daemons. It typically has no \ +dependencies other than the Linux kernel, C standard library, and \ +libdl (for dynamic linking). While ELL is designed to be efficient \ +and compact enough for use on embedded Linux platforms, it is not \ +limited to resource-constrained systems." +SECTION = "libs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" + +DEPENDS = "dbus" + +inherit autotools pkgconfig + +SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-ell-add-missing-include-in-dhcp-server.patch \ + file://0001-pem.c-do-not-use-rawmemchr.patch \ + " +SRC_URI[sha256sum] = "2bfe9da7781f65f1cb1595a5a068a3ae74d4b68b74f287c6f0c892cfe623913f" + +do_configure_prepend () { + mkdir -p ${S}/build-aux +} diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch new file mode 100644 index 000000000..508c8c3ba --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch @@ -0,0 +1,26 @@ +From b833254bcc9fcf4cdc2572027b1154d799535ca4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 20 Dec 2020 22:01:43 +0100 +Subject: [PATCH] gio/tests/codegen.py: bump timeout to 100 seconds + +This may be necessary on overloaded CI systems. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + gio/tests/codegen.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py +index 51de0ed..ca98c9d 100644 +--- a/gio/tests/codegen.py ++++ b/gio/tests/codegen.py +@@ -51,7 +51,7 @@ class TestCodegen(unittest.TestCase): + cwd = '' + + def setUp(self): +- self.timeout_seconds = 10 # seconds per test ++ self.timeout_seconds = 100 # seconds per test + self.tmpdir = tempfile.TemporaryDirectory() + self.cwd = os.getcwd() + os.chdir(self.tmpdir.name) diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index 2b8e93051..4cbcc29a5 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From 85931fbb981b5aae38f1c1370d5d3c091cb862b8 Mon Sep 17 00:00:00 2001 +From 011c9f024b6475d31e7d5432a38d00fb67eaea40 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb deleted file mode 100644 index 1f8366085..000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb +++ /dev/null @@ -1,49 +0,0 @@ -require glib.inc - -PE = "1" - -SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ - file://run-ptest \ - file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \ - file://Enable-more-tests-while-cross-compiling.patch \ - file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ - file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ - file://0001-Do-not-ignore-return-value-of-write.patch \ - file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ - file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ - file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ - file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ - file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ - " - -SRC_URI_append_class-native = " file://relocate-modules.patch" - -SRC_URI[sha256sum] = "ec390bed4e8dd0f89e918f385e8d4cfd7470b1ef7c1ce93ec5c4fc6e3c6a17c4" - -# Find any meson cross files in FILESPATH that are relevant for the current -# build (using siteinfo) and add them to EXTRA_OEMESON. -inherit siteinfo -def find_meson_cross_files(d): - if bb.data.inherits_class('native', d): - return "" - - corebase = d.getVar("COREBASE") - import collections - sitedata = siteinfo_data(d) - # filename -> found - files = collections.OrderedDict() - for path in d.getVar("FILESPATH").split(":"): - for element in sitedata: - filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) - - items = ["--cross-file=" + k for k,v in files.items() if v] - d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) - items = ["%s:%s" % (k, "True" if v else "False") for k,v in files.items()] - d.appendVarFlag("do_configure", "file-checksums", " " + " ".join(items)) - -python () { - find_meson_cross_files(d) -} diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.4.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.4.bb new file mode 100644 index 000000000..70e8aa878 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.4.bb @@ -0,0 +1,50 @@ +require glib.inc + +PE = "1" + +SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ + file://run-ptest \ + file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \ + file://Enable-more-tests-while-cross-compiling.patch \ + file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ + file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ + file://0001-Do-not-ignore-return-value-of-write.patch \ + file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ + file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ + file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ + file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ + file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ + file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ + " + +SRC_URI_append_class-native = " file://relocate-modules.patch" + +SRC_URI[sha256sum] = "97df8670e32f9fd4f7392b0980e661dd625012015d58350da1e58e343f4af984" + +# Find any meson cross files in FILESPATH that are relevant for the current +# build (using siteinfo) and add them to EXTRA_OEMESON. +inherit siteinfo +def find_meson_cross_files(d): + if bb.data.inherits_class('native', d): + return "" + + corebase = d.getVar("COREBASE") + import collections + sitedata = siteinfo_data(d) + # filename -> found + files = collections.OrderedDict() + for path in d.getVar("FILESPATH").split(":"): + for element in sitedata: + filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) + files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) + + items = ["--cross-file=" + k for k,v in files.items() if v] + d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) + items = ["%s:%s" % (k, "True" if v else "False") for k,v in files.items()] + d.appendVarFlag("do_configure", "file-checksums", " " + " ".join(items)) + +python () { + find_meson_cross_files(d) +} diff --git a/poky/meta/recipes-core/glibc/glibc/0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch b/poky/meta/recipes-core/glibc/glibc/0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch new file mode 100644 index 000000000..a458a2a22 --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch @@ -0,0 +1,110 @@ +From 75a193b7611bade31a150dfcc528b973e3d46231 Mon Sep 17 00:00:00 2001 +From: Adhemerval Zanella +Date: Mon, 2 Nov 2020 16:18:29 -0300 +Subject: [PATCH] linux: Allow adjtime with NULL argument [BZ #26833] + +The adjtime interface allows return the amount of time remaining +from any previous adjustment that has not yet been completed by +passing a NULL as first argument. This was introduced with y2038 +support 0308077e3a. + +Checked on i686-linux-gnu. + +Reviewed-by: Lukasz Majewski +Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=75a193b7611bade31a150dfcc528b973e3d46231] +Signed-off-by: Peter Kjellerstedt +--- + sysdeps/unix/sysv/linux/adjtime.c | 11 +++++--- + time/Makefile | 3 ++- + time/tst-adjtime.c | 44 +++++++++++++++++++++++++++++++ + 3 files changed, 54 insertions(+), 4 deletions(-) + create mode 100644 time/tst-adjtime.c + +diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c +index 3f9a4ea2eb..6d1d1b6af2 100644 +--- a/sysdeps/unix/sysv/linux/adjtime.c ++++ b/sysdeps/unix/sysv/linux/adjtime.c +@@ -68,11 +68,16 @@ libc_hidden_def (__adjtime64) + int + __adjtime (const struct timeval *itv, struct timeval *otv) + { +- struct __timeval64 itv64, otv64; ++ struct __timeval64 itv64, *pitv64 = NULL; ++ struct __timeval64 otv64; + int retval; + +- itv64 = valid_timeval_to_timeval64 (*itv); +- retval = __adjtime64 (&itv64, otv != NULL ? &otv64 : NULL); ++ if (itv != NULL) ++ { ++ itv64 = valid_timeval_to_timeval64 (*itv); ++ pitv64 = &itv64; ++ } ++ retval = __adjtime64 (pitv64, otv != NULL ? &otv64 : NULL); + if (otv != NULL) + *otv = valid_timeval64_to_timeval (otv64); + +diff --git a/time/Makefile b/time/Makefile +index 26aa835166..f27a75a115 100644 +--- a/time/Makefile ++++ b/time/Makefile +@@ -47,7 +47,8 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \ + tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \ + tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \ + tst-tzname tst-y2039 bug-mktime4 tst-strftime2 tst-strftime3 \ +- tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 ++ tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 \ ++ tst-adjtime + + include ../Rules + +diff --git a/time/tst-adjtime.c b/time/tst-adjtime.c +new file mode 100644 +index 0000000000..ae2b37cdab +--- /dev/null ++++ b/time/tst-adjtime.c +@@ -0,0 +1,44 @@ ++/* Basic tests for adjtime. ++ Copyright (C) 2020 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++#include ++#include ++ ++ ++static int ++do_test (void) ++{ ++ /* Check if the interface allows getting the amount of time remaining ++ from any previous adjustment that has not yet been completed. This ++ is a non-privileged function of adjtime. */ ++ struct timeval tv; ++ int r = adjtime (NULL, &tv); ++ if (r == -1) ++ { ++ if (errno == ENOSYS) ++ FAIL_UNSUPPORTED ("adjtime unsupported"); ++ FAIL_EXIT1 ("adjtime (NULL, ...) failed: %m"); ++ } ++ ++ return 0; ++} ++ ++#include diff --git a/poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch b/poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch new file mode 100644 index 000000000..134b4e361 --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch @@ -0,0 +1,155 @@ +From 228edd356f03bf62dcf2b1335f25d43c602ee68d Mon Sep 17 00:00:00 2001 +From: Michael Colavita +Date: Thu, 19 Nov 2020 11:44:40 -0500 +Subject: [PATCH] iconv: Fix incorrect UCS4 inner loop bounds (BZ#26923) + +Previously, in UCS4 conversion routines we limit the number of +characters we examine to the minimum of the number of characters in the +input and the number of characters in the output. This is not the +correct behavior when __GCONV_IGNORE_ERRORS is set, as we do not consume +an output character when we skip a code unit. Instead, track the input +and output pointers and terminate the loop when either reaches its +limit. + +This resolves assertion failures when resetting the input buffer in a step of +iconv, which assumes that the input will be fully consumed given sufficient +output space. + +Upstream-Status: Backport [git://sourceware.org/git/glibc.git] +CVE: CVE-2020-29562 +Signed-off-by: Zhixiong Chi +--- + iconv/Makefile | 2 +- + iconv/gconv_simple.c | 16 ++++---------- + iconv/tst-iconv8.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 55 insertions(+), 13 deletions(-) + create mode 100644 iconv/tst-iconv8.c + +diff --git a/iconv/Makefile b/iconv/Makefile +index 30bf996d3a..f9b51e23ec 100644 +--- a/iconv/Makefile ++++ b/iconv/Makefile +@@ -44,7 +44,7 @@ CFLAGS-linereader.c += -DNO_TRANSLITERATION + CFLAGS-simple-hash.c += -I../locale + + tests = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5 tst-iconv6 \ +- tst-iconv7 tst-iconv-mt tst-iconv-opt ++ tst-iconv7 tst-iconv8 tst-iconv-mt tst-iconv-opt + + others = iconv_prog iconvconfig + install-others-programs = $(inst_bindir)/iconv +diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c +index d4797fba17..963b29f246 100644 +--- a/iconv/gconv_simple.c ++++ b/iconv/gconv_simple.c +@@ -239,11 +239,9 @@ ucs4_internal_loop (struct __gconv_step *step, + int flags = step_data->__flags; + const unsigned char *inptr = *inptrp; + unsigned char *outptr = *outptrp; +- size_t n_convert = MIN (inend - inptr, outend - outptr) / 4; + int result; +- size_t cnt; + +- for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) ++ for (; inptr + 4 <= inend && outptr + 4 <= outend; inptr += 4) + { + uint32_t inval; + +@@ -307,11 +305,9 @@ ucs4_internal_loop_unaligned (struct __gconv_step *step, + int flags = step_data->__flags; + const unsigned char *inptr = *inptrp; + unsigned char *outptr = *outptrp; +- size_t n_convert = MIN (inend - inptr, outend - outptr) / 4; + int result; +- size_t cnt; + +- for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) ++ for (; inptr + 4 <= inend && outptr + 4 <= outend; inptr += 4) + { + if (__glibc_unlikely (inptr[0] > 0x80)) + { +@@ -613,11 +609,9 @@ ucs4le_internal_loop (struct __gconv_step *step, + int flags = step_data->__flags; + const unsigned char *inptr = *inptrp; + unsigned char *outptr = *outptrp; +- size_t n_convert = MIN (inend - inptr, outend - outptr) / 4; + int result; +- size_t cnt; + +- for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) ++ for (; inptr + 4 <= inend && outptr + 4 <= outend; inptr += 4) + { + uint32_t inval; + +@@ -684,11 +678,9 @@ ucs4le_internal_loop_unaligned (struct __gconv_step *step, + int flags = step_data->__flags; + const unsigned char *inptr = *inptrp; + unsigned char *outptr = *outptrp; +- size_t n_convert = MIN (inend - inptr, outend - outptr) / 4; + int result; +- size_t cnt; + +- for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) ++ for (; inptr + 4 <= inend && outptr + 4 <= outend; inptr += 4) + { + if (__glibc_unlikely (inptr[3] > 0x80)) + { +diff --git a/iconv/tst-iconv8.c b/iconv/tst-iconv8.c +new file mode 100644 +index 0000000000..0b92b19f66 +--- /dev/null ++++ b/iconv/tst-iconv8.c +@@ -0,0 +1,50 @@ ++/* Test iconv behavior on UCS4 conversions with //IGNORE. ++ Copyright (C) 2020 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++/* Derived from BZ #26923 */ ++#include ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ iconv_t cd = iconv_open ("UTF-8//IGNORE", "ISO-10646/UCS4/"); ++ TEST_VERIFY_EXIT (cd != (iconv_t) -1); ++ ++ /* ++ * Convert sequence beginning with an irreversible character into buffer that ++ * is too small. ++ */ ++ char input[12] = "\xe1\x80\xa1" "AAAAAAAAA"; ++ char *inptr = input; ++ size_t insize = sizeof (input); ++ char output[6]; ++ char *outptr = output; ++ size_t outsize = sizeof (output); ++ ++ TEST_VERIFY (iconv (cd, &inptr, &insize, &outptr, &outsize) == -1); ++ TEST_VERIFY (errno == E2BIG); ++ ++ TEST_VERIFY_EXIT (iconv_close (cd) != -1); ++ ++ return 0; ++} ++ ++#include +-- +2.17.0 + diff --git a/poky/meta/recipes-core/glibc/glibc/CVE-2020-29573.patch b/poky/meta/recipes-core/glibc/glibc/CVE-2020-29573.patch new file mode 100644 index 000000000..0f54d72ca --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/CVE-2020-29573.patch @@ -0,0 +1,56 @@ +From 681900d29683722b1cb0a8e565a0585846ec5a61 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Tue, 22 Sep 2020 19:07:48 +0200 +Subject: [PATCH] x86: Harden printf against non-normal long double values (bug + 26649) + +The behavior of isnan/__builtin_isnan on bit patterns that do not +correspond to something that the CPU would produce from valid inputs +is currently under-defined in the toolchain. (The GCC built-in and +glibc disagree.) + +The isnan check in PRINTF_FP_FETCH in stdio-common/printf_fp.c +assumes the GCC behavior that returns true for non-normal numbers +which are not specified as NaN. (The glibc implementation returns +false for such numbers.) + +At present, passing non-normal numbers to __mpn_extract_long_double +causes this function to produce irregularly shaped multi-precision +integers, triggering undefined behavior in __printf_fp_l. + +With GCC 10 and glibc 2.32, this behavior is not visible because +__builtin_isnan is used, which avoids calling +__mpn_extract_long_double in this case. This commit updates the +implementation of __mpn_extract_long_double so that regularly shaped +multi-precision integers are produced in this case, avoiding +undefined behavior in __printf_fp_l. + +Upstream-Status: Backport [git://sourceware.org/git/glibc.git] +CVE: CVE-2020-29573 +Signed-off-by: Zhixiong Chi +--- + sysdeps/i386/ldbl2mpn.c | 8 ++++ + 1 files changed, 8 insertions(+) + +diff --git a/sysdeps/i386/ldbl2mpn.c b/sysdeps/i386/ldbl2mpn.c +index ec8464eef7..23afedfb67 100644 +--- a/sysdeps/i386/ldbl2mpn.c ++++ b/sysdeps/i386/ldbl2mpn.c +@@ -115,6 +115,14 @@ __mpn_extract_long_double (mp_ptr res_ptr, mp_size_t size, + && res_ptr[N - 1] == 0) + /* Pseudo zero. */ + *expt = 0; ++ else ++ /* Unlike other floating point formats, the most significant bit ++ is explicit and expected to be set for normal numbers. Set it ++ in case it is cleared in the input. Otherwise, callers will ++ not be able to produce the expected multi-precision integer ++ layout by shifting. */ ++ res_ptr[N - 1] |= (mp_limb_t) 1 << (LDBL_MANT_DIG - 1 ++ - ((N - 1) * BITS_PER_MP_LIMB)); + + return N; + } +-- +2.17.0 + diff --git a/poky/meta/recipes-core/glibc/glibc_2.32.bb b/poky/meta/recipes-core/glibc/glibc_2.32.bb index 2a0e46438..b850c28c7 100644 --- a/poky/meta/recipes-core/glibc/glibc_2.32.bb +++ b/poky/meta/recipes-core/glibc/glibc_2.32.bb @@ -43,6 +43,9 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \ file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \ file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \ + file://0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch \ + file://CVE-2020-29562.patch \ + file://CVE-2020-29573.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}" diff --git a/poky/meta/recipes-core/initscripts/init-system-helpers_1.58.bb b/poky/meta/recipes-core/initscripts/init-system-helpers_1.58.bb deleted file mode 100644 index b591f412c..000000000 --- a/poky/meta/recipes-core/initscripts/init-system-helpers_1.58.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "helper tools for all init systems" -DESCRIPTION = "This package contains helper tools that are necessary for switching between \ -the various init systems that Debian contains (e. g. sysvinit or \ -systemd). An example is deb-systemd-helper, a script that enables systemd unit \ -files without depending on a running systemd. \ -\ -It also includes the \"service\", \"invoke-rc.d\", and \"update-rc.d\" scripts which \ -provide an abstraction for enabling, disabling, starting, and stopping \ -services for all supported Debian init systems as specified by the policy. \ -\ -While this package is maintained by pkg-systemd-maintainers, it is NOT \ -specific to systemd at all. Maintainers of other init systems are welcome to \ -include their helpers in this package." -HOMEPAGE = "https://salsa.debian.org/debian/init-system-helpers" -SECTION = "base" -LICENSE = "BSD-3-Clause & GPLv2" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072" - -SRCREV = "6a1860c6f5ad295af605ddf588933544e7c24ce1" -SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https" - -S = "${WORKDIR}/git" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - install -d -m 0755 ${D}${sbindir} - install -m 0755 ${S}/script/invoke-rc.d ${D}${sbindir} - install -m 0755 ${S}/script/service ${D}${sbindir} -} - -PACKAGES += "${PN}-invoke-rc.d ${PN}-service" - -FILES_${PN} = "" -FILES_${PN}-invoke-rc.d = "${sbindir}/invoke-rc.d" -FILES_${PN}-service = "${sbindir}/service" - -ALLOW_EMPTY_${PN} = "1" - -RRECOMMENDS_${PN} += "${PN}-invoke-rc.d ${PN}-service" diff --git a/poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb b/poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb new file mode 100644 index 000000000..33977e66c --- /dev/null +++ b/poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb @@ -0,0 +1,41 @@ +SUMMARY = "helper tools for all init systems" +DESCRIPTION = "This package contains helper tools that are necessary for switching between \ +the various init systems that Debian contains (e. g. sysvinit or \ +systemd). An example is deb-systemd-helper, a script that enables systemd unit \ +files without depending on a running systemd. \ +\ +It also includes the \"service\", \"invoke-rc.d\", and \"update-rc.d\" scripts which \ +provide an abstraction for enabling, disabling, starting, and stopping \ +services for all supported Debian init systems as specified by the policy. \ +\ +While this package is maintained by pkg-systemd-maintainers, it is NOT \ +specific to systemd at all. Maintainers of other init systems are welcome to \ +include their helpers in this package." +HOMEPAGE = "https://salsa.debian.org/debian/init-system-helpers" +SECTION = "base" +LICENSE = "BSD-3-Clause & GPLv2" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072" + +SRCREV = "dbd9197569c0935029acd5c9b02b84c68fd937ee" +SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https" + +S = "${WORKDIR}/git" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -d -m 0755 ${D}${sbindir} + install -m 0755 ${S}/script/invoke-rc.d ${D}${sbindir} + install -m 0755 ${S}/script/service ${D}${sbindir} +} + +PACKAGES += "${PN}-invoke-rc.d ${PN}-service" + +FILES_${PN} = "" +FILES_${PN}-invoke-rc.d = "${sbindir}/invoke-rc.d" +FILES_${PN}-service = "${sbindir}/service" + +ALLOW_EMPTY_${PN} = "1" + +RRECOMMENDS_${PN} += "${PN}-invoke-rc.d ${PN}-service" diff --git a/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh index 02f0351fc..a63e71b78 100755 --- a/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh +++ b/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh @@ -74,7 +74,7 @@ test "$VERBOSE" != no && echo "Activating swap" # # Check the root filesystem. # -if test -f /fastboot || test $rootcheck = no +if test -f /fastboot || test "$rootcheck" = "no" then test $rootcheck = yes && echo "Fast boot, no filesystem check" else diff --git a/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh index c719be5d9..2839d57cb 100755 --- a/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh +++ b/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh @@ -19,15 +19,21 @@ test "$VERBOSE" != no && echo "Mounting local filesystems..." mount -at nonfs,nosmbfs,noncpfs 2>/dev/null -# -# We might have mounted something over /dev, see if /dev/initctl is there. -# -if test ! -p /dev/initctl -then - rm -f /dev/initctl - mknod -m 600 /dev/initctl p + +# We might have mounted something over /run; see if +# /dev/initctl is present. Look for +# /sbin/init.sysvinit to verify that sysvinit (and +# not busybox or systemd) is installed as default init). +INITCTL="/dev/initctl" +if [ ! -p "$INITCTL" ] && [ "${INIT_SYSTEM}" = "sysvinit" ]; then + # Create new control channel + rm -f "$INITCTL" + mknod -m 600 "$INITCTL" p + + # Reopen control channel. + PID="$(pidof -s /sbin/init || echo 1)" + [ -n "$PID" ] && kill -s USR1 "$PID" fi -kill -USR1 1 # # Execute swapon command again, in case we want to swap to diff --git a/poky/meta/recipes-core/kbd/kbd_2.3.0.bb b/poky/meta/recipes-core/kbd/kbd_2.3.0.bb deleted file mode 100644 index 529f49bef..000000000 --- a/poky/meta/recipes-core/kbd/kbd_2.3.0.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Keytable files and keyboard utilities" -HOMEPAGE = "http://www.kbd-project.org/" -# everything minus console-fonts is GPLv2+ -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" - -inherit autotools gettext pkgconfig - -DEPENDS += "flex-native" - -RREPLACES_${PN} = "console-tools" -RPROVIDES_${PN} = "console-tools" -RCONFLICTS_${PN} = "console-tools" - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ - " - -SRC_URI[sha256sum] = "685056143cb8effd0a1d44b5c391eb50d80dcfd014b1a4d6e2650a28d61cb82a" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ - " - -PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," - -PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" - -FILES_${PN}-consolefonts = "${datadir}/consolefonts" -FILES_${PN}-consoletrans = "${datadir}/consoletrans" -FILES_${PN}-keymaps = "${datadir}/keymaps" -FILES_${PN}-unimaps = "${datadir}/unimaps" - -inherit update-alternatives - -ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}" -ALTERNATIVE_PRIORITY = "100" - -BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-core/kbd/kbd_2.4.0.bb b/poky/meta/recipes-core/kbd/kbd_2.4.0.bb new file mode 100644 index 000000000..65ba70bf4 --- /dev/null +++ b/poky/meta/recipes-core/kbd/kbd_2.4.0.bb @@ -0,0 +1,45 @@ +SUMMARY = "Keytable files and keyboard utilities" +HOMEPAGE = "http://www.kbd-project.org/" +# everything minus console-fonts is GPLv2+ +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" + +inherit autotools gettext pkgconfig + +DEPENDS += "flex-native" + +RREPLACES_${PN} = "console-tools" +RPROVIDES_${PN} = "console-tools" +RCONFLICTS_${PN} = "console-tools" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ + " + +SRC_URI[sha256sum] = "55f0740458cfd3a84e775e50d7e8b92dc01846db1edad8e2411ccc293ece9b9f" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ + " + +PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," + +PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" + +FILES_${PN}-consolefonts = "${datadir}/consolefonts" +FILES_${PN}-consoletrans = "${datadir}/consoletrans" +FILES_${PN}-keymaps = "${datadir}/keymaps" +FILES_${PN}-unimaps = "${datadir}/unimaps" + +do_install_append () { + if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ] \ + && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then + mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd + fi +} + +inherit update-alternatives + +ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}" +ALTERNATIVE_PRIORITY = "100" + +BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-core/meta/buildtools-tarball.bb b/poky/meta/recipes-core/meta/buildtools-tarball.bb index 560b8d67b..9da81d552 100644 --- a/poky/meta/recipes-core/meta/buildtools-tarball.bb +++ b/poky/meta/recipes-core/meta/buildtools-tarball.bb @@ -67,7 +67,7 @@ create_sdk_files_append () { # Generate new (mini) sdk-environment-setup file script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}} touch $script - echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:$PATH' >> $script + echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${sbindir_nativesdk}:${SDKPATHNATIVE}${base_bindir_nativesdk}:${SDKPATHNATIVE}${base_sbindir_nativesdk}:$PATH' >> $script echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script diff --git a/poky/meta/recipes-core/meta/wic-tools.bb b/poky/meta/recipes-core/meta/wic-tools.bb index 3e7d0ed48..bc6cc0d18 100644 --- a/poky/meta/recipes-core/meta/wic-tools.bb +++ b/poky/meta/recipes-core/meta/wic-tools.bb @@ -3,14 +3,15 @@ SUMMARY = "A meta recipe to build native tools used by wic." LICENSE = "MIT" DEPENDS = "\ - parted-native syslinux-native gptfdisk-native dosfstools-native \ + parted-native gptfdisk-native dosfstools-native \ mtools-native bmap-tools-native grub-native cdrtools-native \ btrfs-tools-native squashfs-tools-native pseudo-native \ e2fsprogs-native util-linux-native tar-native\ " -DEPENDS_append_x86 = " syslinux grub-efi systemd-boot" -DEPENDS_append_x86-64 = " syslinux grub-efi systemd-boot" -DEPENDS_append_x86-x32 = " syslinux grub-efi" +DEPENDS_append_x86 = " syslinux-native syslinux grub-efi systemd-boot" +DEPENDS_append_x86-64 = " syslinux-native syslinux grub-efi systemd-boot" +DEPENDS_append_x86-x32 = " syslinux-native syslinux grub-efi" +DEPENDS_append_aarch64 = " grub-efi systemd-boot" INHIBIT_DEFAULT_DEPS = "1" diff --git a/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch b/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch index d2bd587e3..35c8b6574 100644 --- a/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch +++ b/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch @@ -43,8 +43,6 @@ Signed-off-by: Khem Raj crt/x86_64/crtn.s | 1 + 28 files changed, 28 insertions(+) -diff --git a/crt/aarch64/crti.s b/crt/aarch64/crti.s -index 775df0ac..0f7c23a9 100644 --- a/crt/aarch64/crti.s +++ b/crt/aarch64/crti.s @@ -1,3 +1,4 @@ @@ -52,8 +50,6 @@ index 775df0ac..0f7c23a9 100644 .section .init .global _init .type _init,%function -diff --git a/crt/aarch64/crtn.s b/crt/aarch64/crtn.s -index 73cab692..d62fc129 100644 --- a/crt/aarch64/crtn.s +++ b/crt/aarch64/crtn.s @@ -1,3 +1,4 @@ @@ -61,8 +57,6 @@ index 73cab692..d62fc129 100644 .section .init ldp x29,x30,[sp],#16 ret -diff --git a/crt/arm/crti.s b/crt/arm/crti.s -index 18dc1e41..8df72979 100644 --- a/crt/arm/crti.s +++ b/crt/arm/crti.s @@ -1,3 +1,4 @@ @@ -70,8 +64,6 @@ index 18dc1e41..8df72979 100644 .syntax unified .section .init -diff --git a/crt/arm/crtn.s b/crt/arm/crtn.s -index dc020f92..7451355b 100644 --- a/crt/arm/crtn.s +++ b/crt/arm/crtn.s @@ -1,3 +1,4 @@ @@ -79,8 +71,6 @@ index dc020f92..7451355b 100644 .syntax unified .section .init -diff --git a/crt/i386/crti.s b/crt/i386/crti.s -index d2682a20..2823fc3b 100644 --- a/crt/i386/crti.s +++ b/crt/i386/crti.s @@ -1,3 +1,4 @@ @@ -88,8 +78,6 @@ index d2682a20..2823fc3b 100644 .section .init .global _init _init: -diff --git a/crt/i386/crtn.s b/crt/i386/crtn.s -index f3b61e01..04fb1646 100644 --- a/crt/i386/crtn.s +++ b/crt/i386/crtn.s @@ -1,3 +1,4 @@ @@ -97,8 +85,6 @@ index f3b61e01..04fb1646 100644 .section .init add $12,%esp ret -diff --git a/crt/microblaze/crti.s b/crt/microblaze/crti.s -index ed1c2fa4..29ee4733 100644 --- a/crt/microblaze/crti.s +++ b/crt/microblaze/crti.s @@ -1,3 +1,4 @@ @@ -106,8 +92,6 @@ index ed1c2fa4..29ee4733 100644 .section .init .global _init .align 2 -diff --git a/crt/microblaze/crtn.s b/crt/microblaze/crtn.s -index 1e02c984..c2083749 100644 --- a/crt/microblaze/crtn.s +++ b/crt/microblaze/crtn.s @@ -1,3 +1,4 @@ @@ -115,8 +99,6 @@ index 1e02c984..c2083749 100644 .section .init lwi r15, r1, 0 rtsd r15, 8 -diff --git a/crt/mips/crti.s b/crt/mips/crti.s -index 39dee380..0211764e 100644 --- a/crt/mips/crti.s +++ b/crt/mips/crti.s @@ -1,3 +1,4 @@ @@ -124,8 +106,6 @@ index 39dee380..0211764e 100644 .set noreorder .section .init -diff --git a/crt/mips/crtn.s b/crt/mips/crtn.s -index 506a04b7..606490cf 100644 --- a/crt/mips/crtn.s +++ b/crt/mips/crtn.s @@ -1,3 +1,4 @@ @@ -133,8 +113,6 @@ index 506a04b7..606490cf 100644 .set noreorder .section .init -diff --git a/crt/mips64/crti.s b/crt/mips64/crti.s -index c962dd09..f2c19cdd 100644 --- a/crt/mips64/crti.s +++ b/crt/mips64/crti.s @@ -1,3 +1,4 @@ @@ -142,8 +120,6 @@ index c962dd09..f2c19cdd 100644 .set noreorder .section .init -diff --git a/crt/mips64/crtn.s b/crt/mips64/crtn.s -index f3930b24..68903ffa 100644 --- a/crt/mips64/crtn.s +++ b/crt/mips64/crtn.s @@ -1,3 +1,4 @@ @@ -151,8 +127,6 @@ index f3930b24..68903ffa 100644 .set noreorder .section .init -diff --git a/crt/mipsn32/crti.s b/crt/mipsn32/crti.s -index 14fa28d9..a35387d3 100644 --- a/crt/mipsn32/crti.s +++ b/crt/mipsn32/crti.s @@ -1,3 +1,4 @@ @@ -160,8 +134,6 @@ index 14fa28d9..a35387d3 100644 .set noreorder .section .init .global _init -diff --git a/crt/mipsn32/crtn.s b/crt/mipsn32/crtn.s -index dccd7e89..bdb6e561 100644 --- a/crt/mipsn32/crtn.s +++ b/crt/mipsn32/crtn.s @@ -1,3 +1,4 @@ @@ -169,8 +141,6 @@ index dccd7e89..bdb6e561 100644 .set noreorder .section .init ld $gp, 16($sp) -diff --git a/crt/or1k/crti.s b/crt/or1k/crti.s -index 7e741459..919369ca 100644 --- a/crt/or1k/crti.s +++ b/crt/or1k/crti.s @@ -1,3 +1,4 @@ @@ -178,8 +148,6 @@ index 7e741459..919369ca 100644 .section .init .global _init _init: -diff --git a/crt/or1k/crtn.s b/crt/or1k/crtn.s -index 4185a027..d670b327 100644 --- a/crt/or1k/crtn.s +++ b/crt/or1k/crtn.s @@ -1,3 +1,4 @@ @@ -187,8 +155,6 @@ index 4185a027..d670b327 100644 .section .init l.lwz r9,0(r1) l.jr r9 -diff --git a/crt/powerpc/crti.s b/crt/powerpc/crti.s -index 60461ca4..b748ca48 100644 --- a/crt/powerpc/crti.s +++ b/crt/powerpc/crti.s @@ -1,3 +1,4 @@ @@ -196,8 +162,6 @@ index 60461ca4..b748ca48 100644 .section .init .align 2 .global _init -diff --git a/crt/powerpc/crtn.s b/crt/powerpc/crtn.s -index 2d14a6f0..d989e36f 100644 --- a/crt/powerpc/crtn.s +++ b/crt/powerpc/crtn.s @@ -1,3 +1,4 @@ @@ -205,8 +169,6 @@ index 2d14a6f0..d989e36f 100644 .section .init .align 2 lwz 0,36(1) -diff --git a/crt/powerpc64/crti.s b/crt/powerpc64/crti.s -index 9f712f0e..d3323a67 100644 --- a/crt/powerpc64/crti.s +++ b/crt/powerpc64/crti.s @@ -1,3 +1,4 @@ @@ -214,8 +176,6 @@ index 9f712f0e..d3323a67 100644 .section .init .align 2 .global _init -diff --git a/crt/powerpc64/crtn.s b/crt/powerpc64/crtn.s -index a7a9f4a0..5e71ae66 100644 --- a/crt/powerpc64/crtn.s +++ b/crt/powerpc64/crtn.s @@ -1,3 +1,4 @@ @@ -223,8 +183,6 @@ index a7a9f4a0..5e71ae66 100644 .section .init .align 2 addi 1, 1, 32 -diff --git a/crt/s390x/crti.s b/crt/s390x/crti.s -index f453205b..3da3c5e1 100644 --- a/crt/s390x/crti.s +++ b/crt/s390x/crti.s @@ -1,3 +1,4 @@ @@ -232,8 +190,6 @@ index f453205b..3da3c5e1 100644 .section .init .align 2 .global _init -diff --git a/crt/s390x/crtn.s b/crt/s390x/crtn.s -index 06066dc9..bfd55caf 100644 --- a/crt/s390x/crtn.s +++ b/crt/s390x/crtn.s @@ -1,3 +1,4 @@ @@ -241,8 +197,6 @@ index 06066dc9..bfd55caf 100644 .section .init .align 2 lmg %r14, %r15, 272(%r15) -diff --git a/crt/sh/crti.s b/crt/sh/crti.s -index d99bfd5c..77d61c51 100644 --- a/crt/sh/crti.s +++ b/crt/sh/crti.s @@ -1,3 +1,4 @@ @@ -250,8 +204,6 @@ index d99bfd5c..77d61c51 100644 .section .init .global _init .type _init, @function -diff --git a/crt/sh/crtn.s b/crt/sh/crtn.s -index 958ce951..29deb5be 100644 --- a/crt/sh/crtn.s +++ b/crt/sh/crtn.s @@ -1,3 +1,4 @@ @@ -259,8 +211,6 @@ index 958ce951..29deb5be 100644 .section .init lds.l @r15+, pr mov.l @r15+, r14 -diff --git a/crt/x32/crti.s b/crt/x32/crti.s -index 4788968b..8668b7c7 100644 --- a/crt/x32/crti.s +++ b/crt/x32/crti.s @@ -1,3 +1,4 @@ @@ -268,8 +218,6 @@ index 4788968b..8668b7c7 100644 .section .init .global _init _init: -diff --git a/crt/x32/crtn.s b/crt/x32/crtn.s -index 29198b77..ef73d295 100644 --- a/crt/x32/crtn.s +++ b/crt/x32/crtn.s @@ -1,3 +1,4 @@ @@ -277,8 +225,6 @@ index 29198b77..ef73d295 100644 .section .init pop %rax ret -diff --git a/crt/x86_64/crti.s b/crt/x86_64/crti.s -index 4788968b..8668b7c7 100644 --- a/crt/x86_64/crti.s +++ b/crt/x86_64/crti.s @@ -1,3 +1,4 @@ @@ -286,8 +232,6 @@ index 4788968b..8668b7c7 100644 .section .init .global _init _init: -diff --git a/crt/x86_64/crtn.s b/crt/x86_64/crtn.s -index 29198b77..ef73d295 100644 --- a/crt/x86_64/crtn.s +++ b/crt/x86_64/crtn.s @@ -1,3 +1,4 @@ @@ -295,6 +239,3 @@ index 29198b77..ef73d295 100644 .section .init pop %rax ret --- -2.29.1 - diff --git a/poky/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch b/poky/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch index f57aae5f3..0aeb5eb5c 100644 --- a/poky/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch +++ b/poky/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch @@ -34,16 +34,16 @@ Signed-off-by: Serhey Popovych LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS) --- a/ldso/dynlink.c +++ b/ldso/dynlink.c -@@ -24,6 +24,8 @@ - #include "libc.h" - #include "dynlink.h" +@@ -29,6 +29,8 @@ + #define realloc __libc_realloc + #define free __libc_free +#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR + static void error(const char *, ...); #define MAXP2(a,b) (-(-(a)&-(b))) -@@ -1071,7 +1073,7 @@ static struct dso *load_library(const ch +@@ -1094,7 +1096,7 @@ static struct dso *load_library(const ch sys_path = ""; } } diff --git a/poky/meta/recipes-core/musl/musl_git.bb b/poky/meta/recipes-core/musl/musl_git.bb index 23c2072ea..d4e75f918 100644 --- a/poky/meta/recipes-core/musl/musl_git.bb +++ b/poky/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "d91a6cf6e369a79587c5665fce9635e5634ca201" +SRCREV = "1e4204d522670a1d8b8ab85f1cfefa960547e8af" BASEVER = "1.2.1" diff --git a/poky/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch b/poky/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch new file mode 100644 index 000000000..1eb17767a --- /dev/null +++ b/poky/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch @@ -0,0 +1,29 @@ +From 3b3e87934bb6d8511261d7c3d6e39b4f71849272 Mon Sep 17 00:00:00 2001 +From: Nathan Rossi +Date: Mon, 14 Dec 2020 13:39:02 +1000 +Subject: [PATCH] gen-pkgconfig.in: Do not include LDFLAGS in generated pc + files + +Including the LDFLAGS in the pkgconfig output is problematic as OE +includes build host specific paths and options (e.g. uninative and +'-Wl,--dynamic-linker='). + +Upstream-Status: Inappropriate [OE Specific] +Signed-off-by: Nathan Rossi +--- + misc/gen-pkgconfig.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in +index 8f00b824b9..009d215663 100644 +--- a/misc/gen-pkgconfig.in ++++ b/misc/gen-pkgconfig.in +@@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then + fi + + lib_flags= +-for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ ++for opt in -L$libdir @LIBS@ + do + case $opt in + -l*) # LIBS is handled specially below diff --git a/poky/meta/recipes-core/ncurses/ncurses.inc b/poky/meta/recipes-core/ncurses/ncurses.inc index 4b6188966..fe4e8a5d6 100644 --- a/poky/meta/recipes-core/ncurses/ncurses.inc +++ b/poky/meta/recipes-core/ncurses/ncurses.inc @@ -312,7 +312,7 @@ FILES_${PN}-tools = "\ " # 'reset' is a symlink to 'tset' which is in the 'ncurses' package -RDEPENDS_${PN}-tools = "${PN}" +RDEPENDS_${PN}-tools = "${PN} ${PN}-terminfo-base" FILES_${PN}-terminfo = "\ ${datadir}/terminfo \ diff --git a/poky/meta/recipes-core/ncurses/ncurses_6.2.bb b/poky/meta/recipes-core/ncurses/ncurses_6.2.bb index f3c84c287..e7d7396a2 100644 --- a/poky/meta/recipes-core/ncurses/ncurses_6.2.bb +++ b/poky/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -2,6 +2,7 @@ require ncurses.inc SRC_URI += "file://0001-tic-hang.patch \ file://0002-configure-reproducible.patch \ + file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \ " # commit id corresponds to the revision in package version SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" diff --git a/poky/meta/recipes-core/ovmf/ovmf_git.bb b/poky/meta/recipes-core/ovmf/ovmf_git.bb index 04c4449ec..d785ff670 100644 --- a/poky/meta/recipes-core/ovmf/ovmf_git.bb +++ b/poky/meta/recipes-core/ovmf/ovmf_git.bb @@ -17,10 +17,10 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ file://0003-ovmf-enable-long-path-file.patch \ file://0004-ovmf-Update-to-latest.patch \ - " + " -PV = "edk2-stable202008" -SRCREV = "06dc822d045c2bb42e497487935485302486e151" +PV = "edk2-stable202011" +SRCREV = "872f953262d68a11da7bc2fb3ded16df234b8700" UPSTREAM_CHECK_GITTAGREGEX = "(?Pedk2-stable.*)" inherit deploy diff --git a/poky/meta/recipes-core/psplash/files/psplash-init b/poky/meta/recipes-core/psplash/files/psplash-init index f58e04373..e0f80bcdc 100755 --- a/poky/meta/recipes-core/psplash/files/psplash-init +++ b/poky/meta/recipes-core/psplash/files/psplash-init @@ -7,6 +7,9 @@ # Default-Stop: ### END INIT INFO +. /etc/default/rcS +export PSPLASH_FIFO_DIR + if [ ! -e /dev/fb0 ]; then echo "Framebuffer /dev/fb0 not detected" echo "Boot splashscreen disabled" @@ -23,7 +26,6 @@ for x in $CMDLINE; do esac done -export PSPLASH_FIFO_DIR=/mnt/.psplash [ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR if ! mountpoint -q $PSPLASH_FIFO_DIR; then mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k diff --git a/poky/meta/recipes-core/psplash/psplash_git.bb b/poky/meta/recipes-core/psplash/psplash_git.bb index 44f0007da..59e1e3f19 100644 --- a/poky/meta/recipes-core/psplash/psplash_git.bb +++ b/poky/meta/recipes-core/psplash/psplash_git.bb @@ -102,6 +102,10 @@ do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + + # make fifo for psplash + install -d ${D}/mnt + mkfifo ${D}/mnt/psplash_fifo fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then @@ -122,3 +126,5 @@ SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'pspl INITSCRIPT_NAME = "psplash.sh" INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." + +FILES_${PN} += "/mnt" diff --git a/poky/meta/recipes-core/readline/readline-8.0/configure-fix.patch b/poky/meta/recipes-core/readline/readline-8.0/configure-fix.patch deleted file mode 100644 index ef3104f8a..000000000 --- a/poky/meta/recipes-core/readline/readline-8.0/configure-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status: Pending - -Without this it fails to link against libtermcap causing various missing -symbols issues. - -RP - 8/10/08 - -Support 6.3 which uses configure.ac rather than configure.in. -Signed-off-by: Hongxu Jia ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index cea8f91..9075b8f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -218,10 +218,10 @@ if test -f ${srcdir}/support/shobj-conf; then - AC_MSG_CHECKING(configuration for building shared libraries) - eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}` - --# case "$SHLIB_LIBS" in --# *curses*|*termcap*|*termlib*) ;; --# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; --# esac -+ case "$SHLIB_LIBS" in -+ *curses*|*termcap*|*termlib*) ;; -+ *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; -+ esac - - AC_SUBST(SHOBJ_CC) - AC_SUBST(SHOBJ_CFLAGS) --- -1.8.1.2 - diff --git a/poky/meta/recipes-core/readline/readline-8.0/norpath.patch b/poky/meta/recipes-core/readline/readline-8.0/norpath.patch deleted file mode 100644 index 5d71582b7..000000000 --- a/poky/meta/recipes-core/readline/readline-8.0/norpath.patch +++ /dev/null @@ -1,21 +0,0 @@ -This support script ends up hardcoding unnecessary rpaths into the libraries. We -will search $libdir automatically so this is just wastes space. There may be some -cases this is necessary but our use cases aren't one of them. - -Upstream-Status: Inappropriate - -RP 2012/2/23 - -Index: readline-6.2/support/shobj-conf -=================================================================== ---- readline-6.2.orig/support/shobj-conf 2012-02-23 11:06:37.193179379 +0000 -+++ readline-6.2/support/shobj-conf 2012-02-23 11:06:50.049178918 +0000 -@@ -114,7 +114,7 @@ - SHOBJ_LD='${CC}' - SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' - -- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' -+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`' - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' - ;; - diff --git a/poky/meta/recipes-core/readline/readline-8.0/rl-native.map b/poky/meta/recipes-core/readline/readline-8.0/rl-native.map deleted file mode 100644 index 5e7d49cdd..000000000 --- a/poky/meta/recipes-core/readline/readline-8.0/rl-native.map +++ /dev/null @@ -1,12 +0,0 @@ -READLINE_6.3 { - rl_change_environment; - rl_clear_history; - rl_executing_key; - rl_executing_keyseq; - rl_filename_stat_hook; - rl_history_substr_search_backward; - rl_history_substr_search_forward; - rl_input_available_hook; - rl_print_last_kbd_macro; - rl_signal_event_hook; -}; diff --git a/poky/meta/recipes-core/readline/readline-8.1/configure-fix.patch b/poky/meta/recipes-core/readline/readline-8.1/configure-fix.patch new file mode 100644 index 000000000..ef3104f8a --- /dev/null +++ b/poky/meta/recipes-core/readline/readline-8.1/configure-fix.patch @@ -0,0 +1,35 @@ +Upstream-Status: Pending + +Without this it fails to link against libtermcap causing various missing +symbols issues. + +RP - 8/10/08 + +Support 6.3 which uses configure.ac rather than configure.in. +Signed-off-by: Hongxu Jia +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cea8f91..9075b8f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -218,10 +218,10 @@ if test -f ${srcdir}/support/shobj-conf; then + AC_MSG_CHECKING(configuration for building shared libraries) + eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}` + +-# case "$SHLIB_LIBS" in +-# *curses*|*termcap*|*termlib*) ;; +-# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; +-# esac ++ case "$SHLIB_LIBS" in ++ *curses*|*termcap*|*termlib*) ;; ++ *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; ++ esac + + AC_SUBST(SHOBJ_CC) + AC_SUBST(SHOBJ_CFLAGS) +-- +1.8.1.2 + diff --git a/poky/meta/recipes-core/readline/readline-8.1/norpath.patch b/poky/meta/recipes-core/readline/readline-8.1/norpath.patch new file mode 100644 index 000000000..5d71582b7 --- /dev/null +++ b/poky/meta/recipes-core/readline/readline-8.1/norpath.patch @@ -0,0 +1,21 @@ +This support script ends up hardcoding unnecessary rpaths into the libraries. We +will search $libdir automatically so this is just wastes space. There may be some +cases this is necessary but our use cases aren't one of them. + +Upstream-Status: Inappropriate + +RP 2012/2/23 + +Index: readline-6.2/support/shobj-conf +=================================================================== +--- readline-6.2.orig/support/shobj-conf 2012-02-23 11:06:37.193179379 +0000 ++++ readline-6.2/support/shobj-conf 2012-02-23 11:06:50.049178918 +0000 +@@ -114,7 +114,7 @@ + SHOBJ_LD='${CC}' + SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' + +- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' ++ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`' + SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' + ;; + diff --git a/poky/meta/recipes-core/readline/readline-8.1/rl-native.map b/poky/meta/recipes-core/readline/readline-8.1/rl-native.map new file mode 100644 index 000000000..5e7d49cdd --- /dev/null +++ b/poky/meta/recipes-core/readline/readline-8.1/rl-native.map @@ -0,0 +1,12 @@ +READLINE_6.3 { + rl_change_environment; + rl_clear_history; + rl_executing_key; + rl_executing_keyseq; + rl_filename_stat_hook; + rl_history_substr_search_backward; + rl_history_substr_search_forward; + rl_input_available_hook; + rl_print_last_kbd_macro; + rl_signal_event_hook; +}; diff --git a/poky/meta/recipes-core/readline/readline_8.0.bb b/poky/meta/recipes-core/readline/readline_8.0.bb deleted file mode 100644 index 99d022a32..000000000 --- a/poky/meta/recipes-core/readline/readline_8.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require readline.inc - -SRC_URI += "file://configure-fix.patch \ - file://norpath.patch" - -SRC_URI[archive.md5sum] = "7e6c1f16aee3244a69aba6e438295ca3" -SRC_URI[archive.sha256sum] = "e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" diff --git a/poky/meta/recipes-core/readline/readline_8.1.bb b/poky/meta/recipes-core/readline/readline_8.1.bb new file mode 100644 index 000000000..0786a0816 --- /dev/null +++ b/poky/meta/recipes-core/readline/readline_8.1.bb @@ -0,0 +1,7 @@ +require readline.inc + +SRC_URI += "file://configure-fix.patch \ + file://norpath.patch" + +SRC_URI[archive.md5sum] = "e9557dd5b1409f5d7b37ef717c64518e" +SRC_URI[archive.sha256sum] = "f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02" diff --git a/poky/meta/recipes-core/systemd/systemd-boot_246.6.bb b/poky/meta/recipes-core/systemd/systemd-boot_246.6.bb deleted file mode 100644 index f92c63981..000000000 --- a/poky/meta/recipes-core/systemd/systemd-boot_246.6.bb +++ /dev/null @@ -1,70 +0,0 @@ -require systemd.inc -FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" - -require conf/image-uefi.conf - -DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" - -inherit meson pkgconfig gettext -inherit deploy - -LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " - -do_write_config[vardeps] += "CC OBJCOPY" -do_write_config_append() { - cat >${WORKDIR}/meson-${PN}.cross <${WORKDIR}/meson-${PN}.cross < -Date: Tue, 10 Mar 2020 11:05:20 +0000 -Subject: [PATCH] Handle missing gshadow - -gshadow usage is now present in the userdb code. Mask all uses of it to -allow compilation on musl - -Upstream-Status: Inappropriate [musl specific] -Signed-off-by: Alex Kiernan ---- - src/shared/group-record-nss.c | 20 ++++++++++++++++++++ - src/shared/group-record-nss.h | 4 ++++ - src/shared/userdb.c | 6 ++++++ - 3 files changed, 30 insertions(+) - ---- a/src/shared/group-record-nss.c -+++ b/src/shared/group-record-nss.c -@@ -19,8 +19,10 @@ int nss_group_to_group_record( - if (isempty(grp->gr_name)) - return -EINVAL; - -+#if ENABLE_GSHADOW - if (sgrp && !streq_ptr(sgrp->sg_namp, grp->gr_name)) - return -EINVAL; -+#endif - - g = group_record_new(); - if (!g) -@@ -36,6 +38,7 @@ int nss_group_to_group_record( - - g->gid = grp->gr_gid; - -+#if ENABLE_GSHADOW - if (sgrp) { - if (looks_like_hashed_password(sgrp->sg_passwd)) { - g->hashed_password = strv_new(sgrp->sg_passwd); -@@ -51,6 +54,7 @@ int nss_group_to_group_record( - if (!g->administrators) - return -ENOMEM; - } -+#endif - - r = json_build(&g->json, JSON_BUILD_OBJECT( - JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), -@@ -76,6 +80,7 @@ int nss_sgrp_for_group(const struct grou - assert(ret_sgrp); - assert(ret_buffer); - -+#if ENABLE_GSHADOW - for (;;) { - _cleanup_free_ char *buf = NULL; - struct sgrp sgrp, *result; -@@ -104,6 +109,9 @@ int nss_sgrp_for_group(const struct grou - buflen *= 2; - buf = mfree(buf); - } -+#else -+ return -ESRCH; -+#endif - } - - int nss_group_record_by_name( -@@ -115,7 +123,9 @@ int nss_group_record_by_name( - struct group grp, *result; - bool incomplete = false; - size_t buflen = 4096; -+#if ENABLE_GSHADOW - struct sgrp sgrp, *sresult = NULL; -+#endif - int r; - - assert(name); -@@ -145,6 +155,7 @@ int nss_group_record_by_name( - buf = mfree(buf); - } - -+#if ENABLE_GSHADOW - if (with_shadow) { - r = nss_sgrp_for_group(result, &sgrp, &sbuf); - if (r < 0) { -@@ -156,6 +167,9 @@ int nss_group_record_by_name( - incomplete = true; - - r = nss_group_to_group_record(result, sresult, ret); -+#else -+ r = nss_group_to_group_record(result, NULL, ret); -+#endif - if (r < 0) - return r; - -@@ -172,7 +186,9 @@ int nss_group_record_by_gid( - struct group grp, *result; - bool incomplete = false; - size_t buflen = 4096; -+#if ENABLE_GSHADOW - struct sgrp sgrp, *sresult = NULL; -+#endif - int r; - - assert(ret); -@@ -200,6 +216,7 @@ int nss_group_record_by_gid( - buf = mfree(buf); - } - -+#if ENABLE_GSHADOW - if (with_shadow) { - r = nss_sgrp_for_group(result, &sgrp, &sbuf); - if (r < 0) { -@@ -211,6 +228,9 @@ int nss_group_record_by_gid( - incomplete = true; - - r = nss_group_to_group_record(result, sresult, ret); -+#else -+ r = nss_group_to_group_record(result, NULL, ret); -+#endif - if (r < 0) - return r; - ---- a/src/shared/group-record-nss.h -+++ b/src/shared/group-record-nss.h -@@ -2,7 +2,11 @@ - #pragma once - - #include -+#if ENABLE_GSHADOW - #include -+#else -+struct sgrp; -+#endif - - #include "group-record.h" - ---- a/src/shared/userdb.c -+++ b/src/shared/userdb.c -@@ -930,13 +930,16 @@ int groupdb_iterator_get(UserDBIterator - if (gr) { - _cleanup_free_ char *buffer = NULL; - bool incomplete = false; -+#if ENABLE_GSHADOW - struct sgrp sgrp; -+#endif - - if (streq_ptr(gr->gr_name, "root")) - iterator->synthesize_root = false; - if (gr->gr_gid == GID_NOBODY) - iterator->synthesize_nobody = false; - -+#if ENABLE_GSHADOW - r = nss_sgrp_for_group(gr, &sgrp, &buffer); - if (r < 0) { - log_debug_errno(r, "Failed to acquire shadow entry for group %s, ignoring: %m", gr->gr_name); -@@ -944,6 +947,9 @@ int groupdb_iterator_get(UserDBIterator - } - - r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); -+#else -+ r = nss_group_to_group_record(gr, NULL, ret); -+#endif - if (r < 0) - return r; - diff --git a/poky/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/poky/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 2676c144f..8dd22eeb7 100644 --- a/poky/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/poky/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -29,7 +29,7 @@ Index: systemd-stable/units/meson.build =================================================================== --- systemd-stable.orig/units/meson.build +++ systemd-stable/units/meson.build -@@ -54,8 +54,7 @@ units = [ +@@ -55,8 +55,7 @@ units = [ ['poweroff.target', '', (with_runlevels ? 'runlevel0.target' : '')], ['printer.target', ''], @@ -38,8 +38,8 @@ Index: systemd-stable/units/meson.build + ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT'], ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], ['reboot.target', '', - (with_runlevels ? 'runlevel6.target ctrl-alt-del.target' : 'ctrl-alt-del.target')], -@@ -162,8 +161,7 @@ in_units = [ + 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], +@@ -166,8 +165,7 @@ in_units = [ ['rc-local.service', 'HAVE_SYSV_COMPAT'], ['rescue.service', ''], ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], @@ -64,7 +64,7 @@ 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 +@@ -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/poky/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/poky/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch deleted file mode 100644 index 39a975319..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ /dev/null @@ -1,411 +0,0 @@ -From f92fd7e77ed5aab2dda01a20e6891c37f09415d3 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 - -Do not disable buffer in writing files, otherwise we get -failure at boot for musl like below. - - [!!!!!!] Failed to allocate manager object. - -And there will be other failures, critical or not critical. -This is specific to musl. - -Upstream-Status: Inappropriate [musl] - -Signed-off-by: Chen Qi -[Rebased for v242] -Signed-off-by: Andrej Valek -[rebased for systemd 243] -Signed-off-by: Scott Murray - ---- - src/basic/cgroup-util.c | 10 +++++----- - src/basic/procfs-util.c | 4 ++-- - src/basic/smack-util.c | 2 +- - src/basic/util.c | 2 +- - src/binfmt/binfmt.c | 6 +++--- - src/core/main.c | 4 ++-- - src/core/smack-setup.c | 8 ++++---- - src/hibernate-resume/hibernate-resume.c | 2 +- - src/libsystemd/sd-device/sd-device.c | 2 +- - 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 | 8 ++++---- - src/udev/udevadm-trigger.c | 2 +- - src/udev/udevd.c | 2 +- - src/vconsole/vconsole-setup.c | 2 +- - 18 files changed, 35 insertions(+), 35 deletions(-) - -Index: systemd-stable/src/basic/cgroup-util.c -=================================================================== ---- systemd-stable.orig/src/basic/cgroup-util.c -+++ systemd-stable/src/basic/cgroup-util.c -@@ -769,7 +769,7 @@ int cg_install_release_agent(const char - - sc = strstrip(contents); - if (isempty(sc)) { -- r = write_string_file(fs, agent, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(fs, agent, 0); - if (r < 0) - return r; - } else if (!path_equal(sc, agent)) -@@ -787,7 +787,7 @@ int cg_install_release_agent(const char - - sc = strstrip(contents); - if (streq(sc, "0")) { -- r = write_string_file(fs, "1", WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(fs, "1", 0); - if (r < 0) - return r; - -@@ -814,7 +814,7 @@ int cg_uninstall_release_agent(const cha - if (r < 0) - return r; - -- r = write_string_file(fs, "0", WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(fs, "0", 0); - if (r < 0) - return r; - -@@ -824,7 +824,7 @@ int cg_uninstall_release_agent(const cha - if (r < 0) - return r; - -- r = write_string_file(fs, "", WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(fs, "", 0); - if (r < 0) - return r; - -@@ -1656,7 +1656,7 @@ int cg_set_attribute(const char *control - if (r < 0) - return r; - -- return write_string_file(p, value, WRITE_STRING_FILE_DISABLE_BUFFER); -+ return write_string_file(p, value, 0); - } - - int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { -Index: systemd-stable/src/basic/procfs-util.c -=================================================================== ---- systemd-stable.orig/src/basic/procfs-util.c -+++ systemd-stable/src/basic/procfs-util.c -@@ -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 */ -- r = write_string_file("/proc/sys/kernel/pid_max", buffer, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/proc/sys/kernel/pid_max", buffer, 0); - if (r < 0) - return r; - } - - sprintf(buffer, "%" PRIu64, limit); -- r = write_string_file("/proc/sys/kernel/threads-max", buffer, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/proc/sys/kernel/threads-max", buffer, 0); - if (r < 0) { - uint64_t threads_max; - -Index: systemd-stable/src/basic/smack-util.c -=================================================================== ---- systemd-stable.orig/src/basic/smack-util.c -+++ systemd-stable/src/basic/smack-util.c -@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const - return 0; - - p = procfs_file_alloca(pid, "attr/current"); -- r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(p, label, 0); - if (r < 0) - return r; - -Index: systemd-stable/src/basic/util.c -=================================================================== ---- systemd-stable.orig/src/basic/util.c -+++ systemd-stable/src/basic/util.c -@@ -267,7 +267,7 @@ void disable_coredumps(void) { - if (detect_container() > 0) - return; - -- r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0); - if (r < 0) - log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); - } -Index: systemd-stable/src/binfmt/binfmt.c -=================================================================== ---- systemd-stable.orig/src/binfmt/binfmt.c -+++ systemd-stable/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) - if (!fn) - return log_oom(); - -- return write_string_file(fn, "-1", WRITE_STRING_FILE_DISABLE_BUFFER); -+ return write_string_file(fn, "-1", 0); - } - - static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) - - (void) delete_rule(rule); - -- r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, 0); - if (r < 0) - return log_error_errno(r, "Failed to add binary format: %m"); - -@@ -223,7 +223,7 @@ static int run(int argc, char *argv[]) { - } - - /* Flush out all rules */ -- (void) write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); -+ (void) write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); - - STRV_FOREACH(f, files) { - k = apply_file(*f, true); -Index: systemd-stable/src/core/main.c -=================================================================== ---- systemd-stable.orig/src/core/main.c -+++ systemd-stable/src/core/main.c -@@ -1382,7 +1382,7 @@ static int bump_unix_max_dgram_qlen(void - if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) - return 0; - -- r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", WRITE_STRING_FILE_DISABLE_BUFFER, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); -+ r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", 0, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); - 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"); -@@ -1668,7 +1668,7 @@ static void initialize_core_pattern(bool - if (getpid_cached() != 1) - return; - -- r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, 0); - if (r < 0) - log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); - } -Index: systemd-stable/src/core/smack-setup.c -=================================================================== ---- systemd-stable.orig/src/core/smack-setup.c -+++ systemd-stable/src/core/smack-setup.c -@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) - } - - #ifdef SMACK_RUN_LABEL -- r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, 0); - if (r < 0) - log_warning_errno(r, "Failed to set SMACK label \"" SMACK_RUN_LABEL "\" on self: %m"); -- r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, 0); - if (r < 0) - log_warning_errno(r, "Failed to set SMACK ambient label \"" SMACK_RUN_LABEL "\": %m"); - r = write_string_file("/sys/fs/smackfs/netlabel", -- "0.0.0.0/0 " SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); -+ "0.0.0.0/0 " SMACK_RUN_LABEL, 0); - if (r < 0) - log_warning_errno(r, "Failed to set SMACK netlabel rule \"0.0.0.0/0 " SMACK_RUN_LABEL "\": %m"); -- r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", 0); - if (r < 0) - log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); - #endif -Index: systemd-stable/src/hibernate-resume/hibernate-resume.c -=================================================================== ---- systemd-stable.orig/src/hibernate-resume/hibernate-resume.c -+++ systemd-stable/src/hibernate-resume/hibernate-resume.c -@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { - return EXIT_FAILURE; - } - -- r = write_string_file("/sys/power/resume", major_minor, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume", major_minor, 0); - if (r < 0) { - log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); - return EXIT_FAILURE; -Index: systemd-stable/src/libsystemd/sd-device/sd-device.c -=================================================================== ---- systemd-stable.orig/src/libsystemd/sd-device/sd-device.c -+++ systemd-stable/src/libsystemd/sd-device/sd-device.c -@@ -1877,7 +1877,7 @@ _public_ int sd_device_set_sysattr_value - if (!value) - return -ENOMEM; - -- r = write_string_file(path, value, WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_NOFOLLOW); -+ r = write_string_file(path, value, 0 | WRITE_STRING_FILE_NOFOLLOW); - if (r < 0) { - if (r == -ELOOP) - return -EINVAL; -Index: systemd-stable/src/login/logind-dbus.c -=================================================================== ---- systemd-stable.orig/src/login/logind-dbus.c -+++ systemd-stable/src/login/logind-dbus.c -@@ -1341,7 +1341,7 @@ static int trigger_device(Manager *m, sd - if (!t) - return -ENOMEM; - -- (void) write_string_file(t, "change", WRITE_STRING_FILE_DISABLE_BUFFER); -+ (void) write_string_file(t, "change", 0); - } - - return 0; -Index: systemd-stable/src/nspawn/nspawn-cgroup.c -=================================================================== ---- systemd-stable.orig/src/nspawn/nspawn-cgroup.c -+++ systemd-stable/src/nspawn/nspawn-cgroup.c -@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified - fn = strjoina(tree, cgroup, "/cgroup.procs"); - - sprintf(pid_string, PID_FMT, pid); -- r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER|WRITE_STRING_FILE_MKDIR_0755); -+ r = write_string_file(fn, pid_string, WRITE_STRING_FILE_MKDIR_0755); - if (r < 0) { - log_error_errno(r, "Failed to move process: %m"); - goto finish; -Index: systemd-stable/src/nspawn/nspawn.c -=================================================================== ---- systemd-stable.orig/src/nspawn/nspawn.c -+++ systemd-stable/src/nspawn/nspawn.c -@@ -2493,7 +2493,7 @@ static int reset_audit_loginuid(void) { - if (streq(p, "4294967295")) - return 0; - -- r = write_string_file("/proc/self/loginuid", "4294967295", WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/proc/self/loginuid", "4294967295", 0); - if (r < 0) { - log_error_errno(r, - "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3726,13 +3726,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); -- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(uid_map, line, 0); - if (r < 0) - return log_error_errno(r, "Failed to write UID map: %m"); - - /* We always assign the same UID and GID ranges */ - xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); -- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(uid_map, line, 0); - if (r < 0) - return log_error_errno(r, "Failed to write GID map: %m"); - -Index: systemd-stable/src/shared/cgroup-setup.c -=================================================================== ---- systemd-stable.orig/src/shared/cgroup-setup.c -+++ systemd-stable/src/shared/cgroup-setup.c -@@ -267,7 +267,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; - -@@ -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); -Index: systemd-stable/src/shared/sysctl-util.c -=================================================================== ---- systemd-stable.orig/src/shared/sysctl-util.c -+++ systemd-stable/src/shared/sysctl-util.c -@@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, con - - log_debug("Setting '%s' to '%s'", p, value); - -- return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); -+ return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); - } - - int sysctl_read(const char *property, char **content) { -Index: systemd-stable/src/sleep/sleep.c -=================================================================== ---- systemd-stable.orig/src/sleep/sleep.c -+++ systemd-stable/src/sleep/sleep.c -@@ -48,7 +48,7 @@ static int write_hibernate_location_info - assert(hibernate_location->swap); - - xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); -- r = write_string_file("/sys/power/resume", resume_str, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume", resume_str, 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, resume_str); -@@ -75,7 +75,7 @@ static int write_hibernate_location_info - } - - xsprintf(offset_str, "%" PRIu64, hibernate_location->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 swap file offset to /sys/power/resume_offset for '%s': '%s': %m", - hibernate_location->swap->device, offset_str); -@@ -92,7 +92,7 @@ static int write_mode(char **modes) { - STRV_FOREACH(mode, modes) { - int k; - -- k = write_string_file("/sys/power/disk", *mode, WRITE_STRING_FILE_DISABLE_BUFFER); -+ k = write_string_file("/sys/power/disk", *mode, 0); - if (k >= 0) - return 0; - -@@ -114,7 +114,7 @@ static int write_state(FILE **f, char ** - STRV_FOREACH(state, states) { - int k; - -- k = write_string_stream(*f, *state, WRITE_STRING_FILE_DISABLE_BUFFER); -+ k = write_string_stream(*f, *state, 0); - if (k >= 0) - return 0; - log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); -Index: systemd-stable/src/udev/udevadm-trigger.c -=================================================================== ---- systemd-stable.orig/src/udev/udevadm-trigger.c -+++ systemd-stable/src/udev/udevadm-trigger.c -@@ -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) { - bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); - -Index: systemd-stable/src/udev/udevd.c -=================================================================== ---- systemd-stable.orig/src/udev/udevd.c -+++ systemd-stable/src/udev/udevd.c -@@ -1153,7 +1153,7 @@ static int synthesize_change_one(sd_devi - - filename = strjoina(syspath, "/uevent"); - log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); -- r = write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(filename, "change", 0); - if (r < 0) - return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); - return 0; -Index: systemd-stable/src/vconsole/vconsole-setup.c -=================================================================== ---- systemd-stable.orig/src/vconsole/vconsole-setup.c -+++ systemd-stable/src/vconsole/vconsole-setup.c -@@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *na - static int toggle_utf8_sysfs(bool utf8) { - int r; - -- r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), 0); - if (r < 0) - return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); - diff --git a/poky/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch b/poky/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch index 622a4108b..e49e06672 100644 --- a/poky/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch +++ b/poky/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch @@ -14,8 +14,8 @@ Signed-off-by: Khem Raj --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in -@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_di - tmpfiles_dir=${prefix}/lib/tmpfiles.d +@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir} + tmpfiles_dir=/usr/lib/tmpfiles.d tmpfilesdir=${tmpfiles_dir} -sysusers_dir=${rootprefix}/lib/sysusers.d @@ -34,4 +34,4 @@ Signed-off-by: Khem Raj +modules_load_dir=${prefix}/lib/modules-load.d modulesloaddir=${modules_load_dir} - catalog_dir=${prefix}/lib/systemd/catalog + catalog_dir=/usr/lib/systemd/catalog diff --git a/poky/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/poky/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch index 30fe9a14d..d856bcb58 100644 --- a/poky/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +++ b/poky/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch @@ -1,7 +1,7 @@ -From 3eb12a6ba0bce149717eaabeb1505d379b3d705a Mon Sep 17 00:00:00 2001 +From 66ece0b870b3a34fdabc48b88437e6cc354e9fce Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:41:41 +0800 -Subject: [PATCH] don't use glibc-specific qsort_r +Subject: [PATCH 02/26] don't use glibc-specific qsort_r Upstream-Status: Inappropriate [musl specific] @@ -10,18 +10,19 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [Rebased for v242] Signed-off-by: Andrej Valek - +[Rebased for v247] +Signed-off-by: Luca Boccassi --- 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(-) -Index: systemd-stable/src/basic/sort-util.h -=================================================================== ---- systemd-stable.orig/src/basic/sort-util.h -+++ systemd-stable/src/basic/sort-util.h -@@ -54,17 +54,3 @@ static inline void _qsort_safe(void *bas +diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h +index 1d194a1f04..3394c9eb72 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_f int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \ _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ }) @@ -39,11 +40,11 @@ Index: systemd-stable/src/basic/sort-util.h - int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \ - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ - }) -Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c -=================================================================== ---- systemd-stable.orig/src/libsystemd/sd-hwdb/hwdb-util.c -+++ systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c -@@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) +diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c +index 4c94ba9c88..95495dba6d 100644 +--- a/src/libsystemd/sd-hwdb/hwdb-util.c ++++ b/src/libsystemd/sd-hwdb/hwdb-util.c +@@ -126,9 +126,13 @@ static void trie_free(struct trie *trie) { DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); @@ -60,7 +61,7 @@ Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c } static int trie_node_add_value(struct trie *trie, struct trie_node *node, -@@ -158,7 +162,10 @@ static int trie_node_add_value(struct tr +@@ -156,7 +160,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, .value_off = v, }; @@ -72,7 +73,7 @@ Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c if (val) { /* At this point we have 2 identical properties on the same match-string. * Since we process files in order, we just replace the previous value. */ -@@ -184,7 +191,9 @@ static int trie_node_add_value(struct tr +@@ -182,7 +189,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, .line_number = line_number, }; node->values_count++; @@ -83,11 +84,11 @@ Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c return 0; } -Index: systemd-stable/src/shared/format-table.c -=================================================================== ---- systemd-stable.orig/src/shared/format-table.c -+++ systemd-stable/src/shared/format-table.c -@@ -1246,31 +1246,33 @@ static int cell_data_compare(TableData * +diff --git a/src/shared/format-table.c b/src/shared/format-table.c +index a13a198b7a..bce10bc607 100644 +--- a/src/shared/format-table.c ++++ b/src/shared/format-table.c +@@ -1243,30 +1243,32 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t return CMP(index_a, index_b); } @@ -95,7 +96,6 @@ Index: systemd-stable/src/shared/format-table.c +static Table *user_table; +static int table_data_compare(const void *x, const void *y) { + const size_t *a = x, *b=y; - size_t i; int r; - assert(t); @@ -115,8 +115,8 @@ Index: systemd-stable/src/shared/format-table.c return 1; /* Order other lines by the sorting map */ -- for (i = 0; i < t->n_sort_map; i++) { -+ for (i = 0; i < user_table->n_sort_map; i++) { +- for (size_t i = 0; i < t->n_sort_map; i++) { ++ for (size_t i = 0; i < user_table->n_sort_map; i++) { TableData *d, *dd; - d = t->data[*a + t->sort_map[i]]; @@ -131,8 +131,8 @@ Index: systemd-stable/src/shared/format-table.c } /* Order identical lines by the order there were originally added in */ -@@ -1798,7 +1800,12 @@ int table_print(Table *t, FILE *f) { - for (i = 0; i < n_rows; i++) +@@ -1844,7 +1846,12 @@ int table_print(Table *t, FILE *f) { + for (size_t i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); @@ -145,8 +145,8 @@ Index: systemd-stable/src/shared/format-table.c } if (t->display_map) -@@ -2375,7 +2382,12 @@ int table_to_json(Table *t, JsonVariant - for (i = 0; i < n_rows; i++) +@@ -2440,7 +2447,12 @@ int table_to_json(Table *t, JsonVariant **ret) { + for (size_t i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); @@ -159,3 +159,6 @@ Index: systemd-stable/src/shared/format-table.c } if (t->display_map) +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch b/poky/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch deleted file mode 100644 index ba7424d87..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -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'? - 158 | r = sd_event_add_child(w->manager->event, &w->child_event_source, w->child, WEXITED, on_brightness_writer_exit, w); - | ^~~~~~~ - -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 3f4b65e1fdf1..5af7e3d5ce3f 100644 ---- a/src/login/logind-brightness.c -+++ b/src/login/logind-brightness.c -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - -+#include - #include "bus-util.h" - #include "device-util.h" - #include "hash-funcs.h" diff --git a/poky/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/poky/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch index 140489514..f43a22aa8 100644 --- a/poky/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch +++ b/poky/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch @@ -1,7 +1,7 @@ -From 233de872b9b033ec842c2135152d2e006ac44c16 Mon Sep 17 00:00:00 2001 +From 9f0d5996bbb2db3679a4075fa8301750b786c03b Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t +Subject: [PATCH 03/26] 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. @@ -13,7 +13,6 @@ Signed-off-by: Alex Kiernan 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 + @@ -22,7 +21,7 @@ Signed-off-by: Andrej Valek 4 files changed, 12 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index bf8a6caa1b46..c487e65e7bde 100644 +index f6233090a9..aeaf6ad5ec 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -10,3 +10,12 @@ @@ -39,7 +38,7 @@ index bf8a6caa1b46..c487e65e7bde 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 27d68b341cf3..307ea4ac0e8e 100644 +index 3394c9eb72..d9cb2aecb6 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -4,6 +4,7 @@ @@ -51,7 +50,7 @@ index 27d68b341cf3..307ea4ac0e8e 100644 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 +index 8a7f82812a..a56f12f47f 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -10,6 +10,7 @@ @@ -63,7 +62,7 @@ index 128674327362..09ccd613e32c 100644 #if HAVE_KMOD #include "module-util.h" diff --git a/src/journal/catalog.c b/src/journal/catalog.c -index 70b2c8b46c4e..d574a64586f1 100644 +index 0f6ad8a29e..4e1077ade4 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c @@ -28,6 +28,7 @@ @@ -74,3 +73,6 @@ index 70b2c8b46c4e..d574a64586f1 100644 const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch b/poky/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch deleted file mode 100644 index 538a99c7d..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch +++ /dev/null @@ -1,31 +0,0 @@ -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] -src/basic/copy.c:93:19: error: implicit declaration of function 'sigaddset' [-Werror=implicit-function-declaration] -src/basic/copy.c:93:34: error: 'SIGINT' undeclared (first use in this function) -src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [-Werror=implicit-function-declaration] - -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 9028868f696d..5168586fa522 100644 ---- a/src/basic/copy.c -+++ b/src/basic/copy.c -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - - #include "alloc-util.h" - #include "btrfs-util.h" diff --git a/poky/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/poky/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch index e65c54361..bdd64a025 100644 --- a/poky/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch +++ b/poky/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch @@ -1,7 +1,7 @@ -From 8af168cefca01f8f2da336f1c82620c284dc74f2 Mon Sep 17 00:00:00 2001 +From f3dbe29f7620a063af4d8eb3ea7c48ecd410200d Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:04:21 +0800 -Subject: [PATCH] add fallback parse_printf_format implementation +Subject: [PATCH 04/26] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific] @@ -10,7 +10,6 @@ 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 + @@ -22,11 +21,11 @@ Signed-off-by: Scott Murray create mode 100644 src/basic/parse-printf-format.c create mode 100644 src/basic/parse-printf-format.h -Index: systemd-stable/meson.build -=================================================================== ---- systemd-stable.orig/meson.build -+++ systemd-stable/meson.build -@@ -638,6 +638,7 @@ endif +diff --git a/meson.build b/meson.build +index f406d595e6..6aa47fc755 100644 +--- a/meson.build ++++ b/meson.build +@@ -646,6 +646,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h', @@ -34,11 +33,11 @@ Index: systemd-stable/meson.build 'sys/auxv.h', 'valgrind/memcheck.h', 'valgrind/valgrind.h', -Index: systemd-stable/src/basic/meson.build -=================================================================== ---- systemd-stable.orig/src/basic/meson.build -+++ systemd-stable/src/basic/meson.build -@@ -317,6 +317,11 @@ foreach item : [['af', af_list_txt, +diff --git a/src/basic/meson.build b/src/basic/meson.build +index 1183ea83ad..aa5c958850 100644 +--- a/src/basic/meson.build ++++ b/src/basic/meson.build +@@ -322,6 +322,11 @@ foreach item : [['af', af_list_txt, 'af', ''], endforeach basic_sources += generated_gperf_headers @@ -50,10 +49,11 @@ Index: systemd-stable/src/basic/meson.build basic_gcrypt_sources = files( 'gcrypt-util.c', 'gcrypt-util.h') -Index: systemd-stable/src/basic/parse-printf-format.c -=================================================================== +diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c +new file mode 100644 +index 0000000000..49437e5445 --- /dev/null -+++ systemd-stable/src/basic/parse-printf-format.c ++++ b/src/basic/parse-printf-format.c @@ -0,0 +1,273 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + @@ -328,10 +328,11 @@ Index: systemd-stable/src/basic/parse-printf-format.c + + return last; +} -Index: systemd-stable/src/basic/parse-printf-format.h -=================================================================== +diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h +new file mode 100644 +index 0000000000..47be7522d7 --- /dev/null -+++ systemd-stable/src/basic/parse-printf-format.h ++++ b/src/basic/parse-printf-format.h @@ -0,0 +1,57 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + @@ -390,12 +391,12 @@ Index: systemd-stable/src/basic/parse-printf-format.h +size_t parse_printf_format(const char *fmt, size_t n, int *types); + +#endif /* HAVE_PRINTF_H */ -Index: systemd-stable/src/basic/stdio-util.h -=================================================================== ---- systemd-stable.orig/src/basic/stdio-util.h -+++ systemd-stable/src/basic/stdio-util.h +diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h +index 6dc1e72312..cea76b36cf 100644 +--- a/src/basic/stdio-util.h ++++ b/src/basic/stdio-util.h @@ -1,13 +1,13 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include @@ -409,10 +410,10 @@ Index: systemd-stable/src/basic/stdio-util.h #define snprintf_ok(buf, len, fmt, ...) \ ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) -Index: systemd-stable/src/journal/journal-send.c -=================================================================== ---- systemd-stable.orig/src/journal/journal-send.c -+++ systemd-stable/src/journal/journal-send.c +diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c +index fd3fd7ef9c..e8e6ad555b 100644 +--- a/src/journal/journal-send.c ++++ b/src/journal/journal-send.c @@ -2,7 +2,6 @@ #include @@ -429,3 +430,6 @@ Index: systemd-stable/src/journal/journal-send.c #define SNDBUF_SIZE (8*1024*1024) +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch b/poky/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch deleted file mode 100644 index d394444c1..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch +++ /dev/null @@ -1,58 +0,0 @@ -From dbe8b3ee45580defeefcac929b897c5437ffc50b 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: - -src/test/test-cpu-set-util.c:18:54: error: '__cpu_mask' undeclared (first use in this function) -src/test/test-sizeof.c:73:14: error: '__cpu_mask' undeclared (first use in this function) - -__cpu_mask is an internal type of glibc's cpu_set implementation, not -part of the POSIX definition, which is problematic when building with -musl, which does not define a matching type. From inspection of musl's -sched.h, however, it is clear that the corresponding type would be -unsigned long, which does match glibc's actual __CPU_MASK_TYPE. So, -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 27812dfd5923..0ab40731ea93 100644 ---- a/src/shared/cpu-set-util.h -+++ b/src/shared/cpu-set-util.h -@@ -6,6 +6,8 @@ - #include "macro.h" - #include "missing_syscall.h" - -+typedef unsigned long __cpu_mask; -+ - /* This wraps the libc interface with a variable to keep the allocated size. */ - typedef struct CPUSet { - cpu_set_t *set; -diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index c65062d2562c..8b6eefa9cdae 100644 ---- a/src/test/test-sizeof.c -+++ b/src/test/test-sizeof.c -@@ -1,6 +1,5 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - --#include - #include - #include - #include -@@ -10,6 +9,7 @@ - #include - - #include "time-util.h" -+#include "cpu-set-util.h" - - /* Print information about various types. Useful when diagnosing - * gcc diagnostics on an unfamiliar architecture. */ diff --git a/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index 8e7a2fb6e..154e57b54 100644 --- a/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch @@ -1,7 +1,7 @@ -From 7e771de87cf728a8678f1f28f391bba3589e2496 Mon Sep 17 00:00:00 2001 +From 5aeae0ea89f5af74ed5d95bed1d87a03b3801ff0 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:18:21 +0800 -Subject: [PATCH] src/basic/missing.h: check for missing strndupa +Subject: [PATCH 05/26] src/basic/missing.h: check for missing strndupa include missing.h for definition of strndupa @@ -15,7 +15,8 @@ Signed-off-by: Andrej Valek Signed-off-by: Scott Murray Signed-off-by: Alex Kiernan [rebased for systemd 244] - +[Rebased for v247] +Signed-off-by: Luca Boccassi --- meson.build | 1 + src/backlight/backlight.c | 1 + @@ -70,31 +71,31 @@ Signed-off-by: Alex Kiernan 50 files changed, 61 insertions(+) diff --git a/meson.build b/meson.build -index 9187439bdd..bea9935a91 100644 +index 6aa47fc755..0d0fa4963c 100644 --- a/meson.build +++ b/meson.build -@@ -527,6 +527,7 @@ foreach ident : [ - #include - #include +@@ -535,6 +535,7 @@ foreach ident : [ #include '''], + ['mallinfo', '''#include '''], + ['close_range', '''#include '''], + ['strndupa' , '''#include '''], ] 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 3a644363e1..73946a829b 100644 +index d1b6a81e33..38b7008371 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c -@@ -17,6 +17,7 @@ +@@ -19,6 +19,7 @@ #include "string-util.h" #include "strv.h" #include "util.h" +#include "missing_stdlib.h" - static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { - const char *subsystem, *sysname, *value; + static int help(void) { + _cleanup_free_ char *link = NULL; diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index e94fcfad02..856a7068b0 100644 +index f28bf1866a..bb960f183c 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -38,6 +38,7 @@ @@ -106,7 +107,7 @@ index e94fcfad02..856a7068b0 100644 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 b8dc98915f..5049b37594 100644 +index a84863ff22..d4f5d57231 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -15,6 +15,7 @@ @@ -115,13 +116,13 @@ index b8dc98915f..5049b37594 100644 #include "utf8.h" +#include "missing_stdlib.h" - #define VALID_CHARS_ENV_NAME \ - DIGITS LETTERS \ + /* We follow bash for the character set. Different shells have different rules. */ + #define VALID_BASH_ENV_NAME_CHARS \ diff --git a/src/basic/log.c b/src/basic/log.c -index c6fe203808..b7ef932d28 100644 +index d4054cf46a..b608863e45 100644 --- a/src/basic/log.c +++ b/src/basic/log.c -@@ -35,6 +35,7 @@ +@@ -36,6 +36,7 @@ #include "terminal-util.h" #include "time-util.h" #include "utf8.h" @@ -130,7 +131,7 @@ index c6fe203808..b7ef932d28 100644 #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 8c76f93eb2..9068bfb4f0 100644 --- a/src/basic/missing_stdlib.h +++ b/src/basic/missing_stdlib.h @@ -11,3 +11,15 @@ @@ -150,10 +151,10 @@ index 188a8d4406..1e16ec287a 100644 + }) +#endif diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c -index 6ebc2b95fd..88f4359bab 100644 +index f91f8f7a08..fb31596216 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c -@@ -13,6 +13,7 @@ +@@ -14,6 +14,7 @@ #include "stat-util.h" #include "stdio-util.h" #include "user-util.h" @@ -162,10 +163,10 @@ index 6ebc2b95fd..88f4359bab 100644 int mkdir_safe_internal( const char *path, diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index 44f0438cf4..54b4133343 100644 +index 5d4dafe3a5..70749750d4 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c -@@ -19,6 +19,7 @@ +@@ -22,6 +22,7 @@ #include "stat-util.h" #include "string-util.h" #include "strv.h" @@ -174,7 +175,7 @@ index 44f0438cf4..54b4133343 100644 int parse_boolean(const char *v) { if (!v) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 52968dee34..2f4f7e3dcd 100644 +index 96b82170d0..71342b46af 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c @@ -15,6 +15,7 @@ @@ -186,7 +187,7 @@ index 52968dee34..2f4f7e3dcd 100644 int xdg_user_runtime_dir(char **ret, const char *suffix) { const char *e; diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c -index ba47ca5812..8baf728fde 100644 +index 0b6fb137bd..e8e8c7b270 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -15,6 +15,7 @@ @@ -198,7 +199,7 @@ index ba47ca5812..8baf728fde 100644 int proc_cmdline(char **ret) { const char *e; diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 7aaf95bfce..da7e836f14 100644 +index ccab71f7d2..8f9eee8d36 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c @@ -11,6 +11,7 @@ @@ -210,7 +211,7 @@ index 7aaf95bfce..da7e836f14 100644 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 c94ee26bd9..14e35b4653 100644 +index 4989f4f37c..ca00bf99d8 100644 --- a/src/basic/selinux-util.c +++ b/src/basic/selinux-util.c @@ -27,6 +27,7 @@ @@ -222,10 +223,10 @@ index c94ee26bd9..14e35b4653 100644 #if HAVE_SELINUX DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 15cc1b8851..02bb3f01f9 100644 +index 5318d6378d..23c2f77675 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -26,6 +26,7 @@ +@@ -27,6 +27,7 @@ #include "string-util.h" #include "strv.h" #include "time-util.h" @@ -234,7 +235,7 @@ index 15cc1b8851..02bb3f01f9 100644 static clockid_t map_clock_id(clockid_t c) { diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c -index b96e1f927f..cba979baca 100644 +index cd34f88bb9..3a77b6f2ca 100644 --- a/src/boot/bless-boot.c +++ b/src/boot/bless-boot.c @@ -18,6 +18,7 @@ @@ -246,10 +247,10 @@ index b96e1f927f..cba979baca 100644 static char **arg_path = NULL; diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index b7d2e32639..fdbc1df95e 100644 +index 37c581fb22..e02789d689 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c -@@ -15,6 +15,7 @@ +@@ -16,6 +16,7 @@ #include "fileio.h" #include "limits-util.h" #include "path-util.h" @@ -258,7 +259,7 @@ index b7d2e32639..fdbc1df95e 100644 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 50f7ada8ce..5c760ee487 100644 +index abe009c395..0451e58d1c 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -41,6 +41,7 @@ @@ -270,7 +271,7 @@ index 50f7ada8ce..5c760ee487 100644 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 951450e53d..50d134e9a1 100644 +index d6223db305..3654c344ee 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c @@ -7,6 +7,7 @@ @@ -282,10 +283,10 @@ index 951450e53d..50d134e9a1 100644 int bus_property_get_triggered_unit( sd_bus *bus, diff --git a/src/core/execute.c b/src/core/execute.c -index 2a4840a3a9..d3f1e0e0f8 100644 +index c992b8d5d3..89632e0582 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -89,6 +89,7 @@ +@@ -96,6 +96,7 @@ #include "unit.h" #include "user-util.h" #include "utmp-wtmp.h" @@ -294,7 +295,7 @@ index 2a4840a3a9..d3f1e0e0f8 100644 #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 09ccd613e3..f4e64fa283 100644 +index a56f12f47f..6b8729ef67 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -11,6 +11,7 @@ @@ -306,7 +307,7 @@ index 09ccd613e3..f4e64fa283 100644 #if HAVE_KMOD #include "module-util.h" diff --git a/src/core/service.c b/src/core/service.c -index 00e61945ba..1ecab28354 100644 +index d7bdeb7cca..bfd483b2c0 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -41,6 +41,7 @@ @@ -318,7 +319,7 @@ index 00e61945ba..1ecab28354 100644 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 35885dfb47..bb9f0660a6 100644 +index 30c67ffe7c..595bc30726 100644 --- a/src/coredump/coredump-vacuum.c +++ b/src/coredump/coredump-vacuum.c @@ -16,6 +16,7 @@ @@ -330,7 +331,7 @@ index 35885dfb47..bb9f0660a6 100644 #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 77dfdefd64..e21ecbeff8 100644 +index d2aa1815c2..a851aa203f 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -22,6 +22,7 @@ @@ -342,10 +343,10 @@ index 77dfdefd64..e21ecbeff8 100644 #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 8d4897b942..15476b3c83 100644 +index bcf2e01d5c..5394d1dc01 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c -@@ -69,6 +69,7 @@ +@@ -73,6 +73,7 @@ #include "unit-name.h" #include "user-util.h" #include "varlink.h" @@ -354,7 +355,7 @@ index 8d4897b942..15476b3c83 100644 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c -index 6fb0abb419..2d94d9938e 100644 +index cb1ab88ca5..7f35759540 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -40,6 +40,7 @@ @@ -366,7 +367,7 @@ index 6fb0abb419..2d94d9938e 100644 #define JOURNAL_FILES_MAX 7168 diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c -index 55e35cd902..0ed98f9224 100644 +index 86ff5bdfa2..3fd053a358 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -21,6 +21,7 @@ @@ -378,7 +379,7 @@ index 55e35cd902..0ed98f9224 100644 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 6abac8822c..c74c9cd7fa 100644 +index 275c4318a1..5ffee59d17 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -13,6 +13,7 @@ @@ -390,7 +391,7 @@ index 6abac8822c..c74c9cd7fa 100644 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 fc7e8e844a..7af4dd2712 100644 +index 4881fd0d32..c865f1133b 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -28,6 +28,7 @@ @@ -402,7 +403,7 @@ index fc7e8e844a..7af4dd2712 100644 #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 9de5e454a6..fe86c93c63 100644 +index b8d4dc8d95..a8bac2665d 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -41,6 +41,7 @@ @@ -414,7 +415,7 @@ index 9de5e454a6..fe86c93c63 100644 #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..58044b6ba9 100644 +index 8c6711797a..fac178823a 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -14,6 +14,7 @@ @@ -426,7 +427,7 @@ index 8de0a859ee..58044b6ba9 100644 #define MAX_SIZE (2*1024*1024) diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c -index 233d081300..40a32b9700 100644 +index cb8153f4fe..d52a56019d 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c @@ -21,6 +21,7 @@ @@ -438,7 +439,7 @@ index 233d081300..40a32b9700 100644 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 16f4289585..6c5e438b36 100644 +index 8e7a94db55..b5c368c6d1 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -31,6 +31,7 @@ @@ -450,7 +451,7 @@ index 16f4289585..6c5e438b36 100644 #include "parse-util.h" #include "path-util.h" diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c -index bed1e42697..e4847c2bee 100644 +index 2fa21a067a..2e9995aa62 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -13,6 +13,7 @@ @@ -462,7 +463,7 @@ index bed1e42697..e4847c2bee 100644 /* # .network diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c -index d341fa25aa..91646bc2c2 100644 +index 92bb5120ab..eeca905c75 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -16,6 +16,7 @@ @@ -474,7 +475,7 @@ index d341fa25aa..91646bc2c2 100644 Settings *settings_new(void) { Settings *s; diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c -index 5db0dcef76..681f8677e4 100644 +index 53f0492116..c71941fdd7 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/nss-mymachines/nss-mymachines.c @@ -19,6 +19,7 @@ @@ -486,7 +487,7 @@ index 5db0dcef76..681f8677e4 100644 NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); NSS_GETPW_PROTOTYPES(mymachines); diff --git a/src/portable/portable.c b/src/portable/portable.c -index 3a1367ec2b..f29336cb1e 100644 +index ed7eac0291..78986977f8 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -31,6 +31,7 @@ @@ -498,31 +499,31 @@ index 3a1367ec2b..f29336cb1e 100644 static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c -index 3072b984e5..c46ae374bf 100644 +index b479335769..212d0bed20 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c -@@ -36,6 +36,7 @@ - #include "strv.h" +@@ -37,6 +37,7 @@ #include "terminal-util.h" + #include "utf8.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-get-properties.c b/src/shared/bus-get-properties.c -index 8ad4694046..da5082c02a 100644 +index 32f68d5e6a..bda1e1ef4f 100644 --- a/src/shared/bus-get-properties.c +++ b/src/shared/bus-get-properties.c -@@ -3,6 +3,7 @@ - #include "bus-get-properties.h" +@@ -4,6 +4,7 @@ #include "rlimit-util.h" + #include "stdio-util.h" #include "string-util.h" +#include "missing_stdlib.h" int bus_property_get_bool( sd_bus *bus, diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c -index b21fe39326..af2640005c 100644 +index 3e97be9671..2b8ca838f7 100644 --- a/src/shared/bus-unit-procs.c +++ b/src/shared/bus-unit-procs.c @@ -10,6 +10,7 @@ @@ -534,10 +535,10 @@ index b21fe39326..af2640005c 100644 struct CGroupInfo { char *cgroup_path; diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c -index f2652ed9a5..eb019fc89f 100644 +index 2bab2299fb..62afdc7973 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c -@@ -39,6 +39,7 @@ +@@ -44,6 +44,7 @@ #include "unit-def.h" #include "user-util.h" #include "utf8.h" @@ -546,22 +547,22 @@ index f2652ed9a5..eb019fc89f 100644 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 77c1c62182..5cd31f3c15 100644 +index fbda218b3b..aae0be75c6 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c -@@ -22,6 +22,7 @@ +@@ -21,6 +21,7 @@ + #include "path-util.h" #include "socket-util.h" #include "stdio-util.h" - /* #include "string-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 b812665315..8e68f7f8fc 100644 +index 8bd1e3a6ac..f8d6eab9bd 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c -@@ -23,6 +23,7 @@ +@@ -17,6 +17,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" @@ -570,7 +571,7 @@ index b812665315..8e68f7f8fc 100644 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..3fbaf5a639 100644 +index e95b638f4d..a1bf15baa8 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c @@ -14,6 +14,7 @@ @@ -582,7 +583,7 @@ index 7c4fc7021d..3fbaf5a639 100644 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 899e894ab7..628854ac9c 100644 +index bf574d32a5..a09c79d2fb 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -41,6 +41,7 @@ @@ -594,10 +595,10 @@ index 899e894ab7..628854ac9c 100644 /* 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 e03be6d23b..50e3d1f75c 100644 +index f689d9f28f..aae3957c2f 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c -@@ -23,6 +23,7 @@ +@@ -26,6 +26,7 @@ #include "strv.h" #include "terminal-util.h" #include "util.h" @@ -606,7 +607,7 @@ index e03be6d23b..50e3d1f75c 100644 static pid_t pager_pid = 0; diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c -index 7cb7d8a477..8e7d7f9e7c 100644 +index 5d5bf7f21d..f1002ffa6c 100644 --- a/src/shared/uid-range.c +++ b/src/shared/uid-range.c @@ -9,6 +9,7 @@ @@ -618,7 +619,7 @@ index 7cb7d8a477..8e7d7f9e7c 100644 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 b461aead60..9941695ed9 100644 +index 4391d9f1f5..9b73cd0aeb 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -26,6 +26,7 @@ @@ -630,7 +631,7 @@ index b461aead60..9941695ed9 100644 #define BUFFER_SIZE (256 * 1024) diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c -index 52217429b1..70708dedf3 100644 +index f0f9679769..128fc164da 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -6,6 +6,7 @@ @@ -642,7 +643,7 @@ index 52217429b1..70708dedf3 100644 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 6c020ac0ed..10723ec46c 100644 +index 0da59e2c75..66da3741ee 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -22,6 +22,7 @@ @@ -654,7 +655,7 @@ index 6c020ac0ed..10723ec46c 100644 _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 e1c2baf7f2..62d4086802 100644 +index 5159d19a38..0ed5b65844 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -34,6 +34,7 @@ @@ -666,7 +667,7 @@ index e1c2baf7f2..62d4086802 100644 typedef struct Spawn { sd_device *device; diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index c36f032f66..36970813d8 100644 +index ef6a0c112c..422fc19127 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -30,6 +30,7 @@ @@ -677,3 +678,6 @@ index c36f032f66..36970813d8 100644 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/poky/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch index abc438e4b..b689cf129 100644 --- a/poky/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch +++ b/poky/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch @@ -1,7 +1,7 @@ -From 47818052121d135632f5e46c369e3e4706a0f9e0 Mon Sep 17 00:00:00 2001 +From d3ed0da271738fd0fc3d3e4d82d6f5810334b05e 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 +Subject: [PATCH 06/26] Include netinet/if_ether.h Fixes /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' @@ -29,7 +29,8 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray - +[rebased for systemd 247] +Signed-off-by: Luca Boccassi --- src/libsystemd-network/sd-dhcp6-client.c | 1 - src/libsystemd/sd-netlink/netlink-types.c | 1 + @@ -52,10 +53,10 @@ Signed-off-by: Scott Murray src/udev/udev-builtin-net_setup_link.c | 1 + 19 files changed, 18 insertions(+), 4 deletions(-) -Index: systemd-stable/src/libsystemd-network/sd-dhcp6-client.c -=================================================================== ---- systemd-stable.orig/src/libsystemd-network/sd-dhcp6-client.c -+++ systemd-stable/src/libsystemd-network/sd-dhcp6-client.c +diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c +index 30ac526fc9..126077e13c 100644 +--- a/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -5,7 +5,6 @@ #include @@ -64,10 +65,10 @@ Index: systemd-stable/src/libsystemd-network/sd-dhcp6-client.c #include #include "sd-dhcp6-client.h" -Index: systemd-stable/src/libsystemd/sd-netlink/netlink-types.c -=================================================================== ---- systemd-stable.orig/src/libsystemd/sd-netlink/netlink-types.c -+++ systemd-stable/src/libsystemd/sd-netlink/netlink-types.c +diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c +index 6fb6c147d9..8eda02d202 100644 +--- a/src/libsystemd/sd-netlink/netlink-types.c ++++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -3,6 +3,7 @@ #include #include @@ -76,10 +77,10 @@ Index: systemd-stable/src/libsystemd/sd-netlink/netlink-types.c #include #include #include -Index: systemd-stable/src/machine/machine-dbus.c -=================================================================== ---- systemd-stable.orig/src/machine/machine-dbus.c -+++ systemd-stable/src/machine/machine-dbus.c +diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c +index bb67beb665..f5780f1aec 100644 +--- a/src/machine/machine-dbus.c ++++ b/src/machine/machine-dbus.c @@ -3,6 +3,7 @@ #include #include @@ -88,66 +89,66 @@ Index: systemd-stable/src/machine/machine-dbus.c /* When we include libgen.h because we need dirname() we immediately * undefine basename() since libgen.h defines it as a macro to the POSIX -Index: systemd-stable/src/network/netdev/bond.c -=================================================================== ---- systemd-stable.orig/src/network/netdev/bond.c -+++ systemd-stable/src/network/netdev/bond.c +diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c +index e27f36067b..8868f1da5d 100644 +--- a/src/network/netdev/bond.c ++++ b/src/network/netdev/bond.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include "alloc-util.h" #include "bond.h" #include "bond-util.h" -Index: systemd-stable/src/network/netdev/bridge.c -=================================================================== ---- systemd-stable.orig/src/network/netdev/bridge.c -+++ systemd-stable/src/network/netdev/bridge.c +diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c +index 1f59cd8b42..5fdbae7e99 100644 +--- a/src/network/netdev/bridge.c ++++ b/src/network/netdev/bridge.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "bridge.h" -Index: systemd-stable/src/network/netdev/macsec.c -=================================================================== ---- systemd-stable.orig/src/network/netdev/macsec.c -+++ systemd-stable/src/network/netdev/macsec.c +diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c +index 82e71c3920..fbae86e216 100644 +--- a/src/network/netdev/macsec.c ++++ b/src/network/netdev/macsec.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include -Index: systemd-stable/src/network/netdev/netdev-gperf.gperf -=================================================================== ---- systemd-stable.orig/src/network/netdev/netdev-gperf.gperf -+++ systemd-stable/src/network/netdev/netdev-gperf.gperf +diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf +index 4e89761f2c..91251fa6ec 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 "bareudp.h" #include "bond.h" - #include "bridge.h" -Index: systemd-stable/src/network/netdev/netdev.c -=================================================================== ---- systemd-stable.orig/src/network/netdev/netdev.c -+++ systemd-stable/src/network/netdev/netdev.c +diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c +index 9f390b5781..62aeafb1e4 100644 +--- a/src/network/netdev/netdev.c ++++ b/src/network/netdev/netdev.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include -Index: systemd-stable/src/network/networkd-brvlan.c -=================================================================== ---- systemd-stable.orig/src/network/networkd-brvlan.c -+++ systemd-stable/src/network/networkd-brvlan.c +diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c +index e53c73c30c..9bf0771b84 100644 +--- a/src/network/networkd-brvlan.c ++++ b/src/network/networkd-brvlan.c @@ -4,6 +4,7 @@ ***/ @@ -156,24 +157,49 @@ Index: systemd-stable/src/network/networkd-brvlan.c #include #include -Index: systemd-stable/src/network/networkd-dhcp-common.c -=================================================================== ---- systemd-stable.orig/src/network/networkd-dhcp-common.c -+++ systemd-stable/src/network/networkd-dhcp-common.c -@@ -5,6 +5,7 @@ - #include "escape.h" - #include "in-addr-util.h" +diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c +index c338c775a7..ab35d65c53 100644 +--- a/src/network/networkd-dhcp-common.c ++++ b/src/network/networkd-dhcp-common.c +@@ -1,7 +1,8 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include +-#include ++#include ++#include + + #include "dhcp-internal.h" + #include "dhcp6-internal.h" +@@ -10,6 +10,7 @@ #include "networkd-dhcp-common.h" + #include "networkd-link.h" + #include "networkd-manager.h" +#include #include "networkd-network.h" #include "parse-util.h" - #include "string-table.h" -Index: systemd-stable/src/network/networkd-dhcp4.c -=================================================================== ---- systemd-stable.orig/src/network/networkd-dhcp4.c -+++ systemd-stable/src/network/networkd-dhcp4.c + #include "socket-util.h" +diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c +index cf279c640d..bae541029b 100644 +--- a/src/network/networkd-dhcp-server.c ++++ b/src/network/networkd-dhcp-server.c +@@ -1,8 +1,8 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include +-#include +-#include ++#include ++#include + + #include "sd-dhcp-server.h" + +diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c +index 02d33841b6..a30d8dd82c 100644 +--- a/src/network/networkd-dhcp4.c ++++ b/src/network/networkd-dhcp4.c @@ -1,9 +1,9 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include @@ -183,10 +209,10 @@ Index: systemd-stable/src/network/networkd-dhcp4.c #include "escape.h" #include "alloc-util.h" -Index: systemd-stable/src/network/networkd-dhcp6.c -=================================================================== ---- systemd-stable.orig/src/network/networkd-dhcp6.c -+++ systemd-stable/src/network/networkd-dhcp6.c +diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c +index d4d4182ee5..635d08f7d5 100644 +--- a/src/network/networkd-dhcp6.c ++++ b/src/network/networkd-dhcp6.c @@ -3,9 +3,9 @@ Copyright © 2014 Intel Corporation. All rights reserved. ***/ @@ -198,12 +224,12 @@ Index: systemd-stable/src/network/networkd-dhcp6.c #include "sd-dhcp6-client.h" -Index: systemd-stable/src/network/networkd-link.c -=================================================================== ---- systemd-stable.orig/src/network/networkd-link.c -+++ systemd-stable/src/network/networkd-link.c +diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c +index ced18de425..07b43770de 100644 +--- a/src/network/networkd-link.c ++++ b/src/network/networkd-link.c @@ -1,8 +1,8 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include @@ -212,41 +238,59 @@ Index: systemd-stable/src/network/networkd-link.c #include #include -Index: systemd-stable/src/network/networkd-network.c -=================================================================== ---- systemd-stable.orig/src/network/networkd-network.c -+++ systemd-stable/src/network/networkd-network.c +diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c +index 3254641461..f0ada419fd 100644 +--- a/src/network/networkd-network.c ++++ b/src/network/networkd-network.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include -Index: systemd-stable/src/network/test-network-tables.c -=================================================================== ---- systemd-stable.orig/src/network/test-network-tables.c -+++ systemd-stable/src/network/test-network-tables.c -@@ -1,3 +1,4 @@ +diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c +index 10f30c1a7e..579885726c 100644 +--- a/src/network/networkd-route.c ++++ b/src/network/networkd-route.c +@@ -1,7 +1,10 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include +-#include ++/* linux/ipv6_route.h conflicts with netinet/in.h so define manually */ ++#ifndef IP6_RT_PRIO_USER ++#define IP6_RT_PRIO_USER 1024 ++#endif + + #include "alloc-util.h" + #include "netlink-util.h" +diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c +index 475cac7527..9bae6eda16 100644 +--- a/src/network/test-network-tables.c ++++ b/src/network/test-network-tables.c +@@ -1,5 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +#include #include "bond.h" #include "dhcp6-internal.h" #include "dhcp6-protocol.h" -Index: systemd-stable/src/shared/ethtool-util.c -=================================================================== ---- systemd-stable.orig/src/shared/ethtool-util.c -+++ systemd-stable/src/shared/ethtool-util.c +diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c +index e6fab262f2..41dd3d7df7 100644 +--- a/src/shared/ethtool-util.c ++++ b/src/shared/ethtool-util.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include -Index: systemd-stable/src/shared/ethtool-util.h -=================================================================== ---- systemd-stable.orig/src/shared/ethtool-util.h -+++ systemd-stable/src/shared/ethtool-util.h +diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h +index f94b3e15bf..08a7e4fa09 100644 +--- a/src/shared/ethtool-util.h ++++ b/src/shared/ethtool-util.h @@ -3,6 +3,7 @@ #include @@ -255,25 +299,28 @@ Index: systemd-stable/src/shared/ethtool-util.h #include #include "conf-parser.h" -Index: systemd-stable/src/udev/net/link-config.c -=================================================================== ---- systemd-stable.orig/src/udev/net/link-config.c -+++ systemd-stable/src/udev/net/link-config.c +diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c +index d12fd0e299..636806dc23 100644 +--- a/src/udev/net/link-config.c ++++ b/src/udev/net/link-config.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include -Index: systemd-stable/src/udev/udev-builtin-net_setup_link.c -=================================================================== ---- systemd-stable.orig/src/udev/udev-builtin-net_setup_link.c -+++ systemd-stable/src/udev/udev-builtin-net_setup_link.c +diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c +index cb12b943fe..5a28c8b563 100644 +--- a/src/udev/udev-builtin-net_setup_link.c ++++ b/src/udev/udev-builtin-net_setup_link.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include "device-util.h" #include "alloc-util.h" #include "link-config.h" +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch new file mode 100644 index 000000000..686542158 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch @@ -0,0 +1,156 @@ +From 87a14dde13c8fa68239a4ab62914a093062b3b29 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Mon, 25 Feb 2019 14:56:21 +0800 +Subject: [PATCH 07/26] 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. + +Dont use GNU GLOB extentions on non-glibc systems + +Conditionalize use of GLOB_ALTDIRFUNC + +Upstream-Status: Inappropriate [musl specific] + +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 ++++++++++++++++ + src/tmpfiles/tmpfiles.c | 10 ++++++++++ + 3 files changed, 38 insertions(+) + +diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c +index bc0278e57f..c973f82e54 100644 +--- a/src/basic/glob-util.c ++++ b/src/basic/glob-util.c +@@ -12,6 +12,12 @@ + #include "path-util.h" + #include "strv.h" + ++/* Don't fail if the standard library ++ * doesn't provide brace expansion */ ++#ifndef GLOB_BRACE ++#define GLOB_BRACE 0 ++#endif ++ + static void closedir_wrapper(void* v) { + (void) closedir(v); + } +@@ -19,6 +25,7 @@ static void closedir_wrapper(void* v) { + int safe_glob(const char *path, int flags, glob_t *pglob) { + int k; + ++#ifdef GLOB_ALTDIRFUNC + /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ + assert(!(flags & GLOB_ALTDIRFUNC)); + +@@ -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; ++#endif + + errno = 0; ++#ifdef GLOB_ALTDIRFUNC + k = glob(path, flags | GLOB_ALTDIRFUNC, NULL, pglob); ++#else ++ k = glob(path, flags, NULL, pglob); ++#endif + if (k == GLOB_NOMATCH) + return -ENOENT; + if (k == GLOB_NOSPACE) +diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c +index df6444c433..79a692046e 100644 +--- a/src/test/test-glob-util.c ++++ b/src/test/test-glob-util.c +@@ -12,6 +12,12 @@ + #include "rm-rf.h" + #include "tmpfile-util.h" + ++/* Don't fail if the standard library ++ * doesn't provide brace expansion */ ++#ifndef GLOB_BRACE ++#define GLOB_BRACE 0 ++#endif ++ + static void test_glob_exists(void) { + char name[] = "/tmp/test-glob_exists.XXXXXX"; + int fd = -1; +@@ -39,11 +45,13 @@ static void test_glob_no_dot(void) { + const char *fn; + + _cleanup_globfree_ glob_t g = { ++#ifdef GLOB_ALTDIRFUNC + .gl_closedir = closedir_wrapper, + .gl_readdir = (struct dirent *(*)(void *)) readdir_no_dot, + .gl_opendir = (void *(*)(const char *)) opendir, + .gl_lstat = lstat, + .gl_stat = stat, ++#endif + }; + + int r; +@@ -51,11 +59,19 @@ static void test_glob_no_dot(void) { + assert_se(mkdtemp(template)); + + fn = strjoina(template, "/*"); ++#ifdef GLOB_ALTDIRFUNC + r = glob(fn, GLOB_NOSORT|GLOB_BRACE|GLOB_ALTDIRFUNC, NULL, &g); ++#else ++ r = glob(fn, GLOB_NOSORT|GLOB_BRACE, NULL, &g); ++#endif + assert_se(r == GLOB_NOMATCH); + + fn = strjoina(template, "/.*"); ++#ifdef GLOB_ALTDIRFUNC + r = glob(fn, GLOB_NOSORT|GLOB_BRACE|GLOB_ALTDIRFUNC, NULL, &g); ++#else ++ r = glob(fn, GLOB_NOSORT|GLOB_BRACE, NULL, &g); ++#endif + assert_se(r == GLOB_NOMATCH); + + (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index 9906c70eef..5eb63b1d57 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -63,6 +63,12 @@ + #include "umask-util.h" + #include "user-util.h" + ++/* Don't fail if the standard library ++ * doesn't provide brace expansion */ ++#ifndef GLOB_BRACE ++#define GLOB_BRACE 0 ++#endif ++ + /* 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 +@@ -1936,7 +1942,9 @@ finish: + + static int glob_item(Item *i, action_t action) { + _cleanup_globfree_ glob_t g = { ++#ifdef GLOB_ALTDIRFUNC + .gl_opendir = (void *(*)(const char *)) opendir_nomod, ++#endif + }; + int r = 0, k; + char **fn; +@@ -1956,7 +1964,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 = { ++#ifdef GLOB_ALTDIRFUNC + .gl_opendir = (void *(*)(const char *)) opendir_nomod, ++#endif + }; + int r = 0, k; + char **fn; +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch b/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch deleted file mode 100644 index dd6ecebeb..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 77f98727f1d19a8fb327b55c92f1a9ee7b859e9f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 25 Feb 2019 14:56:21 +0800 -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. - -Dont use GNU GLOB extentions on non-glibc systems - -Conditionalize use of GLOB_ALTDIRFUNC - -Upstream-Status: Inappropriate [musl specific] - -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 ++++++++++++++++ - src/tmpfiles/tmpfiles.c | 10 ++++++++++ - 3 files changed, 38 insertions(+) - -Index: systemd-stable/src/basic/glob-util.c -=================================================================== ---- systemd-stable.orig/src/basic/glob-util.c -+++ systemd-stable/src/basic/glob-util.c -@@ -12,6 +12,12 @@ - #include "path-util.h" - #include "strv.h" - -+/* Don't fail if the standard library -+ * doesn't provide brace expansion */ -+#ifndef GLOB_BRACE -+#define GLOB_BRACE 0 -+#endif -+ - static void closedir_wrapper(void* v) { - (void) closedir(v); - } -@@ -19,6 +25,7 @@ static void closedir_wrapper(void* v) { - int safe_glob(const char *path, int flags, glob_t *pglob) { - int k; - -+#ifdef GLOB_ALTDIRFUNC - /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ - assert(!(flags & GLOB_ALTDIRFUNC)); - -@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flag - pglob->gl_lstat = lstat; - if (!pglob->gl_stat) - pglob->gl_stat = stat; -+#endif - - errno = 0; -+#ifdef GLOB_ALTDIRFUNC - k = glob(path, flags | GLOB_ALTDIRFUNC, NULL, pglob); -+#else -+ k = glob(path, flags, NULL, pglob); -+#endif - if (k == GLOB_NOMATCH) - return -ENOENT; - if (k == GLOB_NOSPACE) -Index: systemd-stable/src/test/test-glob-util.c -=================================================================== ---- systemd-stable.orig/src/test/test-glob-util.c -+++ systemd-stable/src/test/test-glob-util.c -@@ -12,6 +12,12 @@ - #include "rm-rf.h" - #include "tmpfile-util.h" - -+/* Don't fail if the standard library -+ * doesn't provide brace expansion */ -+#ifndef GLOB_BRACE -+#define GLOB_BRACE 0 -+#endif -+ - static void test_glob_exists(void) { - char name[] = "/tmp/test-glob_exists.XXXXXX"; - int fd = -1; -@@ -39,11 +45,13 @@ static void test_glob_no_dot(void) { - const char *fn; - - _cleanup_globfree_ glob_t g = { -+#ifdef GLOB_ALTDIRFUNC - .gl_closedir = closedir_wrapper, - .gl_readdir = (struct dirent *(*)(void *)) readdir_no_dot, - .gl_opendir = (void *(*)(const char *)) opendir, - .gl_lstat = lstat, - .gl_stat = stat, -+#endif - }; - - int r; -@@ -51,11 +59,19 @@ static void test_glob_no_dot(void) { - assert_se(mkdtemp(template)); - - fn = strjoina(template, "/*"); -+#ifdef GLOB_ALTDIRFUNC - r = glob(fn, GLOB_NOSORT|GLOB_BRACE|GLOB_ALTDIRFUNC, NULL, &g); -+#else -+ r = glob(fn, GLOB_NOSORT|GLOB_BRACE, NULL, &g); -+#endif - assert_se(r == GLOB_NOMATCH); - - fn = strjoina(template, "/.*"); -+#ifdef GLOB_ALTDIRFUNC - r = glob(fn, GLOB_NOSORT|GLOB_BRACE|GLOB_ALTDIRFUNC, NULL, &g); -+#else -+ r = glob(fn, GLOB_NOSORT|GLOB_BRACE, NULL, &g); -+#endif - assert_se(r == GLOB_NOMATCH); - - (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); -Index: systemd-stable/src/tmpfiles/tmpfiles.c -=================================================================== ---- systemd-stable.orig/src/tmpfiles/tmpfiles.c -+++ systemd-stable/src/tmpfiles/tmpfiles.c -@@ -59,6 +59,12 @@ - #include "umask-util.h" - #include "user-util.h" - -+/* Don't fail if the standard library -+ * doesn't provide brace expansion */ -+#ifndef GLOB_BRACE -+#define GLOB_BRACE 0 -+#endif -+ - /* 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 -@@ -1867,7 +1873,9 @@ finish: - - static int glob_item(Item *i, action_t action) { - _cleanup_globfree_ glob_t g = { -+#ifdef GLOB_ALTDIRFUNC - .gl_opendir = (void *(*)(const char *)) opendir_nomod, -+#endif - }; - int r = 0, k; - char **fn; -@@ -1887,7 +1895,9 @@ static int glob_item(Item *i, action_t a - - static int glob_item_recursively(Item *i, fdaction_t action) { - _cleanup_globfree_ glob_t g = { -+#ifdef GLOB_ALTDIRFUNC - .gl_opendir = (void *(*)(const char *)) opendir_nomod, -+#endif - }; - int r = 0, k; - char **fn; diff --git a/poky/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/poky/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch index 1f618932e..94cdc2efd 100644 --- a/poky/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +++ b/poky/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch @@ -1,7 +1,7 @@ -From 7c440cfc53aa52c9dc91c3a8c105bcf314c53af6 Mon Sep 17 00:00:00 2001 +From 8caea3fe87d55fd16de7d1b8266239fa954cb498 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH] add missing FTW_ macros for musl +Subject: [PATCH 08/26] add missing FTW_ macros for musl This is to avoid build failures like below for musl. @@ -10,13 +10,12 @@ 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 c487e65e7bde..23602ebbd533 100644 +index aeaf6ad5ec..3df1084ef2 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 *); @@ -43,3 +42,6 @@ index c487e65e7bde..23602ebbd533 100644 +#ifndef FTW_SKIP_SIBLINGS +#define FTW_SKIP_SIBLINGS 3 +#endif +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/poky/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch new file mode 100644 index 000000000..76cc75cf6 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch @@ -0,0 +1,45 @@ +From d8e4f0aa1760e4c7bb8476beecd35025c9cbb95a Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Mon, 25 Feb 2019 15:03:47 +0800 +Subject: [PATCH 09/26] 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 0851613fc9..4417101569 100644 +--- a/src/basic/process-util.c ++++ b/src/basic/process-util.c +@@ -18,6 +18,9 @@ + #if HAVE_VALGRIND_VALGRIND_H + #include + #endif ++#ifndef __GLIBC__ ++#include ++#endif + + #include "alloc-util.h" + #include "architecture.h" +@@ -1143,11 +1146,15 @@ void reset_cached_pid(void) { + cached_pid = CACHED_PID_UNSET; + } + ++#ifdef __GLIBC__ + /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc + * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against + * libpthread, as it is part of glibc anyway. */ + extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle); + extern void* __dso_handle _weak_; ++#else ++#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child) ++#endif + + pid_t getpid_cached(void) { + static bool installed = false; +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch b/poky/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch new file mode 100644 index 000000000..aeacd865a --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch @@ -0,0 +1,97 @@ +From e45bb02174812e4935214f42a18725be320770d5 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Mon, 25 Feb 2019 15:12:41 +0800 +Subject: [PATCH 10/26] 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 +uintmax_t. + +Fixes portablility errors like + +execute.c:3446:36: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=] +| fprintf(f, "%s%s: " RLIM_FMT "\n", +| ^~~~~~~~ +| prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max); +| ~~~~~~~~~~~~~~~~~~~~~~ + +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 +++++----- + src/core/execute.c | 4 ++-- + 3 files changed, 8 insertions(+), 14 deletions(-) + +diff --git a/src/basic/format-util.h b/src/basic/format-util.h +index b7e18768e3..3195ab205d 100644 +--- a/src/basic/format-util.h ++++ b/src/basic/format-util.h +@@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); + # define PRI_TIMEX "li" + #endif + +-#if SIZEOF_RLIM_T == 8 +-# define RLIM_FMT "%" PRIu64 +-#elif SIZEOF_RLIM_T == 4 +-# define RLIM_FMT "%" PRIu32 +-#else +-# error Unknown rlim_t size +-#endif ++#define RLIM_FMT "%ju" + + #if SIZEOF_DEV_T == 8 + # define DEV_FMT "%" PRIu64 +diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c +index 880976312c..9e1b61cd4a 100644 +--- a/src/basic/rlimit-util.c ++++ b/src/basic/rlimit-util.c +@@ -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) +- (void) asprintf(&s, "infinity:" RLIM_FMT, rl->rlim_max); ++ (void) asprintf(&s, "infinity:" RLIM_FMT, (uintmax_t)rl->rlim_max); + else if (rl->rlim_max >= RLIM_INFINITY) +- (void) asprintf(&s, RLIM_FMT ":infinity", rl->rlim_cur); ++ (void) asprintf(&s, RLIM_FMT ":infinity", (uintmax_t)rl->rlim_cur); + else if (rl->rlim_cur == rl->rlim_max) +- (void) asprintf(&s, RLIM_FMT, rl->rlim_cur); ++ (void) asprintf(&s, RLIM_FMT, (uintmax_t)rl->rlim_cur); + else +- (void) asprintf(&s, RLIM_FMT ":" RLIM_FMT, rl->rlim_cur, rl->rlim_max); ++ (void) asprintf(&s, RLIM_FMT ":" RLIM_FMT, (uintmax_t)rl->rlim_cur, (uintmax_t)rl->rlim_max); + + if (!s) + return -ENOMEM; +@@ -403,7 +403,7 @@ int rlimit_nofile_safe(void) { + + rl.rlim_cur = FD_SETSIZE; + if (setrlimit(RLIMIT_NOFILE, &rl) < 0) +- return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", rl.rlim_cur); ++ return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", (uintmax_t)rl.rlim_cur); + + return 1; + } +diff --git a/src/core/execute.c b/src/core/execute.c +index 89632e0582..335283776c 100644 +--- a/src/core/execute.c ++++ b/src/core/execute.c +@@ -5288,9 +5288,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { + for (unsigned i = 0; i < RLIM_NLIMITS; i++) + if (c->rlimit[i]) { + fprintf(f, "%sLimit%s: " RLIM_FMT "\n", +- prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max); ++ prefix, rlimit_to_string(i), (uintmax_t)c->rlimit[i]->rlim_max); + fprintf(f, "%sLimit%sSoft: " RLIM_FMT "\n", +- prefix, rlimit_to_string(i), c->rlimit[i]->rlim_cur); ++ prefix, rlimit_to_string(i), (uintmax_t)c->rlimit[i]->rlim_cur); + } + + if (c->ioprio_set) { +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/poky/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch deleted file mode 100644 index 15055161f..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -From eed7427db98cc01db7e9b3479655d68b044bc85b Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 25 Feb 2019 15:03:47 +0800 -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(+) - -Index: systemd-stable/src/basic/process-util.c -=================================================================== ---- systemd-stable.orig/src/basic/process-util.c -+++ systemd-stable/src/basic/process-util.c -@@ -18,6 +18,9 @@ - #if HAVE_VALGRIND_VALGRIND_H - #include - #endif -+#ifndef __GLIBC__ -+#include -+#endif - - #include "alloc-util.h" - #include "architecture.h" -@@ -1143,11 +1146,15 @@ void reset_cached_pid(void) { - cached_pid = CACHED_PID_UNSET; - } - -+#ifdef __GLIBC__ - /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc - * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against - * libpthread, as it is part of glibc anyway. */ - extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle); - extern void* __dso_handle _weak_; -+#else -+#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child) -+#endif - - pid_t getpid_cached(void) { - static bool installed = false; diff --git a/poky/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch b/poky/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch deleted file mode 100644 index a6fcd2f5d..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 4aa91347ae975051dbe4dd2f98a1f4f459f2604f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 25 Feb 2019 15:12:41 +0800 -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 -uintmax_t. - -Fixes portablility errors like - -execute.c:3446:36: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=] -| fprintf(f, "%s%s: " RLIM_FMT "\n", -| ^~~~~~~~ -| prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max); -| ~~~~~~~~~~~~~~~~~~~~~~ - -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 +++++----- - src/core/execute.c | 4 ++-- - 3 files changed, 8 insertions(+), 14 deletions(-) - -Index: systemd-stable/src/basic/format-util.h -=================================================================== ---- systemd-stable.orig/src/basic/format-util.h -+++ systemd-stable/src/basic/format-util.h -@@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32 - # define PRI_TIMEX "li" - #endif - --#if SIZEOF_RLIM_T == 8 --# define RLIM_FMT "%" PRIu64 --#elif SIZEOF_RLIM_T == 4 --# define RLIM_FMT "%" PRIu32 --#else --# error Unknown rlim_t size --#endif -+#define RLIM_FMT "%ju" - - #if SIZEOF_DEV_T == 8 - # define DEV_FMT "%" PRIu64 -Index: systemd-stable/src/basic/rlimit-util.c -=================================================================== ---- systemd-stable.orig/src/basic/rlimit-util.c -+++ systemd-stable/src/basic/rlimit-util.c -@@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *r - if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) - s = strdup("infinity"); - else if (rl->rlim_cur >= RLIM_INFINITY) -- (void) asprintf(&s, "infinity:" RLIM_FMT, rl->rlim_max); -+ (void) asprintf(&s, "infinity:" RLIM_FMT, (uintmax_t)rl->rlim_max); - else if (rl->rlim_max >= RLIM_INFINITY) -- (void) asprintf(&s, RLIM_FMT ":infinity", rl->rlim_cur); -+ (void) asprintf(&s, RLIM_FMT ":infinity", (uintmax_t)rl->rlim_cur); - else if (rl->rlim_cur == rl->rlim_max) -- (void) asprintf(&s, RLIM_FMT, rl->rlim_cur); -+ (void) asprintf(&s, RLIM_FMT, (uintmax_t)rl->rlim_cur); - else -- (void) asprintf(&s, RLIM_FMT ":" RLIM_FMT, rl->rlim_cur, rl->rlim_max); -+ (void) asprintf(&s, RLIM_FMT ":" RLIM_FMT, (uintmax_t)rl->rlim_cur, (uintmax_t)rl->rlim_max); - - if (!s) - return -ENOMEM; -@@ -403,7 +403,7 @@ int rlimit_nofile_safe(void) { - - rl.rlim_cur = FD_SETSIZE; - if (setrlimit(RLIMIT_NOFILE, &rl) < 0) -- return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", rl.rlim_cur); -+ return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", (uintmax_t)rl.rlim_cur); - - return 1; - } -Index: systemd-stable/src/core/execute.c -=================================================================== ---- systemd-stable.orig/src/core/execute.c -+++ systemd-stable/src/core/execute.c -@@ -4686,9 +4686,9 @@ void exec_context_dump(const ExecContext - for (i = 0; i < RLIM_NLIMITS; i++) - if (c->rlimit[i]) { - fprintf(f, "%sLimit%s: " RLIM_FMT "\n", -- prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max); -+ prefix, rlimit_to_string(i), (uintmax_t)c->rlimit[i]->rlim_max); - fprintf(f, "%sLimit%sSoft: " RLIM_FMT "\n", -- prefix, rlimit_to_string(i), c->rlimit[i]->rlim_cur); -+ prefix, rlimit_to_string(i), (uintmax_t)c->rlimit[i]->rlim_cur); - } - - if (c->ioprio_set) { diff --git a/poky/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/poky/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch new file mode 100644 index 000000000..6d7fdbcb6 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch @@ -0,0 +1,42 @@ +From d1db531ddd3bbf94d5e764b7917bcc8684ff6357 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Wed, 28 Feb 2018 21:25:22 -0800 +Subject: [PATCH 11/26] 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 3c9dc180fa..e1a59d408c 100644 +--- a/src/test/test-sizeof.c ++++ b/src/test/test-sizeof.c +@@ -55,8 +55,10 @@ int main(void) { + info(unsigned); + info(long unsigned); + info(long long unsigned); ++#ifdef __GLIBC__ + info(__syscall_ulong_t); + info(__syscall_slong_t); ++#endif + + info(float); + info(double); +@@ -74,7 +76,9 @@ int main(void) { + info(ssize_t); + info(time_t); + info(usec_t); ++#ifdef __GLIBC__ + info(__time_t); ++#endif + info(pid_t); + info(uid_t); + info(gid_t); +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/poky/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch new file mode 100644 index 000000000..c15b6e7d8 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch @@ -0,0 +1,99 @@ +From 03e89da266edf70121a19ffc32a78cc3b97585ef Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Tue, 10 Oct 2017 14:33:30 -0700 +Subject: [PATCH 12/26] 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: + + http://lists.landley.net/pipermail/toybox-landley.net/2014-September/003610.html + http://www.openwall.com/lists/musl/2015/02/05/2 + +Note that laccess() is never passing AT_EACCESS so a lot of the +discussion in the links above doesn't apply. Note also that +(currently) all systemd callers of laccess() pass mode as F_OK, so +only check for existence of a file, not access permissions. +Therefore, in this case, the only distiction between faccessat() +with (flag == 0) and (flag == AT_SYMLINK_NOFOLLOW) is the behaviour +for broken symlinks; laccess() on a broken symlink will succeed with +(flag == AT_SYMLINK_NOFOLLOW) and fail (flag == 0). + +The laccess() macros was added to systemd some time ago and it's not +clear if or why it needs to return success for broken symlinks. Maybe +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 5dc8853eac..0491b3dae2 100644 +--- a/src/basic/fs-util.h ++++ b/src/basic/fs-util.h +@@ -43,7 +43,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); + int fd_warn_permissions(const char *path, int fd); + int stat_warn_permissions(const char *path, const struct stat *st); + +-#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) ++/* ++ 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: ++ ++ http://lists.landley.net/pipermail/toybox-landley.net/2014-September/003610.html ++ http://www.openwall.com/lists/musl/2015/02/05/2 ++ ++ Note that laccess() is never passing AT_EACCESS so a lot of the discussion in ++ the links above doesn't apply. Note also that (currently) all systemd callers ++ of laccess() pass mode as F_OK, so only check for existence of a file, not ++ access permissions. Therefore, in this case, the only distiction between ++ faccessat() with (flag == 0) and (flag == AT_SYMLINK_NOFOLLOW) is the ++ behaviour for broken symlinks; laccess() on a broken symlink will succeed ++ with (flag == AT_SYMLINK_NOFOLLOW) and fail (flag == 0). ++ ++ The laccess() macros was added to systemd some time ago and it's not clear if ++ or why it needs to return success for broken symlinks. Maybe just historical ++ and not actually necessary or desired behaviour? ++*/ ++ ++#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), 0) + + 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 1d05409086..1ed06c31ab 100644 +--- a/src/shared/base-filesystem.c ++++ b/src/shared/base-filesystem.c +@@ -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 ++) { +- if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0) ++ if (faccessat(fd, table[i].dir, F_OK, 0) >= 0) + continue; + + if (table[i].target) { +@@ -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) { +- if (faccessat(fd, s, F_OK, AT_SYMLINK_NOFOLLOW) < 0) ++ if (faccessat(fd, s, F_OK, 0) < 0) + continue; + + /* check if a specific file exists at the target path */ +@@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { + if (!p) + return log_oom(); + +- if (faccessat(fd, p, F_OK, AT_SYMLINK_NOFOLLOW) < 0) ++ if (faccessat(fd, p, F_OK, 0) < 0) + continue; + } + +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/poky/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch new file mode 100644 index 000000000..89736bcfd --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -0,0 +1,35 @@ +From dd134880e9a16595ab473934577e873c748e9c7a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 27 May 2018 08:36:44 -0700 +Subject: [PATCH 13/26] 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 + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Khem Raj +--- + 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 f5780f1aec..aec5825b3e 100644 +--- a/src/machine/machine-dbus.c ++++ b/src/machine/machine-dbus.c +@@ -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-get-properties.h" +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/poky/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch new file mode 100644 index 000000000..e95d2ae07 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch @@ -0,0 +1,41 @@ +From 55af446156da863b5b36a1109845858956a4c274 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Wed, 4 Jul 2018 15:00:44 +0800 +Subject: [PATCH 14/26] 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. + + Failed to adjust OOM setting: Invalid argument + +This error appears for systemd-udevd.service and dbus.service. +This is because kernel receives '-' instead of the whole '-900' +if buffering is disabled. + +This is libc implementation specific, as glibc does not have this issue. + +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 4417101569..556dab8ebf 100644 +--- a/src/basic/process-util.c ++++ b/src/basic/process-util.c +@@ -1536,7 +1536,7 @@ int set_oom_score_adjust(int value) { + sprintf(t, "%i", value); + + return write_string_file("/proc/self/oom_score_adj", t, +- WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER); ++ WRITE_STRING_FILE_VERIFY_ON_FAILURE); + } + + int pidfd_get_pid(int fd, pid_t *ret) { +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/poky/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch deleted file mode 100644 index 049096d2a..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 62fac5e3ff0fccd329cdc49605258b6d0e573a3e Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Wed, 28 Feb 2018 21:25:22 -0800 -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 1020e0cb3153..c65062d2562c 100644 ---- a/src/test/test-sizeof.c -+++ b/src/test/test-sizeof.c -@@ -44,8 +44,10 @@ int main(void) { - info(unsigned); - info(long unsigned); - info(long long unsigned); -+#ifdef __GLIBC__ - info(__syscall_ulong_t); - info(__syscall_slong_t); -+#endif - - info(float); - info(double); -@@ -63,7 +65,9 @@ int main(void) { - info(ssize_t); - info(time_t); - info(usec_t); -+#ifdef __GLIBC__ - info(__time_t); -+#endif - info(pid_t); - info(uid_t); - info(gid_t); diff --git a/poky/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/poky/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch new file mode 100644 index 000000000..5cdcf84dc --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch @@ -0,0 +1,62 @@ +From e382845aed90cfe4496a8351d57d4466dd2e9a9c Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Tue, 10 Jul 2018 15:40:17 +0800 +Subject: [PATCH 15/26] distinguish XSI-compliant strerror_r from GNU-specifi + strerror_r + +XSI-compliant strerror_r and GNU-specifi strerror_r are different. + + int strerror_r(int errnum, char *buf, size_t buflen); + /* XSI-compliant */ + + char *strerror_r(int errnum, char *buf, size_t buflen); + /* GNU-specific */ + +We need to distinguish between them. Otherwise, we'll get an int value +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 e8e6ad555b..8ca5271d02 100644 +--- a/src/journal/journal-send.c ++++ b/src/journal/journal-send.c +@@ -348,7 +348,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove + char* j; + + errno = 0; ++#ifndef __GLIBC__ ++ strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); ++ j = buffer + 8 + k; ++#else + j = strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); ++#endif + if (errno == 0) { + 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 8da2024a50..9605a9b869 100644 +--- a/src/libsystemd/sd-bus/bus-error.c ++++ b/src/libsystemd/sd-bus/bus-error.c +@@ -392,7 +392,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { + return; + + errno = 0; ++#ifndef __GLIBC__ ++ strerror_r(error, m, k); ++ x = m; ++#else + x = strerror_r(error, m, k); ++#endif + if (errno == ERANGE || strlen(x) >= k - 1) { + free(m); + k *= 2; +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/poky/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch deleted file mode 100644 index 0a7594c06..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ /dev/null @@ -1,97 +0,0 @@ -From e6f871078d8d6f076c84f908fa57af15417ab87d Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Tue, 10 Oct 2017 14:33:30 -0700 -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: - - http://lists.landley.net/pipermail/toybox-landley.net/2014-September/003610.html - http://www.openwall.com/lists/musl/2015/02/05/2 - -Note that laccess() is never passing AT_EACCESS so a lot of the -discussion in the links above doesn't apply. Note also that -(currently) all systemd callers of laccess() pass mode as F_OK, so -only check for existence of a file, not access permissions. -Therefore, in this case, the only distiction between faccessat() -with (flag == 0) and (flag == AT_SYMLINK_NOFOLLOW) is the behaviour -for broken symlinks; laccess() on a broken symlink will succeed with -(flag == AT_SYMLINK_NOFOLLOW) and fail (flag == 0). - -The laccess() macros was added to systemd some time ago and it's not -clear if or why it needs to return success for broken symlinks. Maybe -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(-) - -Index: systemd-stable/src/basic/fs-util.h -=================================================================== ---- systemd-stable.orig/src/basic/fs-util.h -+++ systemd-stable/src/basic/fs-util.h -@@ -42,7 +42,27 @@ int fchmod_opath(int fd, mode_t m); - int fd_warn_permissions(const char *path, int fd); - int stat_warn_permissions(const char *path, const struct stat *st); - --#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) -+/* -+ 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: -+ -+ http://lists.landley.net/pipermail/toybox-landley.net/2014-September/003610.html -+ http://www.openwall.com/lists/musl/2015/02/05/2 -+ -+ Note that laccess() is never passing AT_EACCESS so a lot of the discussion in -+ the links above doesn't apply. Note also that (currently) all systemd callers -+ of laccess() pass mode as F_OK, so only check for existence of a file, not -+ access permissions. Therefore, in this case, the only distiction between -+ faccessat() with (flag == 0) and (flag == AT_SYMLINK_NOFOLLOW) is the -+ behaviour for broken symlinks; laccess() on a broken symlink will succeed -+ with (flag == AT_SYMLINK_NOFOLLOW) and fail (flag == 0). -+ -+ The laccess() macros was added to systemd some time ago and it's not clear if -+ or why it needs to return success for broken symlinks. Maybe just historical -+ and not actually necessary or desired behaviour? -+*/ -+ -+#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), 0) - - 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); -Index: systemd-stable/src/shared/base-filesystem.c -=================================================================== ---- systemd-stable.orig/src/shared/base-filesystem.c -+++ systemd-stable/src/shared/base-filesystem.c -@@ -54,7 +54,7 @@ int base_filesystem_create(const char *r - return log_error_errno(errno, "Failed to open root file system: %m"); - - for (i = 0; i < ELEMENTSOF(table); i ++) { -- if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0) -+ if (faccessat(fd, table[i].dir, F_OK, 0) >= 0) - continue; - - if (table[i].target) { -@@ -62,7 +62,7 @@ int base_filesystem_create(const char *r - - /* check if one of the targets exists */ - NULSTR_FOREACH(s, table[i].target) { -- if (faccessat(fd, s, F_OK, AT_SYMLINK_NOFOLLOW) < 0) -+ if (faccessat(fd, s, F_OK, 0) < 0) - continue; - - /* check if a specific file exists at the target path */ -@@ -73,7 +73,7 @@ int base_filesystem_create(const char *r - if (!p) - return log_oom(); - -- if (faccessat(fd, p, F_OK, AT_SYMLINK_NOFOLLOW) < 0) -+ if (faccessat(fd, p, F_OK, 0) < 0) - continue; - } - diff --git a/poky/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/poky/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch deleted file mode 100644 index 67d504191..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ec335ef3bb903a7eaf054103cc51411e71e6448c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 27 May 2018 08:36:44 -0700 -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 - -Upstream-Status: Inappropriate [musl specific] - -Signed-off-by: Khem Raj - ---- - src/machine/machine-dbus.c | 5 +++++ - 1 file changed, 5 insertions(+) - -Index: systemd-stable/src/machine/machine-dbus.c -=================================================================== ---- systemd-stable.orig/src/machine/machine-dbus.c -+++ systemd-stable/src/machine/machine-dbus.c -@@ -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-get-properties.h" diff --git a/poky/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/poky/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch new file mode 100644 index 000000000..9a125de63 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch @@ -0,0 +1,35 @@ +From 0c7af5f288231a8c0545e169e01ba5ee173cafe7 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Mon, 25 Feb 2019 15:18:00 +0800 +Subject: [PATCH 16/26] 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 + +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 9605a9b869..38b6cf90c3 100644 +--- a/src/libsystemd/sd-bus/bus-error.c ++++ b/src/libsystemd/sd-bus/bus-error.c +@@ -55,8 +55,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { + }; + + /* GCC maps this magically to the beginning and end of the BUS_ERROR_MAP section */ +-extern const sd_bus_error_map __start_SYSTEMD_BUS_ERROR_MAP[]; +-extern const sd_bus_error_map __stop_SYSTEMD_BUS_ERROR_MAP[]; ++extern const sd_bus_error_map __start_SYSTEMD_BUS_ERROR_MAP[] _hidden_; ++extern const sd_bus_error_map __stop_SYSTEMD_BUS_ERROR_MAP[] _hidden_; + + /* Additional maps registered with sd_bus_error_add_map() are in this + * NULL terminated array */ +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/poky/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch deleted file mode 100644 index 3d456ec83..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bb28a9c870bb47dcdb1ccebaa8e3a5a86730a244 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Wed, 4 Jul 2018 15:00:44 +0800 -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. - - Failed to adjust OOM setting: Invalid argument - -This error appears for systemd-udevd.service and dbus.service. -This is because kernel receives '-' instead of the whole '-900' -if buffering is disabled. - -This is libc implementation specific, as glibc does not have this issue. - -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(-) - -Index: systemd-stable/src/basic/process-util.c -=================================================================== ---- systemd-stable.orig/src/basic/process-util.c -+++ systemd-stable/src/basic/process-util.c -@@ -1536,7 +1536,7 @@ int set_oom_score_adjust(int value) { - sprintf(t, "%i", value); - - return write_string_file("/proc/self/oom_score_adj", t, -- WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER); -+ WRITE_STRING_FILE_VERIFY_ON_FAILURE); - } - - int pidfd_get_pid(int fd, pid_t *ret) { diff --git a/poky/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch b/poky/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch new file mode 100644 index 000000000..31747c6b4 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch @@ -0,0 +1,30 @@ +From 32dd7a47b87793cd836ab4bb776d1524f24c2d58 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Mon, 25 Feb 2019 15:27:54 +0800 +Subject: [PATCH 17/26] 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'? + +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 3df1084ef2..697aa7f58a 100644 +--- a/src/basic/missing_type.h ++++ b/src/basic/missing_type.h +@@ -13,6 +13,7 @@ + + #ifndef __GLIBC__ + typedef int (*comparison_fn_t)(const void *, const void *); ++typedef int (*__compar_d_fn_t) (const void *, const void *, void *); + #endif + + #ifndef __COMPAR_FN_T +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch b/poky/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch new file mode 100644 index 000000000..56d361a21 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch @@ -0,0 +1,32 @@ +From bfc3416edeb69082ac9b9c9e844f12d7b45bb006 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Mon, 25 Feb 2019 15:44:54 +0800 +Subject: [PATCH 18/26] avoid redefinition of prctl_mm_map structure + +Fix the following compile failure: +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 ab851306ba..5547cad875 100644 +--- a/src/basic/missing_prctl.h ++++ b/src/basic/missing_prctl.h +@@ -1,7 +1,9 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + #pragma once + ++#ifdef __GLIBC__ + #include ++#endif + + /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ + #ifndef PR_CAP_AMBIENT +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/poky/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch deleted file mode 100644 index 48fd007e1..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 4938705454cf46cfe8deac8ce457d5d2432cbead Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 10 Jul 2018 15:40:17 +0800 -Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi - strerror_r - -XSI-compliant strerror_r and GNU-specifi strerror_r are different. - - int strerror_r(int errnum, char *buf, size_t buflen); - /* XSI-compliant */ - - char *strerror_r(int errnum, char *buf, size_t buflen); - /* GNU-specific */ - -We need to distinguish between them. Otherwise, we'll get an int value -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(+) - -Index: systemd-stable/src/journal/journal-send.c -=================================================================== ---- systemd-stable.orig/src/journal/journal-send.c -+++ systemd-stable/src/journal/journal-send.c -@@ -348,7 +348,12 @@ static int fill_iovec_perror_and_send(co - char* j; - - errno = 0; -+#ifndef __GLIBC__ -+ strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); -+ j = buffer + 8 + k; -+#else - j = strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); -+#endif - if (errno == 0) { - char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; - -Index: systemd-stable/src/libsystemd/sd-bus/bus-error.c -=================================================================== ---- systemd-stable.orig/src/libsystemd/sd-bus/bus-error.c -+++ systemd-stable/src/libsystemd/sd-bus/bus-error.c -@@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_er - return; - - errno = 0; -+#ifndef __GLIBC__ -+ strerror_r(error, m, k); -+ x = m; -+#else - x = strerror_r(error, m, k); -+#endif - if (errno == ERANGE || strlen(x) >= k - 1) { - free(m); - k *= 2; diff --git a/poky/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch b/poky/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch new file mode 100644 index 000000000..6ca196489 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch @@ -0,0 +1,26 @@ +From e427f03de2c56e868bb0f24aa231315b2dae1b71 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Fri, 7 Aug 2020 15:19:27 +0000 +Subject: [PATCH 19/26] Handle missing LOCK_EX + +Upstream-Status: Inappropriate [musl specific] +Signed-off-by: Alex Kiernan +--- + src/partition/makefs.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/partition/makefs.c b/src/partition/makefs.c +index fd924d2231..b97580fdcc 100644 +--- a/src/partition/makefs.c ++++ b/src/partition/makefs.c +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + #include "alloc-util.h" + #include "blockdev-util.h" +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/poky/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch deleted file mode 100644 index 3b8064677..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1c4c73a7cc0fb59eb68ab70699f7f51af5c163b2 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 25 Feb 2019 15:18:00 +0800 -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 - -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 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[] = { - }; - - /* GCC maps this magically to the beginning and end of the BUS_ERROR_MAP section */ --extern const sd_bus_error_map __start_SYSTEMD_BUS_ERROR_MAP[]; --extern const sd_bus_error_map __stop_SYSTEMD_BUS_ERROR_MAP[]; -+extern const sd_bus_error_map __start_SYSTEMD_BUS_ERROR_MAP[] _hidden_; -+extern const sd_bus_error_map __stop_SYSTEMD_BUS_ERROR_MAP[] _hidden_; - - /* Additional maps registered with sd_bus_error_add_map() are in this - * NULL terminated array */ diff --git a/poky/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/poky/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch new file mode 100644 index 000000000..f74de4384 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch @@ -0,0 +1,40 @@ +From 9abbc5e69e21aef0d4d4567e69302fa660b76c53 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Fri, 7 Aug 2020 15:20:17 +0000 +Subject: [PATCH 20/26] Fix incompatible pointer type struct sockaddr_un * + +| ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c: In function 'cant_be_in_netns': +| ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:4893:25: error: passing argument 2 of 'connect' from incompatible pointer type [-Werror=incompatible-pointer-types] +| 4893 | if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { +| | ^~~~~~ +| | | +| | struct sockaddr_un * +| In file included from ../../../../../../workspace/sources/systemd/src/systemd/sd-daemon.h:22, +| from ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:21: +| /home/ubuntu/poky/build/tmp/work/core2-64-poky-linux-musl/systemd/1_246-r0/recipe-sysroot/usr/include/sys/socket.h:384:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *' +| 384 | int connect (int, const struct sockaddr *, socklen_t); +| | ^~~~~~~~~~~~~~~~~~~~~~~ +| cc1: some warnings being treated as errors + +Upstream-Status: Inappropriate [musl specific] +Signed-off-by: Alex Kiernan +--- + src/nspawn/nspawn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 0842731c18..3528b7ff14 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -5084,7 +5084,7 @@ static int cant_be_in_netns(void) { + if (fd < 0) + return log_error_errno(errno, "Failed to allocate udev control socket: %m"); + +- if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { ++ if (connect(fd, (struct sockaddr *)&sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { + + if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno)) + return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch b/poky/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch deleted file mode 100644 index db4041bbb..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8303d49cabaf3ab8890ba1d266972c721dfe6ee8 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 25 Feb 2019 15:27:54 +0800 -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'? - -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 23602ebbd533..917d314a81bf 100644 ---- a/src/basic/missing_type.h -+++ b/src/basic/missing_type.h -@@ -13,6 +13,7 @@ - - #ifndef __GLIBC__ - typedef int (*comparison_fn_t)(const void *, const void *); -+typedef int (*__compar_d_fn_t) (const void *, const void *, void *); - #endif - - #ifndef __COMPAR_FN_T diff --git a/poky/meta/recipes-core/systemd/systemd/0021-Handle-missing-LOCK_EX.patch b/poky/meta/recipes-core/systemd/systemd/0021-Handle-missing-LOCK_EX.patch deleted file mode 100644 index 67d9162c0..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0021-Handle-missing-LOCK_EX.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 190854c2114dc6e74c8859dc251e3737e3c0f353 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -Date: Fri, 7 Aug 2020 15:19:27 +0000 -Subject: [PATCH] Handle missing LOCK_EX - -Upstream-Status: Inappropriate [musl specific] -Signed-off-by: Alex Kiernan ---- - src/partition/makefs.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/partition/makefs.c b/src/partition/makefs.c -index 97f50c9033..7f55acd229 100644 ---- a/src/partition/makefs.c -+++ b/src/partition/makefs.c -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - - #include "alloc-util.h" - #include "blockdev-util.h" diff --git a/poky/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch b/poky/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch deleted file mode 100644 index 7dacc3683..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6364ff5534678c158a7fb8d4e50d0a6ce72c1ad8 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 25 Feb 2019 15:44:54 +0800 -Subject: [PATCH] avoid redefinition of prctl_mm_map structure - -Fix the following compile failure: -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 f80cd17f346b..47e489354053 100644 ---- a/src/basic/missing_prctl.h -+++ b/src/basic/missing_prctl.h -@@ -1,7 +1,9 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - #pragma once - -+#ifdef __GLIBC__ - #include -+#endif - - /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ - #ifndef PR_CAP_AMBIENT diff --git a/poky/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch b/poky/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch new file mode 100644 index 000000000..fa6652a5b --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch @@ -0,0 +1,33 @@ +From 1f5bc54bed0b365e7e448c26f6c792dbe8b3b198 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Mon, 25 Feb 2019 16:53:06 +0800 +Subject: [PATCH 21/26] 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'? + +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 1d4b11945e..572c8cf9d0 100644 +--- a/src/test/test-json.c ++++ b/src/test/test-json.c +@@ -13,6 +13,10 @@ + #include "tests.h" + #include "util.h" + ++#ifndef M_PIl ++#define M_PIl 3.141592653589793238462643383279502884L ++#endif ++ + static void test_tokenizer(const char *data, ...) { + unsigned line = 0, column = 0; + void *state = NULL; +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/poky/meta/recipes-core/systemd/systemd/0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch deleted file mode 100644 index d57ca1fd3..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 328c39fae2631deb5737dd56f46159dd6b4cdbed Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -Date: Fri, 7 Aug 2020 15:20:17 +0000 -Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un * - -| ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c: In function 'cant_be_in_netns': -| ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:4893:25: error: passing argument 2 of 'connect' from incompatible pointer type [-Werror=incompatible-pointer-types] -| 4893 | if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { -| | ^~~~~~ -| | | -| | struct sockaddr_un * -| In file included from ../../../../../../workspace/sources/systemd/src/systemd/sd-daemon.h:22, -| from ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:21: -| /home/ubuntu/poky/build/tmp/work/core2-64-poky-linux-musl/systemd/1_246-r0/recipe-sysroot/usr/include/sys/socket.h:384:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *' -| 384 | int connect (int, const struct sockaddr *, socklen_t); -| | ^~~~~~~~~~~~~~~~~~~~~~~ -| cc1: some warnings being treated as errors - -Upstream-Status: Inappropriate [musl specific] -Signed-off-by: Alex Kiernan ---- - src/nspawn/nspawn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 0450c9f795..7305db04ef 100644 ---- a/src/nspawn/nspawn.c -+++ b/src/nspawn/nspawn.c -@@ -4890,7 +4890,7 @@ static int cant_be_in_netns(void) { - if (fd < 0) - return log_error_errno(errno, "Failed to allocate udev control socket: %m"); - -- if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { -+ if (connect(fd, (struct sockaddr *)&sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { - - if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno)) - return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), diff --git a/poky/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch b/poky/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch new file mode 100644 index 000000000..675fd20f1 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch @@ -0,0 +1,413 @@ +From 564dba5ad0cd884e3f69fa19ca64095413578ea5 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Fri, 1 Mar 2019 15:22:15 +0800 +Subject: [PATCH 22/26] do not disable buffer in writing files + +Do not disable buffer in writing files, otherwise we get +failure at boot for musl like below. + + [!!!!!!] Failed to allocate manager object. + +And there will be other failures, critical or not critical. +This is specific to musl. + +Upstream-Status: Inappropriate [musl] + +Signed-off-by: Chen Qi +[Rebased for v242] +Signed-off-by: Andrej Valek +[rebased for systemd 243] +Signed-off-by: Scott Murray +--- + src/basic/cgroup-util.c | 10 +++++----- + src/basic/procfs-util.c | 4 ++-- + src/basic/smack-util.c | 2 +- + src/basic/util.c | 2 +- + src/binfmt/binfmt.c | 6 +++--- + src/core/main.c | 4 ++-- + src/core/smack-setup.c | 8 ++++---- + src/hibernate-resume/hibernate-resume.c | 2 +- + src/libsystemd/sd-device/sd-device.c | 2 +- + 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 | 8 ++++---- + src/udev/udevadm-trigger.c | 2 +- + src/udev/udevd.c | 2 +- + src/vconsole/vconsole-setup.c | 2 +- + 18 files changed, 35 insertions(+), 35 deletions(-) + +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index bb960f183c..cb804c5f4b 100644 +--- a/src/basic/cgroup-util.c ++++ b/src/basic/cgroup-util.c +@@ -759,7 +759,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { + + sc = strstrip(contents); + if (isempty(sc)) { +- r = write_string_file(fs, agent, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(fs, agent, 0); + if (r < 0) + return r; + } else if (!path_equal(sc, agent)) +@@ -777,7 +777,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { + + sc = strstrip(contents); + if (streq(sc, "0")) { +- r = write_string_file(fs, "1", WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(fs, "1", 0); + if (r < 0) + return r; + +@@ -804,7 +804,7 @@ int cg_uninstall_release_agent(const char *controller) { + if (r < 0) + return r; + +- r = write_string_file(fs, "0", WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(fs, "0", 0); + if (r < 0) + return r; + +@@ -814,7 +814,7 @@ int cg_uninstall_release_agent(const char *controller) { + if (r < 0) + return r; + +- r = write_string_file(fs, "", WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(fs, "", 0); + if (r < 0) + return r; + +@@ -1646,7 +1646,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri + if (r < 0) + return r; + +- return write_string_file(p, value, WRITE_STRING_FILE_DISABLE_BUFFER); ++ return write_string_file(p, value, 0); + } + + int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { +diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c +index 8f9eee8d36..480f8cc0b4 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) { + * 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 */ +- r = write_string_file("/proc/sys/kernel/pid_max", buffer, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/proc/sys/kernel/pid_max", buffer, 0); + if (r < 0) + return r; + } + + sprintf(buffer, "%" PRIu64, limit); +- r = write_string_file("/proc/sys/kernel/threads-max", buffer, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/proc/sys/kernel/threads-max", buffer, 0); + if (r < 0) { + uint64_t threads_max; + +diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c +index 3362ee3924..80c0f2a52e 100644 +--- a/src/basic/smack-util.c ++++ b/src/basic/smack-util.c +@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { + return 0; + + p = procfs_file_alloca(pid, "attr/current"); +- r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(p, label, 0); + if (r < 0) + return r; + +diff --git a/src/basic/util.c b/src/basic/util.c +index f98ecf3858..13e0f7431f 100644 +--- a/src/basic/util.c ++++ b/src/basic/util.c +@@ -267,7 +267,7 @@ void disable_coredumps(void) { + if (detect_container() > 0) + return; + +- r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0); + 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 43ed2f385b..37a6f578f7 100644 +--- a/src/binfmt/binfmt.c ++++ b/src/binfmt/binfmt.c +@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { + if (!fn) + return log_oom(); + +- return write_string_file(fn, "-1", WRITE_STRING_FILE_DISABLE_BUFFER); ++ return write_string_file(fn, "-1", 0); + } + + static int apply_rule(const char *rule) { +@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { + + (void) delete_rule(rule); + +- r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, 0); + if (r < 0) + return log_error_errno(r, "Failed to add binary format: %m"); + +@@ -223,7 +223,7 @@ static int run(int argc, char *argv[]) { + } + + /* Flush out all rules */ +- (void) write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); ++ (void) write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); + + STRV_FOREACH(f, files) { + k = apply_file(*f, true); +diff --git a/src/core/main.c b/src/core/main.c +index a280b756ff..334532cd42 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -1382,7 +1382,7 @@ static int bump_unix_max_dgram_qlen(void) { + if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) + return 0; + +- r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", WRITE_STRING_FILE_DISABLE_BUFFER, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); ++ r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", 0, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); + 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"); +@@ -1666,7 +1666,7 @@ static void initialize_core_pattern(bool skip_setup) { + if (getpid_cached() != 1) + return; + +- r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, 0); + 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 1fe592af70..603942a000 100644 +--- a/src/core/smack-setup.c ++++ b/src/core/smack-setup.c +@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { + } + + #ifdef SMACK_RUN_LABEL +- r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, 0); + if (r < 0) + log_warning_errno(r, "Failed to set SMACK label \"" SMACK_RUN_LABEL "\" on self: %m"); +- r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, 0); + if (r < 0) + log_warning_errno(r, "Failed to set SMACK ambient label \"" SMACK_RUN_LABEL "\": %m"); + r = write_string_file("/sys/fs/smackfs/netlabel", +- "0.0.0.0/0 " SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); ++ "0.0.0.0/0 " SMACK_RUN_LABEL, 0); + if (r < 0) + log_warning_errno(r, "Failed to set SMACK netlabel rule \"0.0.0.0/0 " SMACK_RUN_LABEL "\": %m"); +- r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", 0); + 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 d8f91f4e66..a088e6e2d8 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[]) { + return EXIT_FAILURE; + } + +- r = write_string_file("/sys/power/resume", major_minor, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/sys/power/resume", major_minor, 0); + 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 d06f90ce1d..43d0a58750 100644 +--- a/src/libsystemd/sd-device/sd-device.c ++++ b/src/libsystemd/sd-device/sd-device.c +@@ -1976,7 +1976,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, + if (!value) + return -ENOMEM; + +- r = write_string_file(path, value, WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_NOFOLLOW); ++ r = write_string_file(path, value, 0 | WRITE_STRING_FILE_NOFOLLOW); + if (r < 0) { + if (r == -ELOOP) + return -EINVAL; +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index 7d757aa286..a5d9da5b7e 100644 +--- a/src/login/logind-dbus.c ++++ b/src/login/logind-dbus.c +@@ -1330,7 +1330,7 @@ static int trigger_device(Manager *m, sd_device *d) { + if (!t) + return -ENOMEM; + +- (void) write_string_file(t, "change", WRITE_STRING_FILE_DISABLE_BUFFER); ++ (void) write_string_file(t, "change", 0); + } + + return 0; +diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c +index cb01b25bc6..e92051268b 100644 +--- a/src/nspawn/nspawn-cgroup.c ++++ b/src/nspawn/nspawn-cgroup.c +@@ -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); +- r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER|WRITE_STRING_FILE_MKDIR_0755); ++ r = write_string_file(fn, pid_string, WRITE_STRING_FILE_MKDIR_0755); + 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 3528b7ff14..11b0c20f95 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -2667,7 +2667,7 @@ static int reset_audit_loginuid(void) { + if (streq(p, "4294967295")) + return 0; + +- r = write_string_file("/proc/self/loginuid", "4294967295", WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/proc/self/loginuid", "4294967295", 0); + if (r < 0) { + log_error_errno(r, + "Failed to reset audit login UID. This probably means that your kernel is too\n" +@@ -3920,13 +3920,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); +- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(uid_map, line, 0); + if (r < 0) + return log_error_errno(r, "Failed to write UID map: %m"); + + /* We always assign the same UID and GID ranges */ + xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); +- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(uid_map, line, 0); + 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 f197f715c7..077f893177 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; + +@@ -799,7 +799,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 670c33108b..7c7c3dcfb6 100644 +--- a/src/shared/sysctl-util.c ++++ b/src/shared/sysctl-util.c +@@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c + + log_debug("Setting '%s' to '%s'", p, value); + +- return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); ++ return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); + } + + int sysctl_read(const char *property, char **content) { +diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c +index 39ab554290..d0e566645d 100644 +--- a/src/sleep/sleep.c ++++ b/src/sleep/sleep.c +@@ -48,7 +48,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca + assert(hibernate_location->swap); + + xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); +- r = write_string_file("/sys/power/resume", resume_str, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/sys/power/resume", resume_str, 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, resume_str); +@@ -75,7 +75,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca + } + + xsprintf(offset_str, "%" PRIu64, hibernate_location->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 swap file offset to /sys/power/resume_offset for '%s': '%s': %m", + hibernate_location->swap->device, offset_str); +@@ -92,7 +92,7 @@ static int write_mode(char **modes) { + STRV_FOREACH(mode, modes) { + int k; + +- k = write_string_file("/sys/power/disk", *mode, WRITE_STRING_FILE_DISABLE_BUFFER); ++ k = write_string_file("/sys/power/disk", *mode, 0); + if (k >= 0) + return 0; + +@@ -114,7 +114,7 @@ static int write_state(FILE **f, char **states) { + STRV_FOREACH(state, states) { + int k; + +- k = write_string_stream(*f, *state, WRITE_STRING_FILE_DISABLE_BUFFER); ++ k = write_string_stream(*f, *state, 0); + 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 5c74184c33..65f528314e 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_s + 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) { + bool ignore = IN_SET(r, -ENOENT, -ENODEV); + +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index d24b8d4398..d123a43904 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -1192,7 +1192,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); +- r = write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(filename, "change", 0); + 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 b28e2853e1..115b7233a0 100644 +--- a/src/vconsole/vconsole-setup.c ++++ b/src/vconsole/vconsole-setup.c +@@ -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; + +- r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), 0); + if (r < 0) + return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); + +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch b/poky/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch new file mode 100644 index 000000000..ea4a024b8 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch @@ -0,0 +1,31 @@ +From 359e7a38824a906b0a24f5775f41a2ae3358bf06 Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH 23/26] Include sys/wait.h + +Fixes: +src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? + 158 | r = sd_event_add_child(w->manager->event, &w->child_event_source, w->child, WEXITED, on_brightness_writer_exit, w); + | ^~~~~~~ + +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 a6a1603396..54848ce209 100644 +--- a/src/login/logind-brightness.c ++++ b/src/login/logind-brightness.c +@@ -1,5 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + ++#include + #include "bus-util.h" + #include "device-util.h" + #include "hash-funcs.h" +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch b/poky/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch new file mode 100644 index 000000000..2820d7b32 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch @@ -0,0 +1,33 @@ +From 0592da08e16a17ceef0949ec9901397d8ec5af92 Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH 24/26] 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] +src/basic/copy.c:93:19: error: implicit declaration of function 'sigaddset' [-Werror=implicit-function-declaration] +src/basic/copy.c:93:34: error: 'SIGINT' undeclared (first use in this function) +src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [-Werror=implicit-function-declaration] + +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 6a9c3a396f..8948bb4013 100644 +--- a/src/basic/copy.c ++++ b/src/basic/copy.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + #include "alloc-util.h" + #include "btrfs-util.h" +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch b/poky/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch deleted file mode 100644 index 80beada3d..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a05cc5fb3dc0e51682c40196285cdda34ec90783 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 25 Feb 2019 16:53:06 +0800 -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'? - -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 a6613043b924..ca823ea79f05 100644 ---- a/src/test/test-json.c -+++ b/src/test/test-json.c -@@ -12,6 +12,10 @@ - #include "tests.h" - #include "util.h" - -+#ifndef M_PIl -+#define M_PIl 3.141592653589793238462643383279502884L -+#endif -+ - static void test_tokenizer(const char *data, ...) { - unsigned line = 0, column = 0; - void *state = NULL; diff --git a/poky/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch b/poky/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch new file mode 100644 index 000000000..1cc3985d1 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch @@ -0,0 +1,60 @@ +From bbda4a48a34662393117fc677c3a678d4ce4c2ec Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH 25/26] Handle __cpu_mask usage + +Fixes errors: + +src/test/test-cpu-set-util.c:18:54: error: '__cpu_mask' undeclared (first use in this function) +src/test/test-sizeof.c:73:14: error: '__cpu_mask' undeclared (first use in this function) + +__cpu_mask is an internal type of glibc's cpu_set implementation, not +part of the POSIX definition, which is problematic when building with +musl, which does not define a matching type. From inspection of musl's +sched.h, however, it is clear that the corresponding type would be +unsigned long, which does match glibc's actual __CPU_MASK_TYPE. So, +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 3c63a58826..4c2d4347fc 100644 +--- a/src/shared/cpu-set-util.h ++++ b/src/shared/cpu-set-util.h +@@ -6,6 +6,8 @@ + #include "macro.h" + #include "missing_syscall.h" + ++typedef unsigned long __cpu_mask; ++ + /* This wraps the libc interface with a variable to keep the allocated size. */ + typedef struct CPUSet { + cpu_set_t *set; +diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c +index e1a59d408c..c269ea6e8c 100644 +--- a/src/test/test-sizeof.c ++++ b/src/test/test-sizeof.c +@@ -1,6 +1,5 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +-#include + #include + #include + #include +@@ -10,6 +9,7 @@ + #include + + #include "time-util.h" ++#include "cpu-set-util.h" + + /* Print information about various types. Useful when diagnosing + * gcc diagnostics on an unfamiliar architecture. */ +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch b/poky/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch new file mode 100644 index 000000000..4180afb08 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch @@ -0,0 +1,173 @@ +From 47bf88f74717b417e4adbcc04256334b2335c873 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Tue, 10 Mar 2020 11:05:20 +0000 +Subject: [PATCH 26/26] Handle missing gshadow + +gshadow usage is now present in the userdb code. Mask all uses of it to +allow compilation on musl + +Upstream-Status: Inappropriate [musl specific] +Signed-off-by: Alex Kiernan +[Rebased for v247] +Signed-off-by: Luca Boccassi +--- + src/shared/user-record-nss.c | 20 ++++++++++++++++++++ + src/shared/user-record-nss.h | 4 ++++ + src/shared/userdb.c | 6 ++++++ + 3 files changed, 30 insertions(+) + +diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c +index 88b8fc2f8f..a819d41bac 100644 +--- a/src/shared/user-record-nss.c ++++ b/src/shared/user-record-nss.c +@@ -331,8 +331,10 @@ int nss_group_to_group_record( + if (isempty(grp->gr_name)) + return -EINVAL; + ++#if ENABLE_GSHADOW + if (sgrp && !streq_ptr(sgrp->sg_namp, grp->gr_name)) + return -EINVAL; ++#endif + + g = group_record_new(); + if (!g) +@@ -348,6 +350,7 @@ int nss_group_to_group_record( + + g->gid = grp->gr_gid; + ++#if ENABLE_GSHADOW + if (sgrp) { + if (looks_like_hashed_password(utf8_only(sgrp->sg_passwd))) { + g->hashed_password = strv_new(sgrp->sg_passwd); +@@ -363,6 +366,7 @@ int nss_group_to_group_record( + if (r < 0) + return r; + } ++#endif + + r = json_build(&g->json, JSON_BUILD_OBJECT( + JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), +@@ -388,6 +392,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re + assert(ret_sgrp); + assert(ret_buffer); + ++#if ENABLE_GSHADOW + for (;;) { + _cleanup_free_ char *buf = NULL; + struct sgrp sgrp, *result; +@@ -416,6 +421,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re + buflen *= 2; + buf = mfree(buf); + } ++#else ++ return -ESRCH; ++#endif + } + + int nss_group_record_by_name( +@@ -427,7 +435,9 @@ int nss_group_record_by_name( + struct group grp, *result; + bool incomplete = false; + size_t buflen = 4096; ++#if ENABLE_GSHADOW + struct sgrp sgrp, *sresult = NULL; ++#endif + int r; + + assert(name); +@@ -457,6 +467,7 @@ int nss_group_record_by_name( + buf = mfree(buf); + } + ++#if ENABLE_GSHADOW + if (with_shadow) { + r = nss_sgrp_for_group(result, &sgrp, &sbuf); + if (r < 0) { +@@ -468,6 +479,9 @@ int nss_group_record_by_name( + incomplete = true; + + r = nss_group_to_group_record(result, sresult, ret); ++#else ++ r = nss_group_to_group_record(result, NULL, ret); ++#endif + if (r < 0) + return r; + +@@ -484,7 +498,9 @@ int nss_group_record_by_gid( + struct group grp, *result; + bool incomplete = false; + size_t buflen = 4096; ++#if ENABLE_GSHADOW + struct sgrp sgrp, *sresult = NULL; ++#endif + int r; + + assert(ret); +@@ -512,6 +528,7 @@ int nss_group_record_by_gid( + buf = mfree(buf); + } + ++#if ENABLE_GSHADOW + if (with_shadow) { + r = nss_sgrp_for_group(result, &sgrp, &sbuf); + if (r < 0) { +@@ -523,6 +540,9 @@ int nss_group_record_by_gid( + incomplete = true; + + r = nss_group_to_group_record(result, sresult, ret); ++#else ++ r = nss_group_to_group_record(result, NULL, ret); ++#endif + if (r < 0) + return r; + +diff --git a/src/shared/user-record-nss.h b/src/shared/user-record-nss.h +index 22ab04d6ee..4e52e7a911 100644 +--- a/src/shared/user-record-nss.h ++++ b/src/shared/user-record-nss.h +@@ -2,7 +2,11 @@ + #pragma once + + #include ++#if ENABLE_GSHADOW + #include ++#else ++struct sgrp; ++#endif + #include + #include + +diff --git a/src/shared/userdb.c b/src/shared/userdb.c +index 2d480283d1..0d19764f2e 100644 +--- a/src/shared/userdb.c ++++ b/src/shared/userdb.c +@@ -929,13 +929,16 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { + if (gr) { + _cleanup_free_ char *buffer = NULL; + bool incomplete = false; ++#if ENABLE_GSHADOW + struct sgrp sgrp; ++#endif + + if (streq_ptr(gr->gr_name, "root")) + iterator->synthesize_root = false; + if (gr->gr_gid == GID_NOBODY) + iterator->synthesize_nobody = false; + ++#if ENABLE_GSHADOW + r = nss_sgrp_for_group(gr, &sgrp, &buffer); + if (r < 0) { + log_debug_errno(r, "Failed to acquire shadow entry for group %s, ignoring: %m", gr->gr_name); +@@ -943,6 +946,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { + } + + r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); ++#else ++ r = nss_group_to_group_record(gr, NULL, ret); ++#endif + if (r < 0) + return r; + +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/selinux-hook-handling-to-enumerate-nexthop.patch b/poky/meta/recipes-core/systemd/systemd/selinux-hook-handling-to-enumerate-nexthop.patch deleted file mode 100644 index b1c92ed71..000000000 --- a/poky/meta/recipes-core/systemd/systemd/selinux-hook-handling-to-enumerate-nexthop.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 92b555aaabf710e0a672a7244e8c0e3963075133 Mon Sep 17 00:00:00 2001 -From: Purushottam choudhary -Date: Wed, 28 Oct 2020 22:11:49 +0530 -Subject: [PATCH] network: selinux hook handling to enumerate nexthop - -When selinux is enabled, the call of -manager_rtnl_enumerate_nexthop() fails. - -This fix is to facilitate selinux hook handling for enumerating -nexthop. - -In manager_rtnl_enumerate_nexthop() there is a check -if "Not supported" is returned by the send_netlink() call. - -This check expects that -EOPNOTSUPP is returned, -the selinux hook seems to return -EINVAL instead. - -This happens in kernel older than 5.3 -(more specificallytorvalds/linux@65ee00a) as it does not support -nexthop handling through netlink. - -And if SELinux is enforced in the order kernel, callingRTM_GETNEXTHOP -returns -EINVAL. - -Thus adding a call in the manager_rtnl_enumerate_nexthop for the -extra return -EINVAL. - -Upstream-Status: Backport -https://github.com/systemd/systemd/commit/92b555aaabf710e0a672a7244e8c0e3963075133 ---- - src/network/networkd-manager.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c -index a6c1a39..2a9be85 100644 ---- a/src/network/networkd-manager.c -+++ b/src/network/networkd-manager.c -@@ -2121,7 +2121,7 @@ int manager_rtnl_enumerate_nexthop(Manager *m) { - - r = sd_netlink_call(m->rtnl, req, 0, &reply); - if (r < 0) { -- if (r == -EOPNOTSUPP) { -+ if (r == -EOPNOTSUPP || r == -EINVAL) { - log_debug("Nexthop are not supported by the kernel. Ignoring."); - return 0; - } diff --git a/poky/meta/recipes-core/systemd/systemd_246.6.bb b/poky/meta/recipes-core/systemd/systemd_246.6.bb deleted file mode 100644 index d9e7b1a00..000000000 --- a/poky/meta/recipes-core/systemd/systemd_246.6.bb +++ /dev/null @@ -1,732 +0,0 @@ -require systemd.inc - -PROVIDES = "udev" - -PE = "1" - -DEPENDS = "intltool-native gperf-native libcap util-linux" - -SECTION = "base/shell" - -inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check - -# As this recipe builds udev, respect systemd being in DISTRO_FEATURES so -# that we don't build both udev and systemd in world builds. -REQUIRED_DISTRO_FEATURES = "systemd" - -SRC_URI += "file://touchscreen.rules \ - file://00-create-volatile.conf \ - file://init \ - file://99-default.preset \ - file://systemd-pager.sh \ - file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ - file://0003-implment-systemd-sysv-install-for-OE.patch \ - file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ - file://selinux-hook-handling-to-enumerate-nexthop.patch \ - file://0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch \ - " - -# patches needed by musl -SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}" -SRC_URI_MUSL = "\ - file://0002-don-t-use-glibc-specific-qsort_r.patch \ - file://0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch \ - file://0004-add-fallback-parse_printf_format-implementation.patch \ - file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \ - file://0006-Include-netinet-if_ether.h.patch \ - file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch \ - file://0008-add-missing-FTW_-macros-for-musl.patch \ - file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ - file://0011-Use-uintmax_t-for-handling-rlim_t.patch \ - file://0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ - file://0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ - file://0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ - file://0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ - file://0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ - 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://0021-Handle-missing-LOCK_EX.patch \ - file://0022-Fix-incompatible-pointer-type-struct-sockaddr_un.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 \ - file://0003-src-basic-copy.c-include-signal.h.patch \ - file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \ - file://0001-Handle-missing-gshadow.patch \ - " - -PAM_PLUGINS = " \ - pam-plugin-unix \ - pam-plugin-loginuid \ - pam-plugin-keyinit \ -" - -PACKAGECONFIG ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam selinux smack usrmerge polkit', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ - backlight \ - binfmt \ - gshadow \ - hibernate \ - hostnamed \ - idn \ - ima \ - kmod \ - localed \ - logind \ - machined \ - myhostname \ - networkd \ - nss \ - nss-mymachines \ - nss-resolve \ - quotacheck \ - randomseed \ - resolved \ - set-time-epoch \ - sysusers \ - sysvinit \ - timedated \ - timesyncd \ - userdb \ - utmp \ - vconsole \ - xz \ -" - -PACKAGECONFIG_remove_libc-musl = " \ - gshadow \ - idn \ - localed \ - myhostname \ - nss \ - nss-mymachines \ - nss-resolve \ - sysusers \ - userdb \ - utmp \ -" - -CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0 " - -# Use the upstream systemd serial-getty@.service and rely on -# systemd-getty-generator instead of using the OE-core specific -# systemd-serialgetty.bb - not enabled by default. -PACKAGECONFIG[serial-getty-generator] = "" - -PACKAGECONFIG[acl] = "-Dacl=true,-Dacl=false,acl" -PACKAGECONFIG[audit] = "-Daudit=true,-Daudit=false,audit" -PACKAGECONFIG[backlight] = "-Dbacklight=true,-Dbacklight=false" -PACKAGECONFIG[binfmt] = "-Dbinfmt=true,-Dbinfmt=false" -PACKAGECONFIG[bzip2] = "-Dbzip2=true,-Dbzip2=false,bzip2" -PACKAGECONFIG[cgroupv2] = "-Ddefault-hierarchy=unified,-Ddefault-hierarchy=hybrid" -PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false" -PACKAGECONFIG[cryptsetup] = "-Dlibcryptsetup=true,-Dlibcryptsetup=false,cryptsetup" -PACKAGECONFIG[dbus] = "-Ddbus=true,-Ddbus=false,dbus" -PACKAGECONFIG[efi] = "-Defi=true,-Defi=false" -PACKAGECONFIG[gnu-efi] = "-Dgnu-efi=true -Defi-libdir=${STAGING_LIBDIR} -Defi-includedir=${STAGING_INCDIR}/efi,-Dgnu-efi=false,gnu-efi" -PACKAGECONFIG[elfutils] = "-Delfutils=true,-Delfutils=false,elfutils" -PACKAGECONFIG[firstboot] = "-Dfirstboot=true,-Dfirstboot=false" -# Sign the journal for anti-tampering -PACKAGECONFIG[gcrypt] = "-Dgcrypt=true,-Dgcrypt=false,libgcrypt" -PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" -PACKAGECONFIG[gshadow] = "-Dgshadow=true,-Dgshadow=false" -PACKAGECONFIG[hibernate] = "-Dhibernate=true,-Dhibernate=false" -PACKAGECONFIG[hostnamed] = "-Dhostnamed=true,-Dhostnamed=false" -PACKAGECONFIG[idn] = "-Didn=true,-Didn=false" -PACKAGECONFIG[ima] = "-Dima=true,-Dima=false" -# importd requires curl/xz/zlib/bzip2/gcrypt -PACKAGECONFIG[importd] = "-Dimportd=true,-Dimportd=false" -# Update NAT firewall rules -PACKAGECONFIG[iptc] = "-Dlibiptc=true,-Dlibiptc=false,iptables" -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" -PACKAGECONFIG[machined] = "-Dmachined=true,-Dmachined=false" -PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" -PACKAGECONFIG[microhttpd] = "-Dmicrohttpd=true,-Dmicrohttpd=false,libmicrohttpd" -PACKAGECONFIG[myhostname] = "-Dnss-myhostname=true,-Dnss-myhostname=false,,libnss-myhostname" -PACKAGECONFIG[networkd] = "-Dnetworkd=true,-Dnetworkd=false" -PACKAGECONFIG[nss] = "-Dnss-systemd=true,-Dnss-systemd=false" -PACKAGECONFIG[nss-mymachines] = "-Dnss-mymachines=true,-Dnss-mymachines=false" -PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=true,-Dnss-resolve=false" -PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl" -PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}" -PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2" -PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false" -PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false" -PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode" -PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false" -PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false" -PACKAGECONFIG[resolved] = "-Dresolve=true,-Dresolve=false" -PACKAGECONFIG[rfkill] = "-Drfkill=true,-Drfkill=false" -# libseccomp is found in meta-security -PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" -PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,initscripts-sushell" -PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false" -PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false" -PACKAGECONFIG[sysvinit] = "-Dsysvinit-path=${sysconfdir}/init.d -Dsysvrcnd-path=${sysconfdir},-Dsysvinit-path= -Dsysvrcnd-path=,,systemd-compat-units update-rc.d" -# When enabled use reproducble build timestamp if set as time epoch, -# or build time if not. When disabled, time epoch is unset. -def build_epoch(d): - epoch = d.getVar('SOURCE_DATE_EPOCH') or "-1" - return '-Dtime-epoch=%d' % int(epoch) -PACKAGECONFIG[set-time-epoch] = "${@build_epoch(d)},-Dtime-epoch=0" -PACKAGECONFIG[timedated] = "-Dtimedated=true,-Dtimedated=false" -PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false" -PACKAGECONFIG[usrmerge] = "-Dsplit-usr=false,-Dsplit-usr=true" -PACKAGECONFIG[sbinmerge] = "-Dsplit-bin=false,-Dsplit-bin=true" -PACKAGECONFIG[userdb] = "-Duserdb=true,-Duserdb=false" -PACKAGECONFIG[utmp] = "-Dutmp=true,-Dutmp=false" -PACKAGECONFIG[valgrind] = "-DVALGRIND=1,,valgrind" -PACKAGECONFIG[vconsole] = "-Dvconsole=true,-Dvconsole=false,,${PN}-vconsole-setup" -PACKAGECONFIG[xdg-autostart] = "-Dxdg-autostart=true,-Dxdg-autostart=false" -# Verify keymaps on locale change -PACKAGECONFIG[xkbcommon] = "-Dxkbcommon=true,-Dxkbcommon=false,libxkbcommon" -PACKAGECONFIG[xz] = "-Dxz=true,-Dxz=false,xz" -PACKAGECONFIG[zlib] = "-Dzlib=true,-Dzlib=false,zlib" - -# Helper variables to clarify locations. This mirrors the logic in systemd's -# build system. -rootprefix ?= "${root_prefix}" -rootlibdir ?= "${base_libdir}" -rootlibexecdir = "${rootprefix}/lib" - -# This links udev statically with systemd helper library. -# Otherwise udev package would depend on systemd package (which has the needed shared library), -# and always pull it into images. -EXTRA_OEMESON += "-Dlink-udev-shared=false" - -EXTRA_OEMESON += "-Dnobody-user=nobody \ - -Dnobody-group=nobody \ - -Drootlibdir=${rootlibdir} \ - -Drootprefix=${rootprefix} \ - -Ddefault-locale=C \ - " - -# Hardcode target binary paths to avoid using paths from sysroot -EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \ - -Dkmod-path=${base_bindir}/kmod \ - -Dmount-path=${base_bindir}/mount \ - -Dquotacheck-path=${sbindir}/quotacheck \ - -Dquotaon-path=${sbindir}/quotaon \ - -Dsulogin-path=${base_sbindir}/sulogin \ - -Dnologin-path=${base_sbindir}/nologin \ - -Dumount-path=${base_bindir}/umount" - -do_install() { - meson_do_install - install -d ${D}/${base_sbindir} - if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then - # Provided by a separate recipe - rm ${D}${systemd_unitdir}/system/serial-getty* -f - fi - - # Provide support for initramfs - [ ! -e ${D}/init ] && ln -s ${rootlibexecdir}/systemd/systemd ${D}/init - [ ! -e ${D}/${base_sbindir}/udevd ] && ln -s ${rootlibexecdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd - - install -d ${D}${sysconfdir}/udev/rules.d/ - install -d ${D}${sysconfdir}/tmpfiles.d - for rule in $(find ${WORKDIR} -maxdepth 1 -type f -name "*.rules"); do - install -m 0644 $rule ${D}${sysconfdir}/udev/rules.d/ - done - - install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ - - if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd - sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd - install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install - fi - - chown root:systemd-journal ${D}/${localstatedir}/log/journal - - # Delete journal README, as log can be symlinked inside volatile. - rm -f ${D}/${localstatedir}/log/README - - # journal-remote creates this at start - rm -rf ${D}/${localstatedir}/log/journal/remote - - install -d ${D}${systemd_unitdir}/system/graphical.target.wants - install -d ${D}${systemd_unitdir}/system/multi-user.target.wants - install -d ${D}${systemd_unitdir}/system/poweroff.target.wants - install -d ${D}${systemd_unitdir}/system/reboot.target.wants - install -d ${D}${systemd_unitdir}/system/rescue.target.wants - - # Create symlinks for systemd-update-utmp-runlevel.service - if ${@bb.utils.contains('PACKAGECONFIG', 'utmp', 'true', 'false', d)}; then - ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/graphical.target.wants/systemd-update-utmp-runlevel.service - ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/multi-user.target.wants/systemd-update-utmp-runlevel.service - ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/poweroff.target.wants/systemd-update-utmp-runlevel.service - ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/reboot.target.wants/systemd-update-utmp-runlevel.service - ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/rescue.target.wants/systemd-update-utmp-runlevel.service - fi - - # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it - # for existence else it fails - if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then - ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)} - fi - if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false', d)}; then - echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf - echo 'd /run/systemd/resolve 0755 root root -' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf - echo 'f /run/systemd/resolve/resolv.conf 0644 root root' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf - ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd - else - sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf - ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd - fi - if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then - rm ${D}${exec_prefix}/lib/tmpfiles.d/x11.conf - rm -r ${D}${sysconfdir}/X11 - fi - - # If polkit is setup fixup permissions and ownership - if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then - if [ -d ${D}${datadir}/polkit-1/rules.d ]; then - chmod 700 ${D}${datadir}/polkit-1/rules.d - chown polkitd:root ${D}${datadir}/polkit-1/rules.d - fi - fi - - # create link for existing udev rules - ln -s ${base_bindir}/udevadm ${D}${base_sbindir}/udevadm - - # duplicate udevadm for postinst script - install -d ${D}${libexecdir} - ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm - - # install default policy for presets - # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto - install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset - - # add a profile fragment to disable systemd pager with busybox less - install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh -} - -python populate_packages_prepend (){ - systemdlibdir = d.getVar("rootlibdir") - do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) -} -PACKAGES_DYNAMIC += "^lib(udev|systemd|nss).*" - -PACKAGE_BEFORE_PN = "\ - ${PN}-gui \ - ${PN}-vconsole-setup \ - ${PN}-initramfs \ - ${PN}-analyze \ - ${PN}-kernel-install \ - ${PN}-rpm-macros \ - ${PN}-binfmt \ - ${PN}-zsh-completion \ - ${PN}-container \ - ${PN}-journal-gatewayd \ - ${PN}-journal-upload \ - ${PN}-journal-remote \ - ${PN}-extra-utils \ - ${PN}-udev-rules \ - udev \ - udev-hwdb \ -" - -SUMMARY_${PN}-container = "Tools for containers and VMs" -DESCRIPTION_${PN}-container = "Systemd tools to spawn and manage containers and virtual machines." - -SUMMARY_${PN}-journal-gatewayd = "HTTP server for journal events" -DESCRIPTION_${PN}-journal-gatewayd = "systemd-journal-gatewayd serves journal events over the network. Clients must connect using HTTP. The server listens on port 19531 by default." - -SUMMARY_${PN}-journal-upload = "Send journal messages over the network" -DESCRIPTION_${PN}-journal-upload = "systemd-journal-upload uploads journal entries to a specified URL." - -SUMMARY_${PN}-journal-remote = "Receive journal messages over the network" -DESCRIPTION_${PN}-journal-remote = "systemd-journal-remote is a command to receive serialized journal events and store them to journal files." - -SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ -" -SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" - -USERADD_PACKAGES = "${PN} ${PN}-extra-utils \ - ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gateway', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ -" -GROUPADD_PARAM_${PN} = "-r systemd-journal" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /bin/nologin systemd-network;', '', d)}" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /bin/nologin systemd-resolve;', '', d)}" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /bin/nologin systemd-timesync;', '', d)}" -USERADD_PARAM_${PN}-extra-utils = "--system -d / -M --shell /bin/nologin systemd-bus-proxy" -USERADD_PARAM_${PN}-journal-gateway = "--system -d / -M --shell /bin/nologin systemd-journal-gateway" -USERADD_PARAM_${PN}-journal-remote = "--system -d / -M --shell /bin/nologin systemd-journal-remote" -USERADD_PARAM_${PN}-journal-upload = "--system -d / -M --shell /bin/nologin systemd-journal-upload" - -FILES_${PN}-analyze = "${bindir}/systemd-analyze" - -FILES_${PN}-initramfs = "/init" -RDEPENDS_${PN}-initramfs = "${PN}" - -FILES_${PN}-gui = "${bindir}/systemadm" - -FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ - ${systemd_unitdir}/system/systemd-vconsole-setup.service \ - ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service" - -RDEPENDS_${PN}-kernel-install += "bash" -FILES_${PN}-kernel-install = "${bindir}/kernel-install \ - ${sysconfdir}/kernel/ \ - ${exec_prefix}/lib/kernel \ - " -FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ - " - -FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" - -FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ - ${exec_prefix}/lib/binfmt.d \ - ${rootlibexecdir}/systemd/systemd-binfmt \ - ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \ - ${systemd_unitdir}/system/systemd-binfmt.service" -RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc" - -RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" - - -FILES_${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \ - ${systemd_system_unitdir}/systemd-journal-gatewayd.service \ - ${systemd_system_unitdir}/systemd-journal-gatewayd.socket \ - ${systemd_system_unitdir}/sockets.target.wants/systemd-journal-gatewayd.socket \ - ${datadir}/systemd/gatewayd/browse.html \ - " -SYSTEMD_SERVICE_${PN}-journal-gatewayd = "systemd-journal-gatewayd.socket" - -FILES_${PN}-journal-upload = "${rootlibexecdir}/systemd/systemd-journal-upload \ - ${systemd_system_unitdir}/systemd-journal-upload.service \ - ${sysconfdir}/systemd/journal-upload.conf \ - " -SYSTEMD_SERVICE_${PN}-journal-upload = "systemd-journal-upload.service" - -FILES_${PN}-journal-remote = "${rootlibexecdir}/systemd/systemd-journal-remote \ - ${sysconfdir}/systemd/journal-remote.conf \ - ${systemd_system_unitdir}/systemd-journal-remote.service \ - ${systemd_system_unitdir}/systemd-journal-remote.socket \ - " -SYSTEMD_SERVICE_${PN}-journal-remote = "systemd-journal-remote.socket" - - -FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ - ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ - ${sysconfdir}/systemd/system/multi-user.target.wants/machines.target \ - ${base_bindir}/machinectl \ - ${bindir}/systemd-nspawn \ - ${nonarch_libdir}/systemd/import-pubring.gpg \ - ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.import1.busname \ - ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.machine1.busname \ - ${systemd_system_unitdir}/local-fs.target.wants/var-lib-machines.mount \ - ${systemd_system_unitdir}/machines.target.wants/var-lib-machines.mount \ - ${systemd_system_unitdir}/remote-fs.target.wants/var-lib-machines.mount \ - ${systemd_system_unitdir}/machine.slice \ - ${systemd_system_unitdir}/machines.target \ - ${systemd_system_unitdir}/org.freedesktop.import1.busname \ - ${systemd_system_unitdir}/org.freedesktop.machine1.busname \ - ${systemd_system_unitdir}/systemd-importd.service \ - ${systemd_system_unitdir}/systemd-machined.service \ - ${systemd_system_unitdir}/dbus-org.freedesktop.machine1.service \ - ${systemd_system_unitdir}/var-lib-machines.mount \ - ${rootlibexecdir}/systemd/systemd-import \ - ${rootlibexecdir}/systemd/systemd-importd \ - ${rootlibexecdir}/systemd/systemd-machined \ - ${rootlibexecdir}/systemd/systemd-pull \ - ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \ - ${systemd_system_unitdir}/systemd-nspawn@.service \ - ${libdir}/libnss_mymachines.so.2 \ - ${datadir}/dbus-1/system-services/org.freedesktop.import1.service \ - ${datadir}/dbus-1/system-services/org.freedesktop.machine1.service \ - ${datadir}/dbus-1/system.d/org.freedesktop.import1.conf \ - ${datadir}/dbus-1/system.d/org.freedesktop.machine1.conf \ - ${datadir}/polkit-1/actions/org.freedesktop.import1.policy \ - ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \ - " - -RRECOMMENDS_${PN}-container += "\ - ${PN}-journal-upload \ - ${PN}-journal-remote \ - ${PN}-journal-gatewayd \ - " - -FILES_${PN}-extra-utils = "\ - ${base_bindir}/systemd-escape \ - ${base_bindir}/systemd-inhibit \ - ${bindir}/systemd-detect-virt \ - ${bindir}/systemd-path \ - ${bindir}/systemd-run \ - ${bindir}/systemd-cat \ - ${bindir}/systemd-delta \ - ${bindir}/systemd-cgls \ - ${bindir}/systemd-cgtop \ - ${bindir}/systemd-stdio-bridge \ - ${base_bindir}/systemd-ask-password \ - ${base_bindir}/systemd-tty-ask-password-agent \ - ${systemd_unitdir}/system/systemd-ask-password-console.path \ - ${systemd_unitdir}/system/systemd-ask-password-console.service \ - ${systemd_unitdir}/system/systemd-ask-password-wall.path \ - ${systemd_unitdir}/system/systemd-ask-password-wall.service \ - ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-console.path \ - ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-wall.path \ - ${systemd_unitdir}/system/multi-user.target.wants/systemd-ask-password-wall.path \ - ${rootlibexecdir}/systemd/systemd-resolve-host \ - ${rootlibexecdir}/systemd/systemd-ac-power \ - ${rootlibexecdir}/systemd/systemd-activate \ - ${rootlibexecdir}/systemd/systemd-bus-proxyd \ - ${systemd_unitdir}/system/systemd-bus-proxyd.service \ - ${systemd_unitdir}/system/systemd-bus-proxyd.socket \ - ${rootlibexecdir}/systemd/systemd-socket-proxyd \ - ${rootlibexecdir}/systemd/systemd-reply-password \ - ${rootlibexecdir}/systemd/systemd-sleep \ - ${rootlibexecdir}/systemd/system-sleep \ - ${systemd_unitdir}/system/systemd-hibernate.service \ - ${systemd_unitdir}/system/systemd-hybrid-sleep.service \ - ${systemd_unitdir}/system/systemd-suspend.service \ - ${systemd_unitdir}/system/sleep.target \ - ${rootlibexecdir}/systemd/systemd-initctl \ - ${systemd_unitdir}/system/systemd-initctl.service \ - ${systemd_unitdir}/system/systemd-initctl.socket \ - ${systemd_unitdir}/system/sockets.target.wants/systemd-initctl.socket \ - ${rootlibexecdir}/systemd/system-generators/systemd-gpt-auto-generator \ - ${rootlibexecdir}/systemd/systemd-cgroups-agent \ -" - -FILES_${PN}-udev-rules = "\ - ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \ - ${rootlibexecdir}/udev/rules.d/71-seat.rules \ - ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \ - ${rootlibexecdir}/udev/rules.d/99-systemd.rules \ -" - -CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \ - ${sysconfdir}/systemd/journald.conf \ - ${sysconfdir}/systemd/logind.conf \ - ${sysconfdir}/systemd/networkd.conf \ - ${sysconfdir}/systemd/pstore.conf \ - ${sysconfdir}/systemd/resolved.conf \ - ${sysconfdir}/systemd/sleep.conf \ - ${sysconfdir}/systemd/system.conf \ - ${sysconfdir}/systemd/timesyncd.conf \ - ${sysconfdir}/systemd/user.conf \ -" - -FILES_${PN} = " ${base_bindir}/* \ - ${base_sbindir}/shutdown \ - ${base_sbindir}/halt \ - ${base_sbindir}/poweroff \ - ${base_sbindir}/runlevel \ - ${base_sbindir}/telinit \ - ${base_sbindir}/resolvconf \ - ${base_sbindir}/reboot \ - ${base_sbindir}/init \ - ${datadir}/dbus-1/services \ - ${datadir}/dbus-1/system-services \ - ${datadir}/polkit-1 \ - ${datadir}/${BPN} \ - ${datadir}/factory \ - ${sysconfdir}/dbus-1/ \ - ${sysconfdir}/modules-load.d/ \ - ${sysconfdir}/pam.d/ \ - ${sysconfdir}/profile.d/ \ - ${sysconfdir}/sysctl.d/ \ - ${sysconfdir}/systemd/ \ - ${sysconfdir}/tmpfiles.d/ \ - ${sysconfdir}/xdg/ \ - ${sysconfdir}/init.d/README \ - ${sysconfdir}/resolv-conf.systemd \ - ${sysconfdir}/X11/xinit/xinitrc.d/* \ - ${rootlibexecdir}/systemd/* \ - ${systemd_unitdir}/* \ - ${base_libdir}/security/*.so \ - /cgroup \ - ${bindir}/systemd* \ - ${bindir}/busctl \ - ${bindir}/coredumpctl \ - ${bindir}/localectl \ - ${bindir}/hostnamectl \ - ${bindir}/resolvectl \ - ${bindir}/timedatectl \ - ${bindir}/bootctl \ - ${exec_prefix}/lib/tmpfiles.d/*.conf \ - ${exec_prefix}/lib/systemd \ - ${exec_prefix}/lib/modules-load.d \ - ${exec_prefix}/lib/sysctl.d \ - ${exec_prefix}/lib/sysusers.d \ - ${exec_prefix}/lib/environment.d \ - ${localstatedir} \ - ${rootlibexecdir}/modprobe.d/systemd.conf \ - ${datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf \ - ${datadir}/dbus-1/system.d/org.freedesktop.locale1.conf \ - ${datadir}/dbus-1/system.d/org.freedesktop.network1.conf \ - ${datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf \ - ${datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf \ - ${datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf \ - ${datadir}/dbus-1/system.d/org.freedesktop.login1.conf \ - ${datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf \ - ${datadir}/dbus-1/system.d/org.freedesktop.portable1.conf \ - " - -FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" - -RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck" -RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" -RDEPENDS_${PN} += "volatile-binds" - -RRECOMMENDS_${PN} += "systemd-extra-utils \ - udev-hwdb \ - e2fsprogs-e2fsck \ - kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 kernel-module-sch-fq-codel \ - os-release \ - systemd-conf \ -" - -INSANE_SKIP_${PN} += "dev-so libdir" -INSANE_SKIP_${PN}-dbg += "libdir" -INSANE_SKIP_${PN}-doc += " libdir" - -RPROVIDES_udev = "hotplug" - -RDEPENDS_udev-hwdb += "udev" - -FILES_udev += "${base_sbindir}/udevd \ - ${rootlibexecdir}/systemd/network/99-default.link \ - ${rootlibexecdir}/systemd/systemd-udevd \ - ${rootlibexecdir}/udev/accelerometer \ - ${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 \ - ${rootlibexecdir}/udev/mtd_probe \ - ${rootlibexecdir}/udev/scsi_id \ - ${rootlibexecdir}/udev/v4l_id \ - ${rootlibexecdir}/udev/keymaps \ - ${rootlibexecdir}/udev/rules.d/50-udev-default.rules \ - ${rootlibexecdir}/udev/rules.d/60-autosuspend.rules \ - ${rootlibexecdir}/udev/rules.d/60-autosuspend-chromiumos.rules \ - ${rootlibexecdir}/udev/rules.d/60-block.rules \ - ${rootlibexecdir}/udev/rules.d/60-cdrom_id.rules \ - ${rootlibexecdir}/udev/rules.d/60-drm.rules \ - ${rootlibexecdir}/udev/rules.d/60-evdev.rules \ - ${rootlibexecdir}/udev/rules.d/60-fido-id.rules \ - ${rootlibexecdir}/udev/rules.d/60-input-id.rules \ - ${rootlibexecdir}/udev/rules.d/60-persistent-alsa.rules \ - ${rootlibexecdir}/udev/rules.d/60-persistent-input.rules \ - ${rootlibexecdir}/udev/rules.d/60-persistent-storage.rules \ - ${rootlibexecdir}/udev/rules.d/60-persistent-storage-tape.rules \ - ${rootlibexecdir}/udev/rules.d/60-persistent-v4l.rules \ - ${rootlibexecdir}/udev/rules.d/60-sensor.rules \ - ${rootlibexecdir}/udev/rules.d/60-serial.rules \ - ${rootlibexecdir}/udev/rules.d/61-autosuspend-manual.rules \ - ${rootlibexecdir}/udev/rules.d/64-btrfs.rules \ - ${rootlibexecdir}/udev/rules.d/70-joystick.rules \ - ${rootlibexecdir}/udev/rules.d/70-mouse.rules \ - ${rootlibexecdir}/udev/rules.d/70-power-switch.rules \ - ${rootlibexecdir}/udev/rules.d/70-touchpad.rules \ - ${rootlibexecdir}/udev/rules.d/75-net-description.rules \ - ${rootlibexecdir}/udev/rules.d/75-probe_mtd.rules \ - ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \ - ${rootlibexecdir}/udev/rules.d/80-drivers.rules \ - ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \ - ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \ - ${sysconfdir}/udev \ - ${sysconfdir}/init.d/systemd-udevd \ - ${systemd_unitdir}/system/*udev* \ - ${systemd_unitdir}/system/*.wants/*udev* \ - ${base_bindir}/systemd-hwdb \ - ${base_bindir}/udevadm \ - ${base_sbindir}/udevadm \ - ${libexecdir}/${MLPREFIX}udevadm \ - ${datadir}/bash-completion/completions/udevadm \ - ${systemd_unitdir}/system/systemd-hwdb-update.service \ - " - -FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \ - " - -RCONFLICTS_${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}" - -INITSCRIPT_PACKAGES = "udev" -INITSCRIPT_NAME_udev = "systemd-udevd" -INITSCRIPT_PARAMS_udev = "start 03 S ." - -python __anonymous() { - if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") -} - -python do_warn_musl() { - if d.getVar('TCLIBC') == "musl": - bb.warn("Using systemd with musl is not recommended since it is not supported upstream and some patches are known to be problematic.") -} -addtask warn_musl before do_configure - -ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" - -ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd" -ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf" -ALTERNATIVE_PRIORITY[resolv-conf] ?= "50" - -ALTERNATIVE_TARGET[halt] = "${base_bindir}/systemctl" -ALTERNATIVE_LINK_NAME[halt] = "${base_sbindir}/halt" -ALTERNATIVE_PRIORITY[halt] ?= "300" - -ALTERNATIVE_TARGET[reboot] = "${base_bindir}/systemctl" -ALTERNATIVE_LINK_NAME[reboot] = "${base_sbindir}/reboot" -ALTERNATIVE_PRIORITY[reboot] ?= "300" - -ALTERNATIVE_TARGET[shutdown] = "${base_bindir}/systemctl" -ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" -ALTERNATIVE_PRIORITY[shutdown] ?= "300" - -ALTERNATIVE_TARGET[poweroff] = "${base_bindir}/systemctl" -ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" -ALTERNATIVE_PRIORITY[poweroff] ?= "300" - -ALTERNATIVE_TARGET[runlevel] = "${base_bindir}/systemctl" -ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" -ALTERNATIVE_PRIORITY[runlevel] ?= "300" - -pkg_postinst_${PN}_libc-glibc () { - sed -e '/^hosts:/s/\s*\//' \ - -e 's/\(^hosts:.*\)\(\\)\(.*\)\(\\)\(.*\)/\1\2 myhostname \3\4\5/' \ - -i $D${sysconfdir}/nsswitch.conf -} - -pkg_prerm_${PN}_libc-glibc () { - sed -e '/^hosts:/s/\s*\//' \ - -e '/^hosts:/s/\s*myhostname//' \ - -i $D${sysconfdir}/nsswitch.conf -} - -PACKAGE_WRITE_DEPS += "qemu-native" -pkg_postinst_udev-hwdb () { - if test -n "$D"; then - $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} rootlibexecdir="${rootlibexecdir}" PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}" - else - udevadm hwdb --update - fi -} - -pkg_prerm_udev-hwdb () { - rm -f $D${sysconfdir}/udev/hwdb.bin -} diff --git a/poky/meta/recipes-core/systemd/systemd_247.2.bb b/poky/meta/recipes-core/systemd/systemd_247.2.bb new file mode 100644 index 000000000..5eea78eff --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd_247.2.bb @@ -0,0 +1,745 @@ +require systemd.inc + +PROVIDES = "udev" + +PE = "1" + +DEPENDS = "intltool-native gperf-native libcap util-linux" + +SECTION = "base/shell" + +inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check + +# As this recipe builds udev, respect systemd being in DISTRO_FEATURES so +# that we don't build both udev and systemd in world builds. +REQUIRED_DISTRO_FEATURES = "systemd" + +SRC_URI += "file://touchscreen.rules \ + file://00-create-volatile.conf \ + file://init \ + file://99-default.preset \ + file://systemd-pager.sh \ + file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ + file://0003-implment-systemd-sysv-install-for-OE.patch \ + file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ + file://0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch \ + " + +# patches needed by musl +SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}" +SRC_URI_MUSL = "\ + file://0002-don-t-use-glibc-specific-qsort_r.patch \ + file://0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch \ + file://0004-add-fallback-parse_printf_format-implementation.patch \ + file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \ + file://0006-Include-netinet-if_ether.h.patch \ + file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ + file://0008-add-missing-FTW_-macros-for-musl.patch \ + file://0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ + file://0010-Use-uintmax_t-for-handling-rlim_t.patch \ + file://0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ + file://0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ + file://0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ + file://0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ + file://0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ + file://0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ + file://0017-missing_type.h-add-__compar_d_fn_t-definition.patch \ + file://0018-avoid-redefinition-of-prctl_mm_map-structure.patch \ + file://0019-Handle-missing-LOCK_EX.patch \ + file://0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \ + file://0021-test-json.c-define-M_PIl.patch \ + file://0022-do-not-disable-buffer-in-writing-files.patch \ + file://0023-Include-sys-wait.h.patch \ + file://0024-Include-signal.h.patch \ + file://0025-Handle-__cpu_mask-usage.patch \ + file://0026-Handle-missing-gshadow.patch \ + " + +PAM_PLUGINS = " \ + pam-plugin-unix \ + pam-plugin-loginuid \ + pam-plugin-keyinit \ +" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam selinux smack usrmerge polkit', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ + backlight \ + binfmt \ + gshadow \ + hibernate \ + hostnamed \ + idn \ + ima \ + kmod \ + localed \ + logind \ + machined \ + myhostname \ + networkd \ + nss \ + nss-mymachines \ + nss-resolve \ + quotacheck \ + randomseed \ + resolved \ + set-time-epoch \ + sysusers \ + sysvinit \ + timedated \ + timesyncd \ + userdb \ + utmp \ + vconsole \ + xz \ +" + +PACKAGECONFIG_remove_libc-musl = " \ + gshadow \ + idn \ + localed \ + myhostname \ + nss \ + nss-mymachines \ + nss-resolve \ + sysusers \ + userdb \ + utmp \ +" + +CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0 " + +# Some of the dependencies are weak-style recommends - if not available at runtime, +# systemd won't fail but the library-related feature will be skipped with a warning. + +# Use the upstream systemd serial-getty@.service and rely on +# systemd-getty-generator instead of using the OE-core specific +# systemd-serialgetty.bb - not enabled by default. +PACKAGECONFIG[serial-getty-generator] = "" + +PACKAGECONFIG[acl] = "-Dacl=true,-Dacl=false,acl" +PACKAGECONFIG[audit] = "-Daudit=true,-Daudit=false,audit" +PACKAGECONFIG[backlight] = "-Dbacklight=true,-Dbacklight=false" +PACKAGECONFIG[binfmt] = "-Dbinfmt=true,-Dbinfmt=false" +PACKAGECONFIG[bzip2] = "-Dbzip2=true,-Dbzip2=false,bzip2" +PACKAGECONFIG[cgroupv2] = "-Ddefault-hierarchy=unified,-Ddefault-hierarchy=hybrid" +PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false" +PACKAGECONFIG[cryptsetup] = "-Dlibcryptsetup=true,-Dlibcryptsetup=false,cryptsetup,,cryptsetup" +PACKAGECONFIG[dbus] = "-Ddbus=true,-Ddbus=false,dbus" +PACKAGECONFIG[efi] = "-Defi=true,-Defi=false" +PACKAGECONFIG[gnu-efi] = "-Dgnu-efi=true -Defi-libdir=${STAGING_LIBDIR} -Defi-includedir=${STAGING_INCDIR}/efi,-Dgnu-efi=false,gnu-efi" +PACKAGECONFIG[elfutils] = "-Delfutils=true,-Delfutils=false,elfutils" +PACKAGECONFIG[firstboot] = "-Dfirstboot=true,-Dfirstboot=false" +# Sign the journal for anti-tampering +PACKAGECONFIG[gcrypt] = "-Dgcrypt=true,-Dgcrypt=false,libgcrypt" +PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" +PACKAGECONFIG[gshadow] = "-Dgshadow=true,-Dgshadow=false" +PACKAGECONFIG[hibernate] = "-Dhibernate=true,-Dhibernate=false" +PACKAGECONFIG[hostnamed] = "-Dhostnamed=true,-Dhostnamed=false" +PACKAGECONFIG[idn] = "-Didn=true,-Didn=false" +PACKAGECONFIG[ima] = "-Dima=true,-Dima=false" +# importd requires curl/xz/zlib/bzip2/gcrypt +PACKAGECONFIG[importd] = "-Dimportd=true,-Dimportd=false" +# Update NAT firewall rules +PACKAGECONFIG[iptc] = "-Dlibiptc=true,-Dlibiptc=false,iptables" +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,,libidn" +PACKAGECONFIG[libidn2] = "-Dlibidn2=true,-Dlibidn2=false,libidn2,,libidn2" +PACKAGECONFIG[localed] = "-Dlocaled=true,-Dlocaled=false" +PACKAGECONFIG[logind] = "-Dlogind=true,-Dlogind=false" +PACKAGECONFIG[lz4] = "-Dlz4=true,-Dlz4=false,lz4" +PACKAGECONFIG[machined] = "-Dmachined=true,-Dmachined=false" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[microhttpd] = "-Dmicrohttpd=true,-Dmicrohttpd=false,libmicrohttpd" +PACKAGECONFIG[myhostname] = "-Dnss-myhostname=true,-Dnss-myhostname=false,,libnss-myhostname" +PACKAGECONFIG[networkd] = "-Dnetworkd=true,-Dnetworkd=false" +PACKAGECONFIG[nss] = "-Dnss-systemd=true,-Dnss-systemd=false" +PACKAGECONFIG[nss-mymachines] = "-Dnss-mymachines=true,-Dnss-mymachines=false" +PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=true,-Dnss-resolve=false" +PACKAGECONFIG[oomd] = "-Doomd=true,-Doomd=false" +PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl" +PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}" +PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2" +PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false" +PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false" +PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode,,qrencode" +PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false" +PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false" +PACKAGECONFIG[resolved] = "-Dresolve=true,-Dresolve=false" +PACKAGECONFIG[rfkill] = "-Drfkill=true,-Drfkill=false" +# libseccomp is found in meta-security +PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" +PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,initscripts-sushell" +PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false" +PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false" +PACKAGECONFIG[sysvinit] = "-Dsysvinit-path=${sysconfdir}/init.d -Dsysvrcnd-path=${sysconfdir},-Dsysvinit-path= -Dsysvrcnd-path=,,systemd-compat-units update-rc.d" +# When enabled use reproducble build timestamp if set as time epoch, +# or build time if not. When disabled, time epoch is unset. +def build_epoch(d): + epoch = d.getVar('SOURCE_DATE_EPOCH') or "-1" + return '-Dtime-epoch=%d' % int(epoch) +PACKAGECONFIG[set-time-epoch] = "${@build_epoch(d)},-Dtime-epoch=0" +PACKAGECONFIG[timedated] = "-Dtimedated=true,-Dtimedated=false" +PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false" +PACKAGECONFIG[usrmerge] = "-Dsplit-usr=false,-Dsplit-usr=true" +PACKAGECONFIG[sbinmerge] = "-Dsplit-bin=false,-Dsplit-bin=true" +PACKAGECONFIG[userdb] = "-Duserdb=true,-Duserdb=false" +PACKAGECONFIG[utmp] = "-Dutmp=true,-Dutmp=false" +PACKAGECONFIG[valgrind] = "-DVALGRIND=1,,valgrind" +PACKAGECONFIG[vconsole] = "-Dvconsole=true,-Dvconsole=false,,${PN}-vconsole-setup" +PACKAGECONFIG[xdg-autostart] = "-Dxdg-autostart=true,-Dxdg-autostart=false" +# Verify keymaps on locale change +PACKAGECONFIG[xkbcommon] = "-Dxkbcommon=true,-Dxkbcommon=false,libxkbcommon" +PACKAGECONFIG[xz] = "-Dxz=true,-Dxz=false,xz" +PACKAGECONFIG[zlib] = "-Dzlib=true,-Dzlib=false,zlib" + +# Helper variables to clarify locations. This mirrors the logic in systemd's +# build system. +rootprefix ?= "${root_prefix}" +rootlibdir ?= "${base_libdir}" +rootlibexecdir = "${rootprefix}/lib" + +# This links udev statically with systemd helper library. +# Otherwise udev package would depend on systemd package (which has the needed shared library), +# and always pull it into images. +EXTRA_OEMESON += "-Dlink-udev-shared=false" + +EXTRA_OEMESON += "-Dnobody-user=nobody \ + -Dnobody-group=nobody \ + -Drootlibdir=${rootlibdir} \ + -Drootprefix=${rootprefix} \ + -Ddefault-locale=C \ + -Dmode=release \ + -Dsystem-alloc-uid-min=101 \ + -Dsystem-uid-max=999 \ + -Dsystem-alloc-gid-min=101 \ + -Dsystem-gid-max=999 \ + " + +# Hardcode target binary paths to avoid using paths from sysroot +EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \ + -Dkmod-path=${base_bindir}/kmod \ + -Dmount-path=${base_bindir}/mount \ + -Dquotacheck-path=${sbindir}/quotacheck \ + -Dquotaon-path=${sbindir}/quotaon \ + -Dsulogin-path=${base_sbindir}/sulogin \ + -Dnologin-path=${base_sbindir}/nologin \ + -Dumount-path=${base_bindir}/umount" + +do_install() { + meson_do_install + install -d ${D}/${base_sbindir} + if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then + # Provided by a separate recipe + rm ${D}${systemd_unitdir}/system/serial-getty* -f + fi + + # Provide support for initramfs + [ ! -e ${D}/init ] && ln -s ${rootlibexecdir}/systemd/systemd ${D}/init + [ ! -e ${D}/${base_sbindir}/udevd ] && ln -s ${rootlibexecdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd + + install -d ${D}${sysconfdir}/udev/rules.d/ + install -d ${D}${sysconfdir}/tmpfiles.d + for rule in $(find ${WORKDIR} -maxdepth 1 -type f -name "*.rules"); do + install -m 0644 $rule ${D}${sysconfdir}/udev/rules.d/ + done + + install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + + if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd + sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd + install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install + fi + + chown root:systemd-journal ${D}/${localstatedir}/log/journal + + # Delete journal README, as log can be symlinked inside volatile. + rm -f ${D}/${localstatedir}/log/README + + # journal-remote creates this at start + rm -rf ${D}/${localstatedir}/log/journal/remote + + install -d ${D}${systemd_unitdir}/system/graphical.target.wants + install -d ${D}${systemd_unitdir}/system/multi-user.target.wants + install -d ${D}${systemd_unitdir}/system/poweroff.target.wants + install -d ${D}${systemd_unitdir}/system/reboot.target.wants + install -d ${D}${systemd_unitdir}/system/rescue.target.wants + + # Create symlinks for systemd-update-utmp-runlevel.service + if ${@bb.utils.contains('PACKAGECONFIG', 'utmp', 'true', 'false', d)}; then + ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/graphical.target.wants/systemd-update-utmp-runlevel.service + ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/multi-user.target.wants/systemd-update-utmp-runlevel.service + ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/poweroff.target.wants/systemd-update-utmp-runlevel.service + ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/reboot.target.wants/systemd-update-utmp-runlevel.service + ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/rescue.target.wants/systemd-update-utmp-runlevel.service + fi + + # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it + # for existence else it fails + if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then + ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)} + fi + if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false', d)}; then + echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf + echo 'd /run/systemd/resolve 0755 root root -' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf + echo 'f /run/systemd/resolve/resolv.conf 0644 root root' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf + ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd + else + sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf + ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then + rm ${D}${exec_prefix}/lib/tmpfiles.d/x11.conf + rm -r ${D}${sysconfdir}/X11 + fi + + # If polkit is setup fixup permissions and ownership + if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then + if [ -d ${D}${datadir}/polkit-1/rules.d ]; then + chmod 700 ${D}${datadir}/polkit-1/rules.d + chown polkitd:root ${D}${datadir}/polkit-1/rules.d + fi + fi + + # create link for existing udev rules + ln -s ${base_bindir}/udevadm ${D}${base_sbindir}/udevadm + + # duplicate udevadm for postinst script + install -d ${D}${libexecdir} + ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm + + # install default policy for presets + # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto + install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset + + # add a profile fragment to disable systemd pager with busybox less + install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh +} + +python populate_packages_prepend (){ + systemdlibdir = d.getVar("rootlibdir") + do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) +} +PACKAGES_DYNAMIC += "^lib(udev|systemd|nss).*" + +PACKAGE_BEFORE_PN = "\ + ${PN}-gui \ + ${PN}-vconsole-setup \ + ${PN}-initramfs \ + ${PN}-analyze \ + ${PN}-kernel-install \ + ${PN}-rpm-macros \ + ${PN}-binfmt \ + ${PN}-zsh-completion \ + ${PN}-container \ + ${PN}-journal-gatewayd \ + ${PN}-journal-upload \ + ${PN}-journal-remote \ + ${PN}-extra-utils \ + ${PN}-udev-rules \ + udev \ + udev-hwdb \ +" + +SUMMARY_${PN}-container = "Tools for containers and VMs" +DESCRIPTION_${PN}-container = "Systemd tools to spawn and manage containers and virtual machines." + +SUMMARY_${PN}-journal-gatewayd = "HTTP server for journal events" +DESCRIPTION_${PN}-journal-gatewayd = "systemd-journal-gatewayd serves journal events over the network. Clients must connect using HTTP. The server listens on port 19531 by default." + +SUMMARY_${PN}-journal-upload = "Send journal messages over the network" +DESCRIPTION_${PN}-journal-upload = "systemd-journal-upload uploads journal entries to a specified URL." + +SUMMARY_${PN}-journal-remote = "Receive journal messages over the network" +DESCRIPTION_${PN}-journal-remote = "systemd-journal-remote is a command to receive serialized journal events and store them to journal files." + +SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ +" +SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" + +USERADD_PACKAGES = "${PN} ${PN}-extra-utils \ + ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gateway', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ +" +GROUPADD_PARAM_${PN} = "-r systemd-journal" +USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}" +USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /bin/nologin systemd-network;', '', d)}" +USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}" +USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /bin/nologin systemd-resolve;', '', d)}" +USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /bin/nologin systemd-timesync;', '', d)}" +USERADD_PARAM_${PN}-extra-utils = "--system -d / -M --shell /bin/nologin systemd-bus-proxy" +USERADD_PARAM_${PN}-journal-gateway = "--system -d / -M --shell /bin/nologin systemd-journal-gateway" +USERADD_PARAM_${PN}-journal-remote = "--system -d / -M --shell /bin/nologin systemd-journal-remote" +USERADD_PARAM_${PN}-journal-upload = "--system -d / -M --shell /bin/nologin systemd-journal-upload" + +FILES_${PN}-analyze = "${bindir}/systemd-analyze" + +FILES_${PN}-initramfs = "/init" +RDEPENDS_${PN}-initramfs = "${PN}" + +FILES_${PN}-gui = "${bindir}/systemadm" + +FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ + ${systemd_unitdir}/system/systemd-vconsole-setup.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service" + +RDEPENDS_${PN}-kernel-install += "bash" +FILES_${PN}-kernel-install = "${bindir}/kernel-install \ + ${sysconfdir}/kernel/ \ + ${exec_prefix}/lib/kernel \ + " +FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ + " + +FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ + ${exec_prefix}/lib/binfmt.d \ + ${rootlibexecdir}/systemd/systemd-binfmt \ + ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \ + ${systemd_unitdir}/system/systemd-binfmt.service" +RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc" + +RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" + + +FILES_${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \ + ${systemd_system_unitdir}/systemd-journal-gatewayd.service \ + ${systemd_system_unitdir}/systemd-journal-gatewayd.socket \ + ${systemd_system_unitdir}/sockets.target.wants/systemd-journal-gatewayd.socket \ + ${datadir}/systemd/gatewayd/browse.html \ + " +SYSTEMD_SERVICE_${PN}-journal-gatewayd = "systemd-journal-gatewayd.socket" + +FILES_${PN}-journal-upload = "${rootlibexecdir}/systemd/systemd-journal-upload \ + ${systemd_system_unitdir}/systemd-journal-upload.service \ + ${sysconfdir}/systemd/journal-upload.conf \ + " +SYSTEMD_SERVICE_${PN}-journal-upload = "systemd-journal-upload.service" + +FILES_${PN}-journal-remote = "${rootlibexecdir}/systemd/systemd-journal-remote \ + ${sysconfdir}/systemd/journal-remote.conf \ + ${systemd_system_unitdir}/systemd-journal-remote.service \ + ${systemd_system_unitdir}/systemd-journal-remote.socket \ + " +SYSTEMD_SERVICE_${PN}-journal-remote = "systemd-journal-remote.socket" + + +FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ + ${sysconfdir}/systemd/system/multi-user.target.wants/machines.target \ + ${base_bindir}/machinectl \ + ${bindir}/systemd-nspawn \ + ${nonarch_libdir}/systemd/import-pubring.gpg \ + ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.import1.busname \ + ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.machine1.busname \ + ${systemd_system_unitdir}/local-fs.target.wants/var-lib-machines.mount \ + ${systemd_system_unitdir}/machines.target.wants/var-lib-machines.mount \ + ${systemd_system_unitdir}/remote-fs.target.wants/var-lib-machines.mount \ + ${systemd_system_unitdir}/machine.slice \ + ${systemd_system_unitdir}/machines.target \ + ${systemd_system_unitdir}/org.freedesktop.import1.busname \ + ${systemd_system_unitdir}/org.freedesktop.machine1.busname \ + ${systemd_system_unitdir}/systemd-importd.service \ + ${systemd_system_unitdir}/systemd-machined.service \ + ${systemd_system_unitdir}/dbus-org.freedesktop.machine1.service \ + ${systemd_system_unitdir}/var-lib-machines.mount \ + ${rootlibexecdir}/systemd/systemd-import \ + ${rootlibexecdir}/systemd/systemd-importd \ + ${rootlibexecdir}/systemd/systemd-machined \ + ${rootlibexecdir}/systemd/systemd-pull \ + ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \ + ${systemd_system_unitdir}/systemd-nspawn@.service \ + ${libdir}/libnss_mymachines.so.2 \ + ${datadir}/dbus-1/system-services/org.freedesktop.import1.service \ + ${datadir}/dbus-1/system-services/org.freedesktop.machine1.service \ + ${datadir}/dbus-1/system.d/org.freedesktop.import1.conf \ + ${datadir}/dbus-1/system.d/org.freedesktop.machine1.conf \ + ${datadir}/polkit-1/actions/org.freedesktop.import1.policy \ + ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \ + " + +RRECOMMENDS_${PN}-container += "\ + ${PN}-journal-upload \ + ${PN}-journal-remote \ + ${PN}-journal-gatewayd \ + " + +FILES_${PN}-extra-utils = "\ + ${base_bindir}/systemd-escape \ + ${base_bindir}/systemd-inhibit \ + ${bindir}/systemd-detect-virt \ + ${bindir}/systemd-dissect \ + ${bindir}/systemd-path \ + ${bindir}/systemd-run \ + ${bindir}/systemd-cat \ + ${bindir}/systemd-delta \ + ${bindir}/systemd-cgls \ + ${bindir}/systemd-cgtop \ + ${bindir}/systemd-stdio-bridge \ + ${base_bindir}/systemd-ask-password \ + ${base_bindir}/systemd-tty-ask-password-agent \ + ${systemd_unitdir}/system/systemd-ask-password-console.path \ + ${systemd_unitdir}/system/systemd-ask-password-console.service \ + ${systemd_unitdir}/system/systemd-ask-password-wall.path \ + ${systemd_unitdir}/system/systemd-ask-password-wall.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-console.path \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-wall.path \ + ${systemd_unitdir}/system/multi-user.target.wants/systemd-ask-password-wall.path \ + ${rootlibexecdir}/systemd/systemd-resolve-host \ + ${rootlibexecdir}/systemd/systemd-ac-power \ + ${rootlibexecdir}/systemd/systemd-activate \ + ${rootlibexecdir}/systemd/systemd-bus-proxyd \ + ${systemd_unitdir}/system/systemd-bus-proxyd.service \ + ${systemd_unitdir}/system/systemd-bus-proxyd.socket \ + ${rootlibexecdir}/systemd/systemd-socket-proxyd \ + ${rootlibexecdir}/systemd/systemd-reply-password \ + ${rootlibexecdir}/systemd/systemd-sleep \ + ${rootlibexecdir}/systemd/system-sleep \ + ${systemd_unitdir}/system/systemd-hibernate.service \ + ${systemd_unitdir}/system/systemd-hybrid-sleep.service \ + ${systemd_unitdir}/system/systemd-suspend.service \ + ${systemd_unitdir}/system/sleep.target \ + ${rootlibexecdir}/systemd/systemd-initctl \ + ${systemd_unitdir}/system/systemd-initctl.service \ + ${systemd_unitdir}/system/systemd-initctl.socket \ + ${systemd_unitdir}/system/sockets.target.wants/systemd-initctl.socket \ + ${rootlibexecdir}/systemd/system-generators/systemd-gpt-auto-generator \ + ${rootlibexecdir}/systemd/systemd-cgroups-agent \ +" + +FILES_${PN}-udev-rules = "\ + ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \ + ${rootlibexecdir}/udev/rules.d/71-seat.rules \ + ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \ + ${rootlibexecdir}/udev/rules.d/99-systemd.rules \ +" + +CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \ + ${sysconfdir}/systemd/journald.conf \ + ${sysconfdir}/systemd/logind.conf \ + ${sysconfdir}/systemd/networkd.conf \ + ${sysconfdir}/systemd/pstore.conf \ + ${sysconfdir}/systemd/resolved.conf \ + ${sysconfdir}/systemd/sleep.conf \ + ${sysconfdir}/systemd/system.conf \ + ${sysconfdir}/systemd/timesyncd.conf \ + ${sysconfdir}/systemd/user.conf \ +" + +FILES_${PN} = " ${base_bindir}/* \ + ${base_sbindir}/shutdown \ + ${base_sbindir}/halt \ + ${base_sbindir}/poweroff \ + ${base_sbindir}/runlevel \ + ${base_sbindir}/telinit \ + ${base_sbindir}/resolvconf \ + ${base_sbindir}/reboot \ + ${base_sbindir}/init \ + ${datadir}/dbus-1/services \ + ${datadir}/dbus-1/system-services \ + ${datadir}/polkit-1 \ + ${datadir}/${BPN} \ + ${datadir}/factory \ + ${sysconfdir}/dbus-1/ \ + ${sysconfdir}/modules-load.d/ \ + ${sysconfdir}/pam.d/ \ + ${sysconfdir}/profile.d/ \ + ${sysconfdir}/sysctl.d/ \ + ${sysconfdir}/systemd/ \ + ${sysconfdir}/tmpfiles.d/ \ + ${sysconfdir}/xdg/ \ + ${sysconfdir}/init.d/README \ + ${sysconfdir}/resolv-conf.systemd \ + ${sysconfdir}/X11/xinit/xinitrc.d/* \ + ${rootlibexecdir}/systemd/* \ + ${libdir}/pam.d \ + ${nonarch_libdir}/pam.d \ + ${systemd_unitdir}/* \ + ${base_libdir}/security/*.so \ + /cgroup \ + ${bindir}/systemd* \ + ${bindir}/busctl \ + ${bindir}/coredumpctl \ + ${bindir}/localectl \ + ${bindir}/hostnamectl \ + ${bindir}/resolvectl \ + ${bindir}/timedatectl \ + ${bindir}/bootctl \ + ${bindir}/oomctl \ + ${exec_prefix}/lib/tmpfiles.d/*.conf \ + ${exec_prefix}/lib/systemd \ + ${exec_prefix}/lib/modules-load.d \ + ${exec_prefix}/lib/sysctl.d \ + ${exec_prefix}/lib/sysusers.d \ + ${exec_prefix}/lib/environment.d \ + ${localstatedir} \ + ${rootlibexecdir}/modprobe.d/systemd.conf \ + ${datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf \ + ${datadir}/dbus-1/system.d/org.freedesktop.locale1.conf \ + ${datadir}/dbus-1/system.d/org.freedesktop.network1.conf \ + ${datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf \ + ${datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf \ + ${datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf \ + ${datadir}/dbus-1/system.d/org.freedesktop.login1.conf \ + ${datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf \ + ${datadir}/dbus-1/system.d/org.freedesktop.portable1.conf \ + ${datadir}/dbus-1/system.d/org.freedesktop.oom1.conf \ + " + +FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" + +RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck" +RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" +RDEPENDS_${PN} += "volatile-binds" + +RRECOMMENDS_${PN} += "systemd-extra-utils \ + udev-hwdb \ + e2fsprogs-e2fsck \ + kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 kernel-module-sch-fq-codel \ + os-release \ + systemd-conf \ +" + +INSANE_SKIP_${PN} += "dev-so libdir" +INSANE_SKIP_${PN}-dbg += "libdir" +INSANE_SKIP_${PN}-doc += " libdir" + +RPROVIDES_udev = "hotplug" + +RDEPENDS_udev-hwdb += "udev" + +FILES_udev += "${base_sbindir}/udevd \ + ${rootlibexecdir}/systemd/network/99-default.link \ + ${rootlibexecdir}/systemd/systemd-udevd \ + ${rootlibexecdir}/udev/accelerometer \ + ${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 \ + ${rootlibexecdir}/udev/mtd_probe \ + ${rootlibexecdir}/udev/scsi_id \ + ${rootlibexecdir}/udev/v4l_id \ + ${rootlibexecdir}/udev/keymaps \ + ${rootlibexecdir}/udev/rules.d/50-udev-default.rules \ + ${rootlibexecdir}/udev/rules.d/60-autosuspend.rules \ + ${rootlibexecdir}/udev/rules.d/60-autosuspend-chromiumos.rules \ + ${rootlibexecdir}/udev/rules.d/60-block.rules \ + ${rootlibexecdir}/udev/rules.d/60-cdrom_id.rules \ + ${rootlibexecdir}/udev/rules.d/60-drm.rules \ + ${rootlibexecdir}/udev/rules.d/60-evdev.rules \ + ${rootlibexecdir}/udev/rules.d/60-fido-id.rules \ + ${rootlibexecdir}/udev/rules.d/60-input-id.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-alsa.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-input.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-storage.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-storage-tape.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-v4l.rules \ + ${rootlibexecdir}/udev/rules.d/60-sensor.rules \ + ${rootlibexecdir}/udev/rules.d/60-serial.rules \ + ${rootlibexecdir}/udev/rules.d/61-autosuspend-manual.rules \ + ${rootlibexecdir}/udev/rules.d/64-btrfs.rules \ + ${rootlibexecdir}/udev/rules.d/70-joystick.rules \ + ${rootlibexecdir}/udev/rules.d/70-mouse.rules \ + ${rootlibexecdir}/udev/rules.d/70-power-switch.rules \ + ${rootlibexecdir}/udev/rules.d/70-touchpad.rules \ + ${rootlibexecdir}/udev/rules.d/75-net-description.rules \ + ${rootlibexecdir}/udev/rules.d/75-probe_mtd.rules \ + ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \ + ${rootlibexecdir}/udev/rules.d/80-drivers.rules \ + ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \ + ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \ + ${sysconfdir}/udev \ + ${sysconfdir}/init.d/systemd-udevd \ + ${systemd_unitdir}/system/*udev* \ + ${systemd_unitdir}/system/*.wants/*udev* \ + ${base_bindir}/systemd-hwdb \ + ${base_bindir}/udevadm \ + ${base_sbindir}/udevadm \ + ${libexecdir}/${MLPREFIX}udevadm \ + ${datadir}/bash-completion/completions/udevadm \ + ${systemd_unitdir}/system/systemd-hwdb-update.service \ + " + +FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \ + " + +RCONFLICTS_${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}" + +INITSCRIPT_PACKAGES = "udev" +INITSCRIPT_NAME_udev = "systemd-udevd" +INITSCRIPT_PARAMS_udev = "start 03 S ." + +python __anonymous() { + if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") +} + +python do_warn_musl() { + if d.getVar('TCLIBC') == "musl": + bb.warn("Using systemd with musl is not recommended since it is not supported upstream and some patches are known to be problematic.") +} +addtask warn_musl before do_configure + +ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" + +ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd" +ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf" +ALTERNATIVE_PRIORITY[resolv-conf] ?= "50" + +ALTERNATIVE_TARGET[halt] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[halt] = "${base_sbindir}/halt" +ALTERNATIVE_PRIORITY[halt] ?= "300" + +ALTERNATIVE_TARGET[reboot] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[reboot] = "${base_sbindir}/reboot" +ALTERNATIVE_PRIORITY[reboot] ?= "300" + +ALTERNATIVE_TARGET[shutdown] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" +ALTERNATIVE_PRIORITY[shutdown] ?= "300" + +ALTERNATIVE_TARGET[poweroff] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" +ALTERNATIVE_PRIORITY[poweroff] ?= "300" + +ALTERNATIVE_TARGET[runlevel] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" +ALTERNATIVE_PRIORITY[runlevel] ?= "300" + +pkg_postinst_${PN}_libc-glibc () { + sed -e '/^hosts:/s/\s*\//' \ + -e 's/\(^hosts:.*\)\(\\)\(.*\)\(\\)\(.*\)/\1\2 myhostname \3\4\5/' \ + -i $D${sysconfdir}/nsswitch.conf +} + +pkg_prerm_${PN}_libc-glibc () { + sed -e '/^hosts:/s/\s*\//' \ + -e '/^hosts:/s/\s*myhostname//' \ + -i $D${sysconfdir}/nsswitch.conf +} + +PACKAGE_WRITE_DEPS += "qemu-native" +pkg_postinst_udev-hwdb () { + if test -n "$D"; then + $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} rootlibexecdir="${rootlibexecdir}" PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}" + else + udevadm hwdb --update + fi +} + +pkg_prerm_udev-hwdb () { + rm -f $D${sysconfdir}/udev/hwdb.bin +} diff --git a/poky/meta/recipes-core/sysvinit/sysvinit/rc b/poky/meta/recipes-core/sysvinit/sysvinit/rc index d0d314982..41196ec90 100755 --- a/poky/meta/recipes-core/sysvinit/sysvinit/rc +++ b/poky/meta/recipes-core/sysvinit/sysvinit/rc @@ -17,6 +17,7 @@ . /etc/default/rcS export VERBOSE +export PSPLASH_FIFO_DIR startup_progress() { step=$(($step + $step_change)) @@ -27,7 +28,7 @@ startup_progress() { fi #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" if type psplash-write >/dev/null 2>&1; then - PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true + psplash-write "PROGRESS $progress" || true fi } @@ -159,6 +160,9 @@ startup() { # [ -f $previous_start ] && [ ! -f $stop ] && continue fi + if [ x"${PSPLASH_TEXT_UPDATES}" = x"yes" ]; then + psplash-write "MSG $(basename $i .sh | cut -c 4-)" || true + fi case "$runlevel" in 0|6) startup $i stop @@ -173,7 +177,6 @@ startup() { #Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then if type psplash-write >/dev/null 2>&1; then - PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "QUIT" || true - umount -l /mnt/.psplash + psplash-write "QUIT" || true fi fi diff --git a/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default b/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default index 709cdf6ec..f7c4a2f84 100644 --- a/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default +++ b/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default @@ -27,3 +27,10 @@ VOLATILE_ENABLE_CACHE=yes # Setting ROOTFS_READ_ONLY to yes and rebooting will give you a read-only rootfs. # Normally you should not change this value. ROOTFS_READ_ONLY=no +# rcS is also used when using busybox init and shares initscripts, some initscripts +# need to have specific behavior depending on init system +INIT_SYSTEM=sysvinit +# set the psplash fifo directory +PSPLASH_FIFO_DIR=/mnt +# psplash textual updates knob +PSPLASH_TEXT_UPDATES=#PSPLASH_TEXT# diff --git a/poky/meta/recipes-core/sysvinit/sysvinit_2.97.bb b/poky/meta/recipes-core/sysvinit/sysvinit_2.97.bb deleted file mode 100644 index 98916f7f1..000000000 --- a/poky/meta/recipes-core/sysvinit/sysvinit_2.97.bb +++ /dev/null @@ -1,112 +0,0 @@ -SUMMARY = "System-V like init" -DESCRIPTION = "This package is required to boot in most configurations. It provides the /sbin/init program. This is the first process started on boot, and the last process terminated before the system halts." -HOMEPAGE = "http://savannah.nongnu.org/projects/sysvinit/" -SECTION = "base" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYRIGHT;endline=15;md5=a1d3b3526501d3546d530bbe6ab6cdbe \ - " - -RDEPENDS_${PN} = "${PN}-inittab" - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ - file://install.patch \ - file://crypt-lib.patch \ - file://pidof-add-m-option.patch \ - file://realpath.patch \ - file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \ - file://rcS-default \ - file://rc \ - file://rcS \ - file://bootlogd.init \ - file://01_bootlogd \ - " -SRC_URI[sha256sum] = "2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110" - -S = "${WORKDIR}/sysvinit-${PV}" - -inherit update-alternatives 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" - -ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" - -ALTERNATIVE_PRIORITY = "200" - -ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" -ALTERNATIVE_PRIORITY[init] = "50" - -ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" -ALTERNATIVE_PRIORITY[mountpoint] = "20" - -ALTERNATIVE_LINK_NAME[halt] = "${base_sbindir}/halt" -ALTERNATIVE_LINK_NAME[reboot] = "${base_sbindir}/reboot" -ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" -ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" -ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" - -ALTERNATIVE_${PN}-pidof = "pidof" -ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof" - -ALTERNATIVE_${PN}-sulogin = "sulogin" -ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" - -ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 sulogin.8 utmpdump.1" - -ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" -ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" -ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" -ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" -ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" -ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" -ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" - -PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" -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 base-passwd" - -CFLAGS_prepend = "-D_GNU_SOURCE " -export LCRYPT = "-lcrypt" -EXTRA_OEMAKE += "'base_bindir=${base_bindir}' \ - 'base_sbindir=${base_sbindir}' \ - 'bindir=${bindir}' \ - 'sbindir=${sbindir}' \ - 'sysconfdir=${sysconfdir}' \ - 'includedir=${includedir}' \ - 'mandir=${mandir}' \ - MNTPOINT=yes" - -do_install () { - oe_runmake 'ROOT=${D}' install - - install -d ${D}${sysconfdir} \ - ${D}${sysconfdir}/default \ - ${D}${sysconfdir}/init.d - for level in S 0 1 2 3 4 5 6; do - install -d ${D}${sysconfdir}/rc$level.d - done - - install -m 0644 ${WORKDIR}/rcS-default ${D}${sysconfdir}/default/rcS - install -m 0755 ${WORKDIR}/rc ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/bootlogd.init ${D}${sysconfdir}/init.d/bootlogd - ln -sf bootlogd ${D}${sysconfdir}/init.d/stop-bootlogd - - update-rc.d -r ${D} bootlogd start 07 S . - update-rc.d -r ${D} stop-bootlogd start 99 2 3 4 5 . - - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles - - chown root:shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown - chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown - - # Already provided by e2fsprogs; sysvinit's version is a copy from there - rm ${D}${base_sbindir}/logsave - rm ${D}${mandir}/man8/logsave.8 -} diff --git a/poky/meta/recipes-core/sysvinit/sysvinit_2.98.bb b/poky/meta/recipes-core/sysvinit/sysvinit_2.98.bb new file mode 100644 index 000000000..41009bc18 --- /dev/null +++ b/poky/meta/recipes-core/sysvinit/sysvinit_2.98.bb @@ -0,0 +1,117 @@ +SUMMARY = "System-V like init" +DESCRIPTION = "This package is required to boot in most configurations. It provides the /sbin/init program. This is the first process started on boot, and the last process terminated before the system halts." +HOMEPAGE = "http://savannah.nongnu.org/projects/sysvinit/" +SECTION = "base" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYRIGHT;endline=15;md5=a1d3b3526501d3546d530bbe6ab6cdbe \ + " + +RDEPENDS_${PN} = "${PN}-inittab" + +SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ + file://install.patch \ + file://crypt-lib.patch \ + file://pidof-add-m-option.patch \ + file://realpath.patch \ + file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \ + file://rcS-default \ + file://rc \ + file://rcS \ + file://bootlogd.init \ + file://01_bootlogd \ + " +SRC_URI[sha256sum] = "7b2c3ffaf19eaf1ca80268762f85f9e4eb8e3c973213d49f9802605b72caa7dc" + +S = "${WORKDIR}/sysvinit-${PV}" + +inherit update-alternatives features_check +DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" +do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" + +PACKAGECONFIG[psplash-text-updates] = ",," + +REQUIRED_DISTRO_FEATURES = "sysvinit" + +ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" + +ALTERNATIVE_PRIORITY = "200" + +ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" +ALTERNATIVE_PRIORITY[init] = "50" + +ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" +ALTERNATIVE_PRIORITY[mountpoint] = "20" + +ALTERNATIVE_LINK_NAME[halt] = "${base_sbindir}/halt" +ALTERNATIVE_LINK_NAME[reboot] = "${base_sbindir}/reboot" +ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" +ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" +ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" + +ALTERNATIVE_${PN}-pidof = "pidof" +ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof" + +ALTERNATIVE_${PN}-sulogin = "sulogin" +ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" + +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 sulogin.8 utmpdump.1" + +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" +ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" + +PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" +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 base-passwd" + +CFLAGS_prepend = "-D_GNU_SOURCE " +export LCRYPT = "-lcrypt" +EXTRA_OEMAKE += "'base_bindir=${base_bindir}' \ + 'base_sbindir=${base_sbindir}' \ + 'bindir=${bindir}' \ + 'sbindir=${sbindir}' \ + 'sysconfdir=${sysconfdir}' \ + 'includedir=${includedir}' \ + 'mandir=${mandir}' \ + MNTPOINT=yes" + +do_install () { + oe_runmake 'ROOT=${D}' install + + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/init.d + for level in S 0 1 2 3 4 5 6; do + install -d ${D}${sysconfdir}/rc$level.d + done + + sed -e \ + 's:#PSPLASH_TEXT#:${@bb.utils.contains("PACKAGECONFIG","psplash-text-updates","yes","no", d)}:g' \ + ${WORKDIR}/rcS-default > ${D}${sysconfdir}/default/rcS + chmod 0644 ${D}${sysconfdir}/default/rcS + install -m 0755 ${WORKDIR}/rc ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/bootlogd.init ${D}${sysconfdir}/init.d/bootlogd + ln -sf bootlogd ${D}${sysconfdir}/init.d/stop-bootlogd + + update-rc.d -r ${D} bootlogd start 07 S . + update-rc.d -r ${D} stop-bootlogd start 99 2 3 4 5 . + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles + + chown root:shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown + chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown + + # Already provided by e2fsprogs; sysvinit's version is a copy from there + rm ${D}${base_sbindir}/logsave + rm ${D}${mandir}/man8/logsave.8 +} diff --git a/poky/meta/recipes-core/util-linux/util-linux/0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch b/poky/meta/recipes-core/util-linux/util-linux/0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch new file mode 100644 index 000000000..f3ae5ef94 --- /dev/null +++ b/poky/meta/recipes-core/util-linux/util-linux/0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch @@ -0,0 +1,52 @@ +From 5547316c85cd45c0ea29c4c7c48eecd616783cd5 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 17 Nov 2020 11:27:48 +0100 +Subject: [PATCH] build-sys: do not build plymouth-ctrl.c w/ disabled plymouth + +Do not build plymouth-ctrl.c in agetty and sulogin in case the plymouth +support is disabled. + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/5547316c85cd45c0ea29c4c7c48eecd616783cd5] +Signed-off-by: Pino Toscano +--- + login-utils/Makemodule.am | 6 ++++-- + term-utils/Makemodule.am | 6 ++++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am +index 4f52cea3c..8bc3ee37e 100644 +--- a/login-utils/Makemodule.am ++++ b/login-utils/Makemodule.am +@@ -31,8 +31,10 @@ dist_man_MANS += login-utils/sulogin.8 + sulogin_SOURCES = \ + login-utils/sulogin.c \ + login-utils/sulogin-consoles.c \ +- login-utils/sulogin-consoles.h \ +- lib/plymouth-ctrl.c ++ login-utils/sulogin-consoles.h ++if USE_PLYMOUTH_SUPPORT ++sulogin_SOURCES += lib/plymouth-ctrl.c ++endif + sulogin_LDADD = $(LDADD) libcommon.la + + if HAVE_LIBCRYPT +diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am +index 92df7dbc8..c424dbdf8 100644 +--- a/term-utils/Makemodule.am ++++ b/term-utils/Makemodule.am +@@ -42,8 +42,10 @@ endif # BUILD_SCRIPTLIVE + if BUILD_AGETTY + sbin_PROGRAMS += agetty + dist_man_MANS += term-utils/agetty.8 +-agetty_SOURCES = term-utils/agetty.c \ +- lib/plymouth-ctrl.c ++agetty_SOURCES = term-utils/agetty.c ++if USE_PLYMOUTH_SUPPORT ++agetty_SOURCES += lib/plymouth-ctrl.c ++endif + agetty_LDADD = $(LDADD) libcommon.la + if BSD + agetty_LDADD += -lutil +-- +2.29.2 + diff --git a/poky/meta/recipes-core/util-linux/util-linux/0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch b/poky/meta/recipes-core/util-linux/util-linux/0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch new file mode 100644 index 000000000..3e818470f --- /dev/null +++ b/poky/meta/recipes-core/util-linux/util-linux/0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch @@ -0,0 +1,30 @@ +From 367972fae13d170675768d63678577cae1890143 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 17 Nov 2020 11:32:45 +0100 +Subject: [PATCH] hwclock: do not assume __NR_settimeofday_time32 + +Check that __NR_settimeofday_time32 exists before trying to use it as +syscall number. + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/367972fae13d170675768d63678577cae1890143] +Signed-off-by: Pino Toscano +--- + sys-utils/hwclock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c +index 1f7ef3317..db448687d 100644 +--- a/sys-utils/hwclock.c ++++ b/sys-utils/hwclock.c +@@ -678,7 +678,7 @@ display_time(struct timeval hwctime) + #ifndef SYS_settimeofday + # ifdef __NR_settimeofday + # define SYS_settimeofday __NR_settimeofday +-# else ++# elif defined(__NR_settimeofday_time32) + # define SYS_settimeofday __NR_settimeofday_time32 + # endif + #endif +-- +2.29.2 + diff --git a/poky/meta/recipes-core/util-linux/util-linux_2.36.1.bb b/poky/meta/recipes-core/util-linux/util-linux_2.36.1.bb new file mode 100644 index 000000000..bf4692227 --- /dev/null +++ b/poky/meta/recipes-core/util-linux/util-linux_2.36.1.bb @@ -0,0 +1,361 @@ +SUMMARY = "A suite of basic system administration utilities" +HOMEPAGE = "https://en.wikipedia.org/wiki/Util-linux" +DESCRIPTION = "Util-linux includes a suite of basic system administration utilities \ +commonly found on most Linux systems. Some of the more important utilities include \ +disk partitioning, kernel message management, filesystem creation, and system login." + +SECTION = "base" + +LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" +LICENSE_${PN}-libblkid = "LGPLv2.1+" +LICENSE_${PN}-libfdisk = "LGPLv2.1+" +LICENSE_${PN}-libmount = "LGPLv2.1+" +LICENSE_${PN}-libsmartcols = "LGPLv2.1+" +LICENSE_${PN}-libuuid = "BSD-3-Clause" + +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 \ + file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \ + file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \ + file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \ + file://libmount/COPYING;md5=7c7e39fb7d70ffe5d693a643e29987c2 \ + file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ + file://libfdisk/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ + file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ +" + +#gtk-doc is not enabled as it requires xmlto which requires util-linux +inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest +DEPENDS = "libcap-ng ncurses virtual/crypt zlib" + +MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \ + 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-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch \ + file://0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch \ + " +SRC_URI[sha256sum] = "09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed" + +PACKAGES =+ "${PN}-swaponoff" +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}" + +python util_linux_binpackages () { + def pkg_hook(f, pkg, file_regex, output_pattern, modulename): + pn = d.getVar('PN') + d.appendVar('RRECOMMENDS_%s' % pn, ' %s' % pkg) + + if d.getVar('ALTERNATIVE_' + pkg): + return + if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): + d.setVar('ALTERNATIVE_' + pkg, modulename) + + bindirs = sorted(list(set(d.expand("${base_sbindir} ${base_bindir} ${sbindir} ${bindir}").split()))) + for dir in bindirs: + do_split_packages(d, root=dir, + file_regex=r'(.*)', output_pattern='${PN}-%s', + description='${PN} %s', + hook=pkg_hook, extra_depends='') + + # There are some symlinks for some binaries which we have ignored + # above. Add them to the package owning the binary they are + # pointing to + extras = {} + dvar = d.getVar('PKGD') + for root in bindirs: + for walkroot, dirs, files in os.walk(dvar + root): + for f in files: + file = os.path.join(walkroot, f) + if not os.path.islink(file): + continue + + pkg = os.path.basename(os.readlink(file)) + extras[pkg] = extras.get(pkg, '') + ' ' + file.replace(dvar, '', 1) + + pn = d.getVar('PN') + for pkg, links in extras.items(): + of = d.getVar('FILES_' + pn + '-' + pkg) + links = of + links + d.setVar('FILES_' + pn + '-' + pkg, links) +} + +# we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS +PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages " + +python util_linux_libpackages() { + do_split_packages(d, root=d.getVar('UTIL_LINUX_LIBDIR'), file_regex=r'^lib(.*)\.so\..*$', + output_pattern='${PN}-lib%s', + description='${PN} lib%s', + extra_depends='', prepend=True, allow_links=True) +} + +PACKAGESPLITFUNCS =+ "util_linux_libpackages" + +PACKAGES_DYNAMIC = "^${PN}-.*" + +CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" +UTIL_LINUX_LIBDIR = "${libdir}" +UTIL_LINUX_LIBDIR_class-target = "${base_libdir}" +EXTRA_OECONF = "\ + --enable-libuuid --enable-libblkid \ + \ + --enable-fsck --enable-kill --enable-last --enable-mesg \ + --enable-mount --enable-partx --enable-raw --enable-rfkill \ + --enable-unshare --enable-write \ + \ + --disable-bfs --disable-chfn-chsh --disable-login \ + --disable-makeinstall-chown --disable-minix --disable-newgrp \ + --disable-use-tty-group --disable-vipw \ + \ + --without-udev \ + \ + usrsbin_execdir='${sbindir}' \ + --libdir='${UTIL_LINUX_LIBDIR}' \ +" + +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 +# build host versions during development +# +PACKAGECONFIG ?= "pcre2" +PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +# inherit manpages requires this to be present, however util-linux does not have +# configuration options, and installs manpages always +PACKAGECONFIG[manpages] = "" +PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," +# Respect the systemd feature for uuidd +PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" +# Build python bindings for libmount +PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-python --disable-pylibmount,python3" +# Readline support +PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +# PCRE support in hardlink +PACKAGECONFIG[pcre2] = ",,libpcre2" + +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" + +ALLOW_EMPTY_${PN} = "1" +FILES_${PN} = "" +FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" +FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" +FILES_${PN}-mount = "${sysconfdir}/default/mountall" +FILES_${PN}-runuser = "${sysconfdir}/pam.d/runuser*" +FILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +CONFFILES_${PN}-su = "${sysconfdir}/pam.d/su-l" +FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ + ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" + +# Util-linux' blkid replaces the e2fsprogs one +RCONFLICTS_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" +RREPLACES_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" + +RRECOMMENDS_${PN}_class-native = "" +RRECOMMENDS_${PN}_class-nativesdk = "" +RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}_class-nativesdk = "" + +RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev ${PN}-libuuid-dev" + +RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" +RDEPENDS_${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs grep iproute2 kmod mdadm procps sed socat which xz" +RRECOMMENDS_${PN}-ptest += "kernel-module-scsi-debug" +RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" +ALLOW_EMPTY_${PN}-swaponoff = "1" + +#SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" +SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" +SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" +SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" +SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" + +do_install () { + # with ccache the timestamps on compiled files may + # end up earlier than on their inputs, this allows + # for the resultant compilation in the install step. + oe_runmake 'CC=${CC}' 'LD=${LD}' \ + 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install + + mkdir -p ${D}${base_bindir} + + sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" + sbinprogs_a="pivot_root hwclock mkswap losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" + binprogs_a="dmesg getopt kill more umount mount login su mountpoint" + + if [ "${base_sbindir}" != "${sbindir}" ]; then + mkdir -p ${D}${base_sbindir} + for p in $sbinprogs $sbinprogs_a; do + if [ -f "${D}${sbindir}/$p" ]; then + mv "${D}${sbindir}/$p" "${D}${base_sbindir}/$p" + fi + done + fi + + if [ "${base_bindir}" != "${bindir}" ]; then + mkdir -p ${D}${base_bindir} + for p in $binprogs_a; do + if [ -f "${D}${bindir}/$p" ]; then + mv "${D}${bindir}/$p" "${D}${base_bindir}/$p" + fi + done + fi + + install -d ${D}${sysconfdir}/default/ + echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall + + rm -f ${D}${bindir}/chkdupexe +} + +do_install_append_class-target () { + if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then + install -d ${D}${sysconfdir}/pam.d + install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser + install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l + # Required for "su -" aka "su --login" because + # otherwise it uses "other", which has "auth pam_deny.so" + # and thus prevents the operation. + ln -s su ${D}${sysconfdir}/pam.d/su-l + fi +} +# nologin causes a conflict with shadow-native +# kill causes a conflict with coreutils-native (if ${bindir}==${base_bindir}) +do_install_append_class-native () { + rm -f ${D}${base_sbindir}/nologin + rm -f ${D}${base_bindir}/kill +} + +ALTERNATIVE_PRIORITY = "80" + +ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" +ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" +ALTERNATIVE_LINK_NAME[cal] = "${bindir}/cal" +ALTERNATIVE_LINK_NAME[chrt] = "${bindir}/chrt" +ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" +ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" +ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" +ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" +ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock" +ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" +ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" +ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" +ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" +ALTERNATIVE_${PN}-agetty = "getty" +ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" +ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" +ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" +ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" +ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" +ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" +ALTERNATIVE_${PN}-last = "last lastb" +ALTERNATIVE_LINK_NAME[last] = "${bindir}/last" +ALTERNATIVE_LINK_NAME[lastb] = "${bindir}/lastb" +ALTERNATIVE_LINK_NAME[logger] = "${bindir}/logger" +ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" +ALTERNATIVE_LINK_NAME[mesg] = "${bindir}/mesg" +ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" +ALTERNATIVE_LINK_NAME[mcookie] = "${bindir}/mcookie" +ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" +ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" +ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" +ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" +ALTERNATIVE_LINK_NAME[nsenter] = "${bindir}/nsenter" +ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" +ALTERNATIVE_LINK_NAME[prlimit] = "${bindir}/prlimit" +ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" +ALTERNATIVE_LINK_NAME[renice] = "${bindir}/renice" +ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" +ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" +ALTERNATIVE_LINK_NAME[rtcwake] = "${sbindir}/rtcwake" +ALTERNATIVE_LINK_NAME[setpriv] = "${bindir}/setpriv" +ALTERNATIVE_LINK_NAME[setsid] = "${bindir}/setsid" +ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" +ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" +ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" +ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" +ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" +ALTERNATIVE_LINK_NAME[taskset] = "${bindir}/taskset" +ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" +ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" +ALTERNATIVE_LINK_NAME[utmpdump] = "${bindir}/utmpdump" +ALTERNATIVE_LINK_NAME[uuidgen] = "${bindir}/uuidgen" +ALTERNATIVE_LINK_NAME[wall] = "${bindir}/wall" + +ALTERNATIVE_${PN}-doc = "\ +blkid.8 eject.1 findfs.8 fsck.8 kill.1 last.1 lastb.1 libblkid.3 logger.1 mesg.1 \ +mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1\ +" +ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" + +ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" +ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" +ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" +ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" +ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" +ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" +ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" +ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" +ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" +ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" +ALTERNATIVE_LINK_NAME[setpriv.1] = "${mandir}/man1/setpriv.1" +ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" +ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" + + +BBCLASSEXTEND = "native nativesdk" + +PTEST_BINDIR = "1" +do_compile_ptest() { + oe_runmake buildtest-TESTS +} + +do_install_ptest() { + mkdir -p ${D}${PTEST_PATH}/tests/ts + find . -name 'test*' -maxdepth 1 -type f -perm -111 -exec cp {} ${D}${PTEST_PATH} \; + find ./.libs -name 'sample*' -maxdepth 1 -type f -perm -111 -exec cp {} ${D}${PTEST_PATH} \; + find ./.libs -name 'test*' -maxdepth 1 -type f -perm -111 -exec cp {} ${D}${PTEST_PATH} \; + + cp ${S}/tests/*.sh ${D}${PTEST_PATH}/tests/ + cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected + cp -pR ${S}/tests/ts ${D}${PTEST_PATH}/tests/ + cp ${WORKDIR}/build/config.h ${D}${PTEST_PATH} + + # The original paths of executables to be tested point to a local folder containing + # the executables. We want to test the installed executables, not the local copies. + # So strip the paths, the executables will be located via "which" + sed -i \ + -e '/^TS_CMD/ s|$top_builddir/||g' \ + -e '/^TS_HELPER/ s|$top_builddir|${PTEST_PATH}|g' \ + ${D}${PTEST_PATH}/tests/commands.sh + + # Change 'if [ ! -x "$1" ]' to 'if [ ! -x "`which $1 2>/dev/null`"]' + sed -i -e \ + '/^\tif[[:space:]]\[[[:space:]]![[:space:]]-x[[:space:]]"$1"/s|$1|`which $1 2>/dev/null`|g' \ + ${D}${PTEST_PATH}/tests/functions.sh + + # Running "kill" without the the complete path would use the shell's built-in kill + sed -i -e \ + '/^TS_CMD_KILL/ s|kill|${PTEST_PATH}/bin/kill|g' \ + ${D}${PTEST_PATH}/tests/commands.sh + + + sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest + +} diff --git a/poky/meta/recipes-core/util-linux/util-linux_2.36.bb b/poky/meta/recipes-core/util-linux/util-linux_2.36.bb deleted file mode 100644 index 474f1e188..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux_2.36.bb +++ /dev/null @@ -1,359 +0,0 @@ -SUMMARY = "A suite of basic system administration utilities" -HOMEPAGE = "https://en.wikipedia.org/wiki/Util-linux" -DESCRIPTION = "Util-linux includes a suite of basic system administration utilities \ -commonly found on most Linux systems. Some of the more important utilities include \ -disk partitioning, kernel message management, filesystem creation, and system login." - -SECTION = "base" - -LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LICENSE_${PN}-libblkid = "LGPLv2.1+" -LICENSE_${PN}-libfdisk = "LGPLv2.1+" -LICENSE_${PN}-libmount = "LGPLv2.1+" -LICENSE_${PN}-libsmartcols = "LGPLv2.1+" -LICENSE_${PN}-libuuid = "BSD-3-Clause" - -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 \ - file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \ - file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \ - file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \ - file://libmount/COPYING;md5=7c7e39fb7d70ffe5d693a643e29987c2 \ - file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ - file://libfdisk/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ - file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ -" - -#gtk-doc is not enabled as it requires xmlto which requires util-linux -inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest -DEPENDS = "libcap-ng ncurses virtual/crypt zlib" - -MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \ - 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 \ - " -SRC_URI[sha256sum] = "9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1" - -PACKAGES =+ "${PN}-swaponoff" -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}" - -python util_linux_binpackages () { - def pkg_hook(f, pkg, file_regex, output_pattern, modulename): - pn = d.getVar('PN') - d.appendVar('RRECOMMENDS_%s' % pn, ' %s' % pkg) - - if d.getVar('ALTERNATIVE_' + pkg): - return - if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): - d.setVar('ALTERNATIVE_' + pkg, modulename) - - bindirs = sorted(list(set(d.expand("${base_sbindir} ${base_bindir} ${sbindir} ${bindir}").split()))) - for dir in bindirs: - do_split_packages(d, root=dir, - file_regex=r'(.*)', output_pattern='${PN}-%s', - description='${PN} %s', - hook=pkg_hook, extra_depends='') - - # There are some symlinks for some binaries which we have ignored - # above. Add them to the package owning the binary they are - # pointing to - extras = {} - dvar = d.getVar('PKGD') - for root in bindirs: - for walkroot, dirs, files in os.walk(dvar + root): - for f in files: - file = os.path.join(walkroot, f) - if not os.path.islink(file): - continue - - pkg = os.path.basename(os.readlink(file)) - extras[pkg] = extras.get(pkg, '') + ' ' + file.replace(dvar, '', 1) - - pn = d.getVar('PN') - for pkg, links in extras.items(): - of = d.getVar('FILES_' + pn + '-' + pkg) - links = of + links - d.setVar('FILES_' + pn + '-' + pkg, links) -} - -# we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS -PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages " - -python util_linux_libpackages() { - do_split_packages(d, root=d.getVar('UTIL_LINUX_LIBDIR'), file_regex=r'^lib(.*)\.so\..*$', - output_pattern='${PN}-lib%s', - description='${PN} lib%s', - extra_depends='', prepend=True, allow_links=True) -} - -PACKAGESPLITFUNCS =+ "util_linux_libpackages" - -PACKAGES_DYNAMIC = "^${PN}-.*" - -CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" -UTIL_LINUX_LIBDIR = "${libdir}" -UTIL_LINUX_LIBDIR_class-target = "${base_libdir}" -EXTRA_OECONF = "\ - --enable-libuuid --enable-libblkid \ - \ - --enable-fsck --enable-kill --enable-last --enable-mesg \ - --enable-mount --enable-partx --enable-raw --enable-rfkill \ - --enable-unshare --enable-write \ - \ - --disable-bfs --disable-chfn-chsh --disable-login \ - --disable-makeinstall-chown --disable-minix --disable-newgrp \ - --disable-use-tty-group --disable-vipw \ - \ - --without-udev \ - \ - usrsbin_execdir='${sbindir}' \ - --libdir='${UTIL_LINUX_LIBDIR}' \ -" - -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 -# build host versions during development -# -PACKAGECONFIG ?= "pcre2" -PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -# inherit manpages requires this to be present, however util-linux does not have -# configuration options, and installs manpages always -PACKAGECONFIG[manpages] = "" -PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," -# Respect the systemd feature for uuidd -PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" -# Build python bindings for libmount -PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-python --disable-pylibmount,python3" -# Readline support -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" -# PCRE support in hardlink -PACKAGECONFIG[pcre2] = ",,libpcre2" - -EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" - -ALLOW_EMPTY_${PN} = "1" -FILES_${PN} = "" -FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" -FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_${PN}-mount = "${sysconfdir}/default/mountall" -FILES_${PN}-runuser = "${sysconfdir}/pam.d/runuser*" -FILES_${PN}-su = "${sysconfdir}/pam.d/su-l" -CONFFILES_${PN}-su = "${sysconfdir}/pam.d/su-l" -FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ - ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ - ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" - -# Util-linux' blkid replaces the e2fsprogs one -RCONFLICTS_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" -RREPLACES_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" - -RRECOMMENDS_${PN}_class-native = "" -RRECOMMENDS_${PN}_class-nativesdk = "" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}_class-nativesdk = "" - -RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev ${PN}-libuuid-dev" - -RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" -RDEPENDS_${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs grep iproute2 kmod mdadm procps sed socat which xz" -RRECOMMENDS_${PN}-ptest += "kernel-module-scsi-debug" -RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" -ALLOW_EMPTY_${PN}-swaponoff = "1" - -#SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" -SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" -SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" -SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" -SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" - -do_install () { - # with ccache the timestamps on compiled files may - # end up earlier than on their inputs, this allows - # for the resultant compilation in the install step. - oe_runmake 'CC=${CC}' 'LD=${LD}' \ - 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install - - mkdir -p ${D}${base_bindir} - - sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" - sbinprogs_a="pivot_root hwclock mkswap losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" - binprogs_a="dmesg getopt kill more umount mount login su mountpoint" - - if [ "${base_sbindir}" != "${sbindir}" ]; then - mkdir -p ${D}${base_sbindir} - for p in $sbinprogs $sbinprogs_a; do - if [ -f "${D}${sbindir}/$p" ]; then - mv "${D}${sbindir}/$p" "${D}${base_sbindir}/$p" - fi - done - fi - - if [ "${base_bindir}" != "${bindir}" ]; then - mkdir -p ${D}${base_bindir} - for p in $binprogs_a; do - if [ -f "${D}${bindir}/$p" ]; then - mv "${D}${bindir}/$p" "${D}${base_bindir}/$p" - fi - done - fi - - install -d ${D}${sysconfdir}/default/ - echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall - - rm -f ${D}${bindir}/chkdupexe -} - -do_install_append_class-target () { - if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then - install -d ${D}${sysconfdir}/pam.d - install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser - install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l - # Required for "su -" aka "su --login" because - # otherwise it uses "other", which has "auth pam_deny.so" - # and thus prevents the operation. - ln -s su ${D}${sysconfdir}/pam.d/su-l - fi -} -# nologin causes a conflict with shadow-native -# kill causes a conflict with coreutils-native (if ${bindir}==${base_bindir}) -do_install_append_class-native () { - rm -f ${D}${base_sbindir}/nologin - rm -f ${D}${base_bindir}/kill -} - -ALTERNATIVE_PRIORITY = "80" - -ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" -ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" -ALTERNATIVE_LINK_NAME[cal] = "${bindir}/cal" -ALTERNATIVE_LINK_NAME[chrt] = "${bindir}/chrt" -ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" -ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" -ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" -ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" -ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock" -ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" -ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" -ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" -ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -ALTERNATIVE_${PN}-agetty = "getty" -ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" -ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" -ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" -ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" -ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" -ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" -ALTERNATIVE_${PN}-last = "last lastb" -ALTERNATIVE_LINK_NAME[last] = "${bindir}/last" -ALTERNATIVE_LINK_NAME[lastb] = "${bindir}/lastb" -ALTERNATIVE_LINK_NAME[logger] = "${bindir}/logger" -ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" -ALTERNATIVE_LINK_NAME[mesg] = "${bindir}/mesg" -ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" -ALTERNATIVE_LINK_NAME[mcookie] = "${bindir}/mcookie" -ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" -ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" -ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" -ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" -ALTERNATIVE_LINK_NAME[nsenter] = "${bindir}/nsenter" -ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" -ALTERNATIVE_LINK_NAME[prlimit] = "${bindir}/prlimit" -ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" -ALTERNATIVE_LINK_NAME[renice] = "${bindir}/renice" -ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" -ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" -ALTERNATIVE_LINK_NAME[rtcwake] = "${sbindir}/rtcwake" -ALTERNATIVE_LINK_NAME[setpriv] = "${bindir}/setpriv" -ALTERNATIVE_LINK_NAME[setsid] = "${bindir}/setsid" -ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" -ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" -ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" -ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" -ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" -ALTERNATIVE_LINK_NAME[taskset] = "${bindir}/taskset" -ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" -ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" -ALTERNATIVE_LINK_NAME[utmpdump] = "${bindir}/utmpdump" -ALTERNATIVE_LINK_NAME[uuidgen] = "${bindir}/uuidgen" -ALTERNATIVE_LINK_NAME[wall] = "${bindir}/wall" - -ALTERNATIVE_${PN}-doc = "\ -blkid.8 eject.1 findfs.8 fsck.8 kill.1 last.1 lastb.1 libblkid.3 logger.1 mesg.1 \ -mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1\ -" -ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" - -ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" -ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" -ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" -ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" -ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" -ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" -ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" -ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" -ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" -ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" -ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" -ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" -ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" -ALTERNATIVE_LINK_NAME[setpriv.1] = "${mandir}/man1/setpriv.1" -ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" -ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" -ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" -ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" -ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" - - -BBCLASSEXTEND = "native nativesdk" - -PTEST_BINDIR = "1" -do_compile_ptest() { - oe_runmake buildtest-TESTS -} - -do_install_ptest() { - mkdir -p ${D}${PTEST_PATH}/tests/ts - find . -name 'test*' -maxdepth 1 -type f -perm -111 -exec cp {} ${D}${PTEST_PATH} \; - find ./.libs -name 'sample*' -maxdepth 1 -type f -perm -111 -exec cp {} ${D}${PTEST_PATH} \; - find ./.libs -name 'test*' -maxdepth 1 -type f -perm -111 -exec cp {} ${D}${PTEST_PATH} \; - - cp ${S}/tests/*.sh ${D}${PTEST_PATH}/tests/ - cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected - cp -pR ${S}/tests/ts ${D}${PTEST_PATH}/tests/ - cp ${WORKDIR}/build/config.h ${D}${PTEST_PATH} - - # The original paths of executables to be tested point to a local folder containing - # the executables. We want to test the installed executables, not the local copies. - # So strip the paths, the executables will be located via "which" - sed -i \ - -e '/^TS_CMD/ s|$top_builddir/||g' \ - -e '/^TS_HELPER/ s|$top_builddir|${PTEST_PATH}|g' \ - ${D}${PTEST_PATH}/tests/commands.sh - - # Change 'if [ ! -x "$1" ]' to 'if [ ! -x "`which $1 2>/dev/null`"]' - sed -i -e \ - '/^\tif[[:space:]]\[[[:space:]]![[:space:]]-x[[:space:]]"$1"/s|$1|`which $1 2>/dev/null`|g' \ - ${D}${PTEST_PATH}/tests/functions.sh - - # Running "kill" without the the complete path would use the shell's built-in kill - sed -i -e \ - '/^TS_CMD_KILL/ s|kill|${PTEST_PATH}/bin/kill|g' \ - ${D}${PTEST_PATH}/tests/commands.sh - - - sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest - -} diff --git a/poky/meta/recipes-devtools/binutils/binutils_2.35.bb b/poky/meta/recipes-devtools/binutils/binutils_2.35.bb index 2e645e1ed..976e49765 100644 --- a/poky/meta/recipes-devtools/binutils/binutils_2.35.bb +++ b/poky/meta/recipes-devtools/binutils/binutils_2.35.bb @@ -52,9 +52,11 @@ do_install_class-native () { rmdir ${D}/${libdir}64 || : } -# Split out libbfd-*.so so including perf doesn't include extra stuff -PACKAGE_BEFORE_PN += "libbfd" +# Split out libbfd-*.so and libopcodes-*.so so including perf doesn't include +# extra stuff +PACKAGE_BEFORE_PN += "libbfd libopcodes" FILES_libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" +FILES_libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so" SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " diff --git a/poky/meta/recipes-devtools/ccache/ccache/0001-Improve-SIMD-detection-735.patch b/poky/meta/recipes-devtools/ccache/ccache/0001-Improve-SIMD-detection-735.patch new file mode 100644 index 000000000..12d4ebc4b --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/ccache/0001-Improve-SIMD-detection-735.patch @@ -0,0 +1,121 @@ +From 05d290165a3b61da09b715e6c8e62cebebab57cc Mon Sep 17 00:00:00 2001 +From: Erik Flodin +Date: Mon, 7 Dec 2020 19:20:31 +0100 +Subject: [PATCH 1/2] Improve SIMD detection (#735) + +* Try to compile code to detect SSE/AVX support. Just checking if the compiler + supports the flag isn't enough as e.g. Clang on Apple's new ARM silicon seems + to accept the flag but then fails when building. +* Try to detect and enable BLAKE3's Neon support. +* Improve detection of AVX2 target attribute support and remove the explicit + compiler version check that hopefully shouldn't be needed. + +Fixes #734. +Upstream-Status: Backport [https://github.com/ccache/ccache/commit/b438f50388dd00285083260f60450e6237b7d58f] +Signed-off-by: Khem Raj +--- + cmake/GenerateConfigurationFile.cmake | 25 +++++++++--------- + src/third_party/blake3/CMakeLists.txt | 38 ++++++++++++++++++++------- + 2 files changed, 42 insertions(+), 21 deletions(-) + +diff --git a/cmake/GenerateConfigurationFile.cmake b/cmake/GenerateConfigurationFile.cmake +index a21861f4..836ff9bb 100644 +--- a/cmake/GenerateConfigurationFile.cmake ++++ b/cmake/GenerateConfigurationFile.cmake +@@ -67,18 +67,19 @@ check_struct_has_member("struct stat" st_mtim sys/stat.h + check_struct_has_member("struct statfs" f_fstypename sys/mount.h + HAVE_STRUCT_STATFS_F_FSTYPENAME) + +-include(CheckCXXCompilerFlag) +- +-# Old GCC versions don't have the required header support. +-# Old Apple Clang versions seem to support -mavx2 but not the target +-# attribute that's used to enable AVX2 for a certain function. +-if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) +- OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)) +- message(STATUS "Detected unsupported compiler for HAVE_AVX2 - disabled") +- set(HAVE_AVX2 FALSE) +-else() +- check_cxx_compiler_flag(-mavx2 HAVE_AVX2) +-endif() ++include(CheckCXXSourceCompiles) ++check_cxx_source_compiles( ++ [=[ ++ #include ++ void func() __attribute__((target("avx2"))); ++ void func() { _mm256_abs_epi8(_mm256_set1_epi32(42)); } ++ int main() ++ { ++ func(); ++ return 0; ++ } ++ ]=] ++ HAVE_AVX2) + + list(APPEND CMAKE_REQUIRED_LIBRARIES ws2_32) + list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES ws2_32) +diff --git a/src/third_party/blake3/CMakeLists.txt b/src/third_party/blake3/CMakeLists.txt +index a75e5611..cc24253c 100644 +--- a/src/third_party/blake3/CMakeLists.txt ++++ b/src/third_party/blake3/CMakeLists.txt +@@ -13,9 +13,9 @@ else() + endif() + + include(CheckAsmCompilerFlag) +-include(CheckCCompilerFlag) ++include(CheckCSourceCompiles) + +-function(add_source_if_enabled feature compile_flags) ++function(add_source_if_enabled feature compile_flags intrinsic) + string(TOUPPER "have_${blake_source_type}_${feature}" have_feature) + + # AVX512 support fails to compile with old Apple Clang versions even though +@@ -28,7 +28,14 @@ function(add_source_if_enabled feature compile_flags) + elseif(${blake_source_type} STREQUAL "asm") + check_asm_compiler_flag(${compile_flags} ${have_feature}) + else() +- check_c_compiler_flag(${compile_flags} ${have_feature}) ++ set(CMAKE_REQUIRED_FLAGS ${compile_flags}) ++ check_c_source_compiles( ++ [=[ ++ #include ++ int main() { ${intrinsic}; return 0; } ++ ]=] ++ ${have_feature}) ++ unset(CMAKE_REQUIRED_FLAGS) + endif() + + if(${have_feature}) +@@ -42,10 +49,23 @@ function(add_source_if_enabled feature compile_flags) + endif() + endfunction() + +-add_source_if_enabled(sse2 "-msse2") +-add_source_if_enabled(sse41 "-msse4.1") +-add_source_if_enabled(avx2 "-mavx2") +-add_source_if_enabled(avx512 "-mavx512f -mavx512vl") ++# https://software.intel.com/sites/landingpage/IntrinsicsGuide/ ++add_source_if_enabled(sse2 "-msse2" "_mm_set1_epi32(42)") ++add_source_if_enabled(sse41 "-msse4.1" "_mm_test_all_ones(_mm_set1_epi32(42))") ++add_source_if_enabled(avx2 "-mavx2" "_mm256_abs_epi8(_mm256_set1_epi32(42))") ++add_source_if_enabled(avx512 "-mavx512f -mavx512vl" "_mm256_abs_epi64(_mm256_set1_epi32(42))") + +-# TODO: how to detect ARM NEON support? +-# If NEON, define BLAKE3_USE_NEON and build blake3_neon.c ++# Neon is always available on AArch64 ++if(CMAKE_SIZEOF_VOID_P EQUAL 8) ++ # https://developer.arm.com/architectures/instruction-sets/simd-isas/neon/intrinsics ++ check_c_source_compiles( ++ [=[ ++ #include ++ int main() { vdupq_n_s32(42); return 0; } ++ ]=] ++ HAVE_NEON) ++ if(HAVE_NEON) ++ target_sources(blake3 PRIVATE blake3_neon.c) ++ target_compile_definitions(blake3 PRIVATE BLAKE3_USE_NEON) ++ endif() ++endif() +-- +2.30.0 + diff --git a/poky/meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch b/poky/meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch new file mode 100644 index 000000000..bdabb381a --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch @@ -0,0 +1,35 @@ +From 0448eddcf2863ebf911e7dd445bca1c7eee2a239 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 5 Jan 2021 13:55:34 -0800 +Subject: [PATCH] blake3: Remove asm checks for sse/avx + +This ends up passing on clang/linux wrongly when building for aarch64 +the check in else part is good to detect the feature support and this +check can be removed, it was setting + +HAVE_ASM_AVX* and HAVE_ASM_SSE* macros which are not used in the build +anyway + +Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/768] + +Signed-off-by: Khem Raj +--- + src/third_party/blake3/CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/third_party/blake3/CMakeLists.txt b/src/third_party/blake3/CMakeLists.txt +index cc24253c..856b5721 100644 +--- a/src/third_party/blake3/CMakeLists.txt ++++ b/src/third_party/blake3/CMakeLists.txt +@@ -25,8 +25,6 @@ function(add_source_if_enabled feature compile_flags intrinsic) + AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) + message(STATUS "Detected unsupported compiler for ${have_feature} - disabled") + set(${have_feature} FALSE) +- elseif(${blake_source_type} STREQUAL "asm") +- check_asm_compiler_flag(${compile_flags} ${have_feature}) + else() + set(CMAKE_REQUIRED_FLAGS ${compile_flags}) + check_c_source_compiles( +-- +2.30.0 + diff --git a/poky/meta/recipes-devtools/ccache/ccache/0002-Always-use-64bit-to-print-time_t.patch b/poky/meta/recipes-devtools/ccache/ccache/0002-Always-use-64bit-to-print-time_t.patch new file mode 100644 index 000000000..85ce2b762 --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/ccache/0002-Always-use-64bit-to-print-time_t.patch @@ -0,0 +1,33 @@ +From fa360ca8a457dafcae1d22df2b342d3ee291e8af Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 Dec 2020 14:28:39 -0800 +Subject: [PATCH 2/2] Always use 64bit to print time_t + +some 32bit architectures e.g. RISCV32 use 64bit time_t from beginning +which does not fit into long int size on LP32 systems + +Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/762] +Signed-off-by: Khem Raj +--- + src/Logging.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/Logging.cpp b/src/Logging.cpp +index 9a5d99b7..1a6e6264 100644 +--- a/src/Logging.cpp ++++ b/src/Logging.cpp +@@ -88,7 +88,10 @@ do_log(string_view message, bool bulk) + if (tm) { + strftime(timestamp, sizeof(timestamp), "%Y-%m-%dT%H:%M:%S", &*tm); + } else { +- snprintf(timestamp, sizeof(timestamp), "%lu", tv.tv_sec); ++ snprintf(timestamp, ++ sizeof(timestamp), ++ "%llu", ++ (long long unsigned int)tv.tv_sec); + } + snprintf(prefix, + sizeof(prefix), +-- +2.30.0 + diff --git a/poky/meta/recipes-devtools/ccache/ccache_3.7.11.bb b/poky/meta/recipes-devtools/ccache/ccache_3.7.11.bb deleted file mode 100644 index fd004f4c9..000000000 --- a/poky/meta/recipes-devtools/ccache/ccache_3.7.11.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "a fast C/C++ compiler cache" -DESCRIPTION = "ccache is a compiler cache. It speeds up recompilation \ -by caching the result of previous compilations and detecting when the \ -same compilation is being done again. Supported languages are C, C\+\+, \ -Objective-C and Objective-C++." -HOMEPAGE = "http://ccache.samba.org" -SECTION = "devel" - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=22d514dbc01fdf9a9784334b6b59417a" - -DEPENDS = "zlib" - -SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[sha256sum] = "34309a59d4b6b6b33756366aa9d3144a4655587be9f914476b4c0e2d36365f01" - -UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" - -inherit autotools - -# Remove ccache-native's dependencies, so that it can be used widely by -# other native recipes. -DEPENDS_class-native = "" -EXTRA_OECONF_class-native = "--with-bundled-zlib" -INHIBIT_AUTOTOOLS_DEPS_class-native = "1" -PATCHTOOL = "patch" - -BBCLASSEXTEND = "native" - -do_configure_class-native() { - oe_runconf -} diff --git a/poky/meta/recipes-devtools/ccache/ccache_4.1.bb b/poky/meta/recipes-devtools/ccache/ccache_4.1.bb new file mode 100644 index 000000000..6bd46b101 --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/ccache_4.1.bb @@ -0,0 +1,27 @@ +SUMMARY = "a fast C/C++ compiler cache" +DESCRIPTION = "ccache is a compiler cache. It speeds up recompilation \ +by caching the result of previous compilations and detecting when the \ +same compilation is being done again. Supported languages are C, C\+\+, \ +Objective-C and Objective-C++." +HOMEPAGE = "http://ccache.samba.org" +SECTION = "devel" + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=a66c581f855c1c408730fe5d171e3013" + +DEPENDS = "zstd" + +SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz \ + file://0001-Improve-SIMD-detection-735.patch \ + file://0002-Always-use-64bit-to-print-time_t.patch \ + file://0001-blake3-Remove-asm-checks-for-sse-avx.patch \ + " +SRC_URI[sha256sum] = "cdeefb827b3eef3b42b5454858123881a4a90abbd46cc72cf8c20b3bd039deb7" + +UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" + +inherit cmake + +PATCHTOOL = "patch" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/cmake/cmake-native_3.18.4.bb b/poky/meta/recipes-devtools/cmake/cmake-native_3.18.4.bb deleted file mode 100644 index d91e42ef9..000000000 --- a/poky/meta/recipes-devtools/cmake/cmake-native_3.18.4.bb +++ /dev/null @@ -1,53 +0,0 @@ -require cmake.inc -inherit native - -DEPENDS += "bzip2-replacement-native xz-native zlib-native curl-native ncurses-native" - -SRC_URI += "file://OEToolchainConfig.cmake \ - file://environment.d-cmake.sh \ - file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ - file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \ - " - - -B = "${WORKDIR}/build" -do_configure[cleandirs] = "${B}" - -CMAKE_EXTRACONF = "\ - -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ - -DBUILD_CursesDialog=1 \ - -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \ - -DCMAKE_USE_SYSTEM_LIBRARY_EXPAT=0 \ - -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ - -DHAVE_SYS_ACL_H=0 \ -" - -do_configure () { - ${S}/configure --verbose --prefix=${prefix} \ - ${@oe.utils.parallel_make_argument(d, '--parallel=%d')} \ - ${@bb.utils.contains('CCACHE', 'ccache ', '--enable-ccache', '', d)} \ - -- ${CMAKE_EXTRACONF} -} - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install - - # The following codes are here because eSDK needs to provide compatibilty - # for SDK. That is, eSDK could also be used like traditional SDK. - mkdir -p ${D}${datadir}/cmake - install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ - mkdir -p ${D}${base_prefix}/environment-setup.d - install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${base_prefix}/environment-setup.d/cmake.sh -} - -do_compile[progress] = "percent" - -SYSROOT_DIRS_NATIVE += "${datadir}/cmake ${base_prefix}/environment-setup.d" diff --git a/poky/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb b/poky/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb new file mode 100644 index 000000000..d91e42ef9 --- /dev/null +++ b/poky/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb @@ -0,0 +1,53 @@ +require cmake.inc +inherit native + +DEPENDS += "bzip2-replacement-native xz-native zlib-native curl-native ncurses-native" + +SRC_URI += "file://OEToolchainConfig.cmake \ + file://environment.d-cmake.sh \ + file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ + file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \ + " + + +B = "${WORKDIR}/build" +do_configure[cleandirs] = "${B}" + +CMAKE_EXTRACONF = "\ + -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ + -DBUILD_CursesDialog=1 \ + -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \ + -DCMAKE_USE_SYSTEM_LIBRARY_EXPAT=0 \ + -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ + -DHAVE_SYS_ACL_H=0 \ +" + +do_configure () { + ${S}/configure --verbose --prefix=${prefix} \ + ${@oe.utils.parallel_make_argument(d, '--parallel=%d')} \ + ${@bb.utils.contains('CCACHE', 'ccache ', '--enable-ccache', '', d)} \ + -- ${CMAKE_EXTRACONF} +} + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + + # The following codes are here because eSDK needs to provide compatibilty + # for SDK. That is, eSDK could also be used like traditional SDK. + mkdir -p ${D}${datadir}/cmake + install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ + mkdir -p ${D}${base_prefix}/environment-setup.d + install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${base_prefix}/environment-setup.d/cmake.sh +} + +do_compile[progress] = "percent" + +SYSROOT_DIRS_NATIVE += "${datadir}/cmake ${base_prefix}/environment-setup.d" diff --git a/poky/meta/recipes-devtools/cmake/cmake.inc b/poky/meta/recipes-devtools/cmake/cmake.inc index e840e884c..db03819b6 100644 --- a/poky/meta/recipes-devtools/cmake/cmake.inc +++ b/poky/meta/recipes-devtools/cmake/cmake.inc @@ -11,7 +11,7 @@ BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://Copyright.txt;md5=c721f56fce89ba2eadc2fdd8ba1f4d83 \ - file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14 \ + file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ " CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" @@ -20,9 +20,10 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0002-cmake-Prevent-the-detection-of-Qt5.patch \ file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ + file://0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch \ " -SRC_URI[sha256sum] = "597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77" +SRC_URI[sha256sum] = "e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch b/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch index c4f81b27b..818151032 100644 --- a/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch +++ b/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch @@ -1,4 +1,4 @@ -From dd0fe8d54def4684d360b3e9b10e963ef0208202 Mon Sep 17 00:00:00 2001 +From 66d5b27dc37ef6243f6549e16d0285ba6c064a6e Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Thu, 27 Apr 2017 11:35:05 -0400 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default @@ -25,10 +25,10 @@ Signed-off-by: Otavio Salvador 1 file changed, 7 insertions(+) diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake -index f3ec4da..bb05656 100644 +index bae270d..5bb6bc0 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake -@@ -81,6 +81,13 @@ else() +@@ -111,6 +111,13 @@ else() endif() endif() diff --git a/poky/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch b/poky/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch new file mode 100644 index 000000000..4483bbce1 --- /dev/null +++ b/poky/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch @@ -0,0 +1,26 @@ +From ca105727dc4862733c3aad09e9de819be63a7b6b Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 27 Dec 2020 23:18:10 +0100 +Subject: [PATCH] cm_cxx_features.cmake: do not try to run the test binary + +This causes errors when cross compiling cmake. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + Source/Checks/cm_cxx_features.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake +index 663d89a..e8dca3b 100644 +--- a/Source/Checks/cm_cxx_features.cmake ++++ b/Source/Checks/cm_cxx_features.cmake +@@ -81,7 +81,7 @@ if(CMake_HAVE_CXX_MAKE_UNIQUE) + endif() + cm_check_cxx_feature(unique_ptr) + if (NOT CMAKE_CXX_STANDARD LESS "17") +- cm_check_cxx_feature(filesystem TRY_RUN) ++ cm_check_cxx_feature(filesystem) + else() + set(CMake_HAVE_CXX_FILESYSTEM FALSE) + endif() diff --git a/poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch b/poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch index 162bfe578..33db07ccf 100644 --- a/poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch +++ b/poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch @@ -1,4 +1,4 @@ -From 106cf5134d22db889e4ddf2f98ec302d5f4b9ca7 Mon Sep 17 00:00:00 2001 +From 98abade8cc119e076e4c5f1461c5188f6d49c1d8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 17 Jan 2018 10:02:14 -0200 Subject: [PATCH] cmake: Prevent the detection of Qt5 @@ -25,23 +25,23 @@ Signed-off-by: Otavio Salvador 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt -index 98dd0e2..252302b 100644 +index 452a303..d0a9fb4 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -3,7 +3,7 @@ project(QtDialog) CMake_OPTIONAL_COMPONENT(cmake-gui) --find_package(Qt5Widgets QUIET) -+#find_package(Qt5Widgets QUIET) - if (Qt5Widgets_FOUND) - include_directories(${Qt5Widgets_INCLUDE_DIRS}) - add_definitions(${Qt5Widgets_DEFINITONS}) +-find_package(Qt5Widgets REQUIRED) ++#find_package(Qt5Widgets REQUIRED) + + set(CMake_QT_EXTRA_LIBRARIES) + diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt -index db6dbf3..5b26879 100644 +index 1fb47cb..e022229 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt -@@ -215,7 +215,7 @@ if(BUILD_TESTING) +@@ -251,7 +251,7 @@ if(BUILD_TESTING) set(CMake_TEST_Qt5 1) endif() if(CMake_TEST_Qt5) @@ -96,10 +96,10 @@ index c08efc4..87e25d9 100644 set(CMAKE_CXX_STANDARD 11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt -index 10e66c3..ecc4eeb 100644 +index 370dd76..6bacbff 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt -@@ -440,7 +440,7 @@ if(NOT WIN32) +@@ -473,7 +473,7 @@ if(NOT WIN32) endif () find_package(Qt4 QUIET) diff --git a/poky/meta/recipes-devtools/cmake/cmake_3.18.4.bb b/poky/meta/recipes-devtools/cmake/cmake_3.18.4.bb deleted file mode 100644 index 64c92b89f..000000000 --- a/poky/meta/recipes-devtools/cmake/cmake_3.18.4.bb +++ /dev/null @@ -1,53 +0,0 @@ -require cmake.inc - -inherit cmake bash-completion - -DEPENDS += "curl expat zlib libarchive xz ncurses bzip2" - -SRC_URI_append_class-nativesdk = " \ - file://OEToolchainConfig.cmake \ - file://environment.d-cmake.sh \ - file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ -" - -# Strip ${prefix} from ${docdir}, set result into docdir_stripped -python () { - prefix=d.getVar("prefix") - docdir=d.getVar("docdir") - - if not docdir.startswith(prefix): - bb.fatal('docdir must contain prefix as its prefix') - - docdir_stripped = docdir[len(prefix):] - if len(docdir_stripped) > 0 and docdir_stripped[0] == '/': - docdir_stripped = docdir_stripped[1:] - - d.setVar("docdir_stripped", docdir_stripped) -} - -EXTRA_OECMAKE=" \ - -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \ - -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \ - -DKWSYS_CHAR_IS_SIGNED=1 \ - -DBUILD_CursesDialog=0 \ - -DKWSYS_LFS_WORKS=1 \ -" - -do_install_append_class-nativesdk() { - mkdir -p ${D}${datadir}/cmake - install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ - - mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d - install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh -} - -FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}" - -FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION} ${datadir}/cmake ${datadir}/aclocal ${datadir}/emacs ${datadir}/vim" -FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" -FILES_${PN}-dev = "" - -BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-devtools/cmake/cmake_3.19.2.bb b/poky/meta/recipes-devtools/cmake/cmake_3.19.2.bb new file mode 100644 index 000000000..64c92b89f --- /dev/null +++ b/poky/meta/recipes-devtools/cmake/cmake_3.19.2.bb @@ -0,0 +1,53 @@ +require cmake.inc + +inherit cmake bash-completion + +DEPENDS += "curl expat zlib libarchive xz ncurses bzip2" + +SRC_URI_append_class-nativesdk = " \ + file://OEToolchainConfig.cmake \ + file://environment.d-cmake.sh \ + file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ +" + +# Strip ${prefix} from ${docdir}, set result into docdir_stripped +python () { + prefix=d.getVar("prefix") + docdir=d.getVar("docdir") + + if not docdir.startswith(prefix): + bb.fatal('docdir must contain prefix as its prefix') + + docdir_stripped = docdir[len(prefix):] + if len(docdir_stripped) > 0 and docdir_stripped[0] == '/': + docdir_stripped = docdir_stripped[1:] + + d.setVar("docdir_stripped", docdir_stripped) +} + +EXTRA_OECMAKE=" \ + -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \ + -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \ + -DKWSYS_CHAR_IS_SIGNED=1 \ + -DBUILD_CursesDialog=0 \ + -DKWSYS_LFS_WORKS=1 \ +" + +do_install_append_class-nativesdk() { + mkdir -p ${D}${datadir}/cmake + install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ + + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d + install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh +} + +FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}" + +FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION} ${datadir}/cmake ${datadir}/aclocal ${datadir}/emacs ${datadir}/vim" +FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" +FILES_${PN}-dev = "" + +BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb b/poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb index 61b2ea5dc..863f924b2 100644 --- a/poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb +++ b/poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb @@ -5,7 +5,7 @@ reviewing large, complex patch files." HOMEPAGE = "http://invisible-island.net/diffstat/" SECTION = "devel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5" +LIC_FILES_CHKSUM = "file://COPYING;md5=a3d0bb117493e804b0c1a868ddf23321" SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://run-ptest \ @@ -16,8 +16,6 @@ SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ SRC_URI[md5sum] = "b9272ec8af6257103261ec3622692991" SRC_URI[sha256sum] = "7eddd53401b99b90bac3f7ebf23dd583d7d99c6106e67a4f1161b7a20110dc6f" -S = "${WORKDIR}/diffstat-${PV}" - inherit autotools gettext ptest EXTRA_AUTORECONF += "--exclude=aclocal" diff --git a/poky/meta/recipes-devtools/dnf/dnf_4.4.0.bb b/poky/meta/recipes-devtools/dnf/dnf_4.4.0.bb deleted file mode 100644 index dff6fe6c2..000000000 --- a/poky/meta/recipes-devtools/dnf/dnf_4.4.0.bb +++ /dev/null @@ -1,90 +0,0 @@ -SUMMARY = "Package manager forked from Yum, using libsolv as a dependency resolver" -DESCRIPTION = "Software package manager that installs, updates, and removes \ -packages on RPM-based Linux distributions. It automatically computes \ -dependencies and determines the actions required to install packages." -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://PACKAGE-LICENSING;md5=4a0548e303dbc77f067335b4d688e745 \ - " - -SRC_URI = "git://github.com/rpm-software-management/dnf.git \ - file://0001-Corretly-install-tmpfiles.d-configuration.patch \ - file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \ - file://0005-Do-not-prepend-installroot-to-logdir.patch \ - file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ - file://0030-Run-python-scripts-using-env.patch \ - file://0001-set-python-path-for-completion_helper.patch \ - file://0001-dnf-write-the-log-lock-to-root.patch \ - " - -SRCREV = "b9b7623892f551da201bffd03187d703242b00e9" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit cmake gettext bash-completion distutils3-base systemd - -DEPENDS += "libdnf librepo libcomps python3-iniparse" - -# manpages generation requires http://www.sphinx-doc.org/ -EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS_${PN} += " \ - python3-core \ - python3-codecs \ - python3-netclient \ - python3-email \ - python3-threading \ - python3-distutils \ - python3-logging \ - python3-fcntl \ - librepo \ - python3-shell \ - libcomps \ - libdnf \ - python3-sqlite3 \ - python3-compression \ - python3-rpm \ - python3-iniparse \ - python3-json \ - python3-curses \ - python3-misc \ - python3-gpg \ - " - -RDEPENDS_${PN}_class-native = "" - -RRECOMMENDS_${PN}_class-target += "gnupg" - -# Create a symlink called 'dnf' as 'make install' does not do it, but -# .spec file in dnf source tree does (and then Fedora and dnf documentation -# says that dnf binary is plain 'dnf'). -do_install_append() { - lnr ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf - lnr ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic -} - -# Direct dnf-native to read rpm configuration from our sysroot, not the one it was compiled in -do_install_append_class-native() { - create_wrapper ${D}/${bindir}/dnf \ - RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ - RPM_NO_CHROOT_FOR_SCRIPTS=1 -} - -do_install_append_class-nativesdk() { - create_wrapper ${D}/${bindir}/dnf \ - RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ - RPM_NO_CHROOT_FOR_SCRIPTS=1 -} - -SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ - dnf-automatic.service dnf-automatic.timer \ - dnf-automatic-download.service dnf-automatic-download.timer \ - dnf-automatic-install.service dnf-automatic-install.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/poky/meta/recipes-devtools/dnf/dnf_4.5.2.bb b/poky/meta/recipes-devtools/dnf/dnf_4.5.2.bb new file mode 100644 index 000000000..e1b0e1a13 --- /dev/null +++ b/poky/meta/recipes-devtools/dnf/dnf_4.5.2.bb @@ -0,0 +1,90 @@ +SUMMARY = "Package manager forked from Yum, using libsolv as a dependency resolver" +DESCRIPTION = "Software package manager that installs, updates, and removes \ +packages on RPM-based Linux distributions. It automatically computes \ +dependencies and determines the actions required to install packages." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://PACKAGE-LICENSING;md5=4a0548e303dbc77f067335b4d688e745 \ + " + +SRC_URI = "git://github.com/rpm-software-management/dnf.git \ + file://0001-Corretly-install-tmpfiles.d-configuration.patch \ + file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \ + file://0005-Do-not-prepend-installroot-to-logdir.patch \ + file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ + file://0030-Run-python-scripts-using-env.patch \ + file://0001-set-python-path-for-completion_helper.patch \ + file://0001-dnf-write-the-log-lock-to-root.patch \ + " + +SRCREV = "36a3ffaee4db76a7efe7d40f4e42ce679b6a6920" +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit cmake gettext bash-completion distutils3-base systemd + +DEPENDS += "libdnf librepo libcomps python3-iniparse" + +# manpages generation requires http://www.sphinx-doc.org/ +EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN} += " \ + python3-core \ + python3-codecs \ + python3-netclient \ + python3-email \ + python3-threading \ + python3-distutils \ + python3-logging \ + python3-fcntl \ + librepo \ + python3-shell \ + libcomps \ + libdnf \ + python3-sqlite3 \ + python3-compression \ + python3-rpm \ + python3-iniparse \ + python3-json \ + python3-curses \ + python3-misc \ + python3-gpg \ + " + +RDEPENDS_${PN}_class-native = "" + +RRECOMMENDS_${PN}_class-target += "gnupg" + +# Create a symlink called 'dnf' as 'make install' does not do it, but +# .spec file in dnf source tree does (and then Fedora and dnf documentation +# says that dnf binary is plain 'dnf'). +do_install_append() { + lnr ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf + lnr ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic +} + +# Direct dnf-native to read rpm configuration from our sysroot, not the one it was compiled in +do_install_append_class-native() { + create_wrapper ${D}/${bindir}/dnf \ + RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ + RPM_NO_CHROOT_FOR_SCRIPTS=1 +} + +do_install_append_class-nativesdk() { + create_wrapper ${D}/${bindir}/dnf \ + RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ + RPM_NO_CHROOT_FOR_SCRIPTS=1 +} + +SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ + dnf-automatic.service dnf-automatic.timer \ + dnf-automatic-download.service dnf-automatic-download.timer \ + dnf-automatic-install.service dnf-automatic-install.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/poky/meta/recipes-devtools/gcc/gcc-10.2.inc b/poky/meta/recipes-devtools/gcc/gcc-10.2.inc index e88f2ade6..1e69c9131 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-10.2.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-10.2.inc @@ -69,6 +69,7 @@ SRC_URI = "\ file://0002-aarch64-Introduce-SLS-mitigation-for-RET-and-BR-inst.patch \ file://0003-aarch64-Mitigate-SLS-for-BLR-instruction.patch \ file://0001-aarch64-Fix-up-__aarch64_cas16_acq_rel-fallback.patch \ + file://0001-lib-Remove-i-86-march-overrides.patch \ " SRC_URI[sha256sum] = "b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c" diff --git a/poky/meta/recipes-devtools/gcc/gcc/0001-lib-Remove-i-86-march-overrides.patch b/poky/meta/recipes-devtools/gcc/gcc/0001-lib-Remove-i-86-march-overrides.patch new file mode 100644 index 000000000..3f04e121b --- /dev/null +++ b/poky/meta/recipes-devtools/gcc/gcc/0001-lib-Remove-i-86-march-overrides.patch @@ -0,0 +1,113 @@ +From 3776789cde95916f95deef48acf9532b0ebf91ae Mon Sep 17 00:00:00 2001 +From: Nathan Rossi +Date: Tue, 15 Dec 2020 11:43:36 +1000 +Subject: [PATCH] lib*: Remove i*86 march overrides + +OE does not pass the '--with-arch' option to gccs configure, as such +some gcc-runtime libraries try to override the value of '-march' and +'-mtune' which OE already provides. This causes conflicts with other +i*86 instruction/architecture flags (e.g. -msse* and -mfpmath=*). +Additionally this caused the following libraries to be built with less +optimized tune configurations. + +Upstream suggests that this should be detecting or otherwise checking if +the target supports the desired functionality before overriding. + + https://gcc.gnu.org/legacy-ml/gcc-patches/2016-04/msg01344.html + +libatomic also overrides the '-march' specifically for IFUNC objects. +OE already supplies the correct march flag, so remove setting. + +Upstream-Status: Inappropriate [OE Specific] +Signed-off-by: Nathan Rossi +--- + libatomic/Makefile.am | 1 - + libatomic/Makefile.in | 1 - + libatomic/configure.tgt | 9 --------- + libgomp/configure.tgt | 8 -------- + libitm/configure.tgt | 9 --------- + 5 files changed, 28 deletions(-) + +diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am +index ac1ca64587..5aa16e0699 100644 +--- a/libatomic/Makefile.am ++++ b/libatomic/Makefile.am +@@ -133,7 +133,6 @@ libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS)) + libatomic_la_LIBADD += $(addsuffix _8_2_.lo,$(SIZEOBJS)) + endif + if ARCH_I386 +-IFUNC_OPTIONS = -march=i586 + libatomic_la_LIBADD += $(addsuffix _8_1_.lo,$(SIZEOBJS)) + endif + if ARCH_X86_64 +diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in +index 97df2d7ff0..82c511d420 100644 +--- a/libatomic/Makefile.in ++++ b/libatomic/Makefile.in +@@ -432,7 +432,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \ + _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \ + $(am__append_3) $(am__append_4) + @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64 +-@ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586 + @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -mcx16 + libatomic_convenience_la_SOURCES = $(libatomic_la_SOURCES) + libatomic_convenience_la_LIBADD = $(libatomic_la_LIBADD) +diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt +index 5dd0926d20..3cc41773c3 100644 +--- a/libatomic/configure.tgt ++++ b/libatomic/configure.tgt +@@ -82,15 +82,6 @@ case "${target_cpu}" in + ;; + + i[3456]86) +- case " ${CC} ${CFLAGS} " in +- *" -m64 "*|*" -mx32 "*) +- ;; +- *) +- if test -z "$with_arch"; then +- XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}" +- XCFLAGS="${XCFLAGS} -fomit-frame-pointer" +- fi +- esac + ARCH=x86 + # ??? Detect when -march=i686 is already enabled. + try_ifunc=yes +diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt +index 4790a31e39..46c4c958e6 100644 +--- a/libgomp/configure.tgt ++++ b/libgomp/configure.tgt +@@ -72,14 +72,6 @@ if test x$enable_linux_futex = xyes; then + # Note that bare i386 is not included here. We need cmpxchg. + i[456]86-*-linux*) + config_path="linux/x86 linux posix" +- case " ${CC} ${CFLAGS} " in +- *" -m64 "*|*" -mx32 "*) +- ;; +- *) +- if test -z "$with_arch"; then +- XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}" +- fi +- esac + ;; + + # Similar jiggery-pokery for x86_64 multilibs, except here we +diff --git a/libitm/configure.tgt b/libitm/configure.tgt +index 04109160e9..3d78ea609d 100644 +--- a/libitm/configure.tgt ++++ b/libitm/configure.tgt +@@ -59,15 +59,6 @@ case "${target_cpu}" in + arm*) ARCH=arm ;; + + i[3456]86) +- case " ${CC} ${CFLAGS} " in +- *" -m64 "*|*" -mx32 "*) +- ;; +- *) +- if test -z "$with_arch"; then +- XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}" +- XCFLAGS="${XCFLAGS} -fomit-frame-pointer" +- fi +- esac + XCFLAGS="${XCFLAGS} -mrtm" + ARCH=x86 + ;; diff --git a/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 980ed6341..32c1499a3 100644 --- a/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -8,8 +8,8 @@ DEPENDS_class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "664b772118739dac69ef8c39abea7e02973ff316" -PV = "20201018+git${SRCPV}" +SRCREV = "c8ddc8472f8efcadafc1ef53ca1d863415fddd5f" +PV = "20201227+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in" diff --git a/poky/meta/recipes-devtools/go/go-1.15.inc b/poky/meta/recipes-devtools/go/go-1.15.inc index ccfb0c598..abe74e5eb 100644 --- a/poky/meta/recipes-devtools/go/go-1.15.inc +++ b/poky/meta/recipes-devtools/go/go-1.15.inc @@ -1,7 +1,7 @@ require go-common.inc GO_BASEVERSION = "1.15" -PV = "1.15.5" +PV = "1.15.6" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" @@ -15,6 +15,5 @@ SRC_URI += "\ file://0006-cmd-dist-separate-host-and-target-builds.patch \ file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ - file://0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch \ " -SRC_URI[main.sha256sum] = "c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1" +SRC_URI[main.sha256sum] = "890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817" diff --git a/poky/meta/recipes-devtools/go/go-1.15/0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch b/poky/meta/recipes-devtools/go/go-1.15/0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch deleted file mode 100644 index b57041f1d..000000000 --- a/poky/meta/recipes-devtools/go/go-1.15/0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 4759221d46b1666de96b8047cec3160bfe4d3d5d Mon Sep 17 00:00:00 2001 -From: Ian Lance Taylor -Date: Fri, 13 Nov 2020 11:05:37 -0800 -Subject: [PATCH] cmd/go: permit CGO_LDFLAGS to appear in //go:ldflag - -Fixes #42565 - -Upstream-Status: Backport [https://github.com/golang/go/commit/782cf560db4c919790fdb476d1bbe18e5ddf5ffd] -Change-Id: If7cf39905d124dbd54dfac6a53ee38270498efed -Reviewed-on: https://go-review.googlesource.com/c/go/+/269818 -Trust: Ian Lance Taylor -Run-TryBot: Ian Lance Taylor -TryBot-Result: Go Bot -Reviewed-by: Jay Conrod -Signed-off-by: Khem Raj ---- - src/cmd/go/internal/work/exec.go | 15 +++++++++ - src/cmd/go/testdata/script/ldflag.txt | 44 +++++++++++++++++++++++++++ - 2 files changed, 59 insertions(+) - create mode 100644 src/cmd/go/testdata/script/ldflag.txt - -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index 575a2df..9209e3d 100644 ---- a/src/cmd/go/internal/work/exec.go -+++ b/src/cmd/go/internal/work/exec.go -@@ -2821,6 +2821,21 @@ func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgo - idx = bytes.Index(src, []byte(cgoLdflag)) - } - } -+ -+ // We expect to find the contents of cgoLDFLAGS in flags. -+ if len(cgoLDFLAGS) > 0 { -+ outer: -+ for i := range flags { -+ for j, f := range cgoLDFLAGS { -+ if f != flags[i+j] { -+ continue outer -+ } -+ } -+ flags = append(flags[:i], flags[i+len(cgoLDFLAGS):]...) -+ break -+ } -+ } -+ - if err := checkLinkerFlags("LDFLAGS", "go:cgo_ldflag", flags); err != nil { - return nil, nil, err - } -diff --git a/src/cmd/go/testdata/script/ldflag.txt b/src/cmd/go/testdata/script/ldflag.txt -new file mode 100644 -index 0000000..6ceb33b ---- /dev/null -+++ b/src/cmd/go/testdata/script/ldflag.txt -@@ -0,0 +1,44 @@ -+# Issue #42565 -+ -+[!cgo] skip -+ -+# We can't build package bad, which uses #cgo LDFLAGS. -+cd bad -+! go build -+stderr no-such-warning -+ -+# We can build package ok with the same flags in CGO_LDFLAGS. -+env CGO_LDFLAGS=-Wno-such-warning -Wno-unknown-warning-option -+cd ../ok -+go build -+ -+# Build a main program that actually uses LDFLAGS. -+cd .. -+go build -ldflags=-v -+ -+# Because we passed -v the Go linker should print the external linker -+# command which should include the flag we passed in CGO_LDFLAGS. -+stderr no-such-warning -+ -+-- go.mod -- -+module ldflag -+ -+-- bad/bad.go -- -+package bad -+ -+// #cgo LDFLAGS: -Wno-such-warning -Wno-unknown-warning -+import "C" -+ -+func F() {} -+-- ok/ok.go -- -+package ok -+ -+import "C" -+ -+func F() {} -+-- main.go -- -+package main -+ -+import _ "ldflag/ok" -+ -+func main() {} --- -2.29.2 - diff --git a/poky/meta/recipes-devtools/go/go-binary-native_1.15.5.bb b/poky/meta/recipes-devtools/go/go-binary-native_1.15.5.bb deleted file mode 100644 index 1fb11b043..000000000 --- a/poky/meta/recipes-devtools/go/go-binary-native_1.15.5.bb +++ /dev/null @@ -1,46 +0,0 @@ -# This recipe is for bootstrapping our go-cross from a prebuilt binary of Go from golang.org. - -SUMMARY = "Go programming language compiler (upstream binary for bootstrap)" -HOMEPAGE = " http://golang.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" - -PROVIDES = "go-native" - -SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "9a58494e8da722c3aef248c9227b0e9c528c7318309827780f16220998180a0d" -SRC_URI[go_linux_arm64.sha256sum] = "a72a0b036beb4193a0214bca3fca4c5d68a38a4ccf098c909f7ce8bf08567c48" - -UPSTREAM_CHECK_URI = "https://golang.org/dl/" -UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" - -S = "${WORKDIR}/go" - -inherit goarch native - -do_compile() { - : -} - -make_wrapper() { - rm -f ${D}${bindir}/$1 - cat <${D}${bindir}/$1 -#!/bin/bash -here=\`dirname \$0\` -export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go\`}" -\$here/../lib/go/bin/$1 "\$@" -END - chmod +x ${D}${bindir}/$1 -} - -do_install() { - find ${S} -depth -type d -name testdata -exec rm -rf {} + - - install -d ${D}${bindir} ${D}${libdir}/go - cp --preserve=mode,timestamps -R ${S}/ ${D}${libdir}/ - - for f in ${S}/bin/* - do - make_wrapper `basename $f` - done -} diff --git a/poky/meta/recipes-devtools/go/go-binary-native_1.15.6.bb b/poky/meta/recipes-devtools/go/go-binary-native_1.15.6.bb new file mode 100644 index 000000000..622557ad2 --- /dev/null +++ b/poky/meta/recipes-devtools/go/go-binary-native_1.15.6.bb @@ -0,0 +1,46 @@ +# This recipe is for bootstrapping our go-cross from a prebuilt binary of Go from golang.org. + +SUMMARY = "Go programming language compiler (upstream binary for bootstrap)" +HOMEPAGE = " http://golang.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" + +PROVIDES = "go-native" + +SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" +SRC_URI[go_linux_amd64.sha256sum] = "3918e6cc85e7eaaa6f859f1bdbaac772e7a825b0eb423c63d3ae68b21f84b844" +SRC_URI[go_linux_arm64.sha256sum] = "f87515b9744154ffe31182da9341d0a61eb0795551173d242c8cad209239e492" + +UPSTREAM_CHECK_URI = "https://golang.org/dl/" +UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" + +S = "${WORKDIR}/go" + +inherit goarch native + +do_compile() { + : +} + +make_wrapper() { + rm -f ${D}${bindir}/$1 + cat <${D}${bindir}/$1 +#!/bin/bash +here=\`dirname \$0\` +export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go\`}" +\$here/../lib/go/bin/$1 "\$@" +END + chmod +x ${D}${bindir}/$1 +} + +do_install() { + find ${S} -depth -type d -name testdata -exec rm -rf {} + + + install -d ${D}${bindir} ${D}${libdir}/go + cp --preserve=mode,timestamps -R ${S}/ ${D}${libdir}/ + + for f in ${S}/bin/* + do + make_wrapper `basename $f` + done +} diff --git a/poky/meta/recipes-devtools/libdnf/libdnf_0.55.0.bb b/poky/meta/recipes-devtools/libdnf/libdnf_0.55.0.bb deleted file mode 100644 index 07b3df40d..000000000 --- a/poky/meta/recipes-devtools/libdnf/libdnf_0.55.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Library providing simplified C and Python API to libsolv" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ - file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \ - file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \ - file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ - file://0001-Add-WITH_TESTS-option.patch \ - file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \ - file://enable_test_data_dir_set.patch \ - " - -SRCREV = "3f8981c9c5066e5243b695c904031b90f8d57d4a" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native" - -inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base - -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DWITH_MAN=OFF -DPYTHON_DESIRED=3 \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DWITH_GIR=ON', '-DWITH_GIR=OFF', d)} \ - -DWITH_TESTS=OFF \ - -DWITH_ZCHUNK=OFF \ - -DWITH_HTML=OFF \ - " -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)}" - diff --git a/poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb b/poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb new file mode 100644 index 000000000..e22255f83 --- /dev/null +++ b/poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb @@ -0,0 +1,34 @@ +SUMMARY = "Library providing simplified C and Python API to libsolv" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ + file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \ + file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \ + file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ + file://0001-Add-WITH_TESTS-option.patch \ + file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \ + file://enable_test_data_dir_set.patch \ + " + +SRCREV = "d2d0ec98fd2e0a2623123fb1ddf8fdd8936c6046" +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native" + +inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base + +EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DWITH_MAN=OFF -DPYTHON_DESIRED=3 \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DWITH_GIR=ON', '-DWITH_GIR=OFF', d)} \ + -DWITH_TESTS=OFF \ + -DWITH_ZCHUNK=OFF \ + -DWITH_HTML=OFF \ + " +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)}" + diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb index 10204acf2..b9a64f00e 100644 --- a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +++ b/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb @@ -6,8 +6,8 @@ SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch= file://0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch \ " -PV = "2.9.4" -SRCREV = "c7254db07b21495fc9bd247c5b17ee20149c05e3" +PV = "2.11.1" +SRCREV = "0ead09d0a35b9095e1a01afd540abd7217b31fba" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch index 470589015..f18748709 100644 --- a/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch +++ b/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch @@ -1,4 +1,4 @@ -From c61a3df892ba88d9f3f84c1844481457a04b051f Mon Sep 17 00:00:00 2001 +From 9590860ba35cbd524cec51bdd009f0c63a7dd417 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 13 Jun 2017 14:55:52 +0300 Subject: [PATCH] Disabled reading host configs. @@ -12,10 +12,10 @@ Signed-off-by: Ed Bartosh 1 file changed, 8 deletions(-) diff --git a/config.c b/config.c -index 46af755..5ed9114 100644 +index 415755f..b61a49d 100644 --- a/config.c +++ b/config.c -@@ -737,14 +737,6 @@ void read_config(void) +@@ -774,14 +774,6 @@ void read_config(void) memcpy(devices, const_devices, nr_const_devices*sizeof(struct device)); diff --git a/poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch b/poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch index 8ceb0af13..6ae91d6cb 100644 --- a/poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch +++ b/poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch @@ -1,9 +1,48 @@ +From 3cf56b36db78679273f61ba78fbbf7f3fab52f68 Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz +Date: Fri, 8 Jun 2007 08:35:12 +0000 +Subject: [PATCH] mtools: imported from OE + Upstream-Status: Inappropriate [licensing] -Index: mtools-4.0.18/configure.in -=================================================================== ---- mtools-4.0.18.orig/configure.in -+++ mtools-4.0.18/configure.in +--- + Makefile.in | 11 ++++++----- + configure.in | 27 +++++++++++++++++++++++++++ + 2 files changed, 33 insertions(+), 5 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 616d59f..85b5b1d 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -26,10 +26,11 @@ USERCFLAGS = + USERLDFLAGS = + USERLDLIBS = + +-MAKEINFO = makeinfo +-TEXI2DVI = texi2dvi +-TEXI2PDF = texi2pdf +-TEXI2HTML = texi2html ++MAKEINFO = @MAKEINFO@ ++TEXI2DVI = @TEXI2DVI@ ++TEXI2PDF = @TEXI2PDF@ ++TEXI2HTML = @TEXI2HTML@ ++DVI2PS = @DVI2PS@ + + + # do not edit below this line +@@ -199,7 +200,7 @@ dvi: mtools.dvi + + ps: mtools.ps + %.ps: %.dvi +- dvips -f < $< > $@ ++ $(DVI2PS) -f < $< > $@ + + pdf: mtools.pdf + %.pdf: %.texi sysconfdir.texi +diff --git a/configure.in b/configure.in +index 5ff75c1..c0f7440 100644 +--- a/configure.in ++++ b/configure.in @@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM AC_C_CONST AC_C_INLINE @@ -35,35 +74,6 @@ Index: mtools-4.0.18/configure.in +AC_SUBST(TEXI2HTML) +AC_SUBST(DVI2PS) + - dnl Check for configuration options dnl Enable OS/2 extended density format disks -Index: mtools-4.0.18/Makefile.in -=================================================================== ---- mtools-4.0.18.orig/Makefile.in -+++ mtools-4.0.18/Makefile.in -@@ -26,10 +26,11 @@ USERCFLAGS = - USERLDFLAGS = - USERLDLIBS = - --MAKEINFO = makeinfo --TEXI2DVI = texi2dvi --TEXI2PDF = texi2pdf --TEXI2HTML = texi2html -+MAKEINFO = @MAKEINFO@ -+TEXI2DVI = @TEXI2DVI@ -+TEXI2PDF = @TEXI2PDF@ -+TEXI2HTML = @TEXI2HTML@ -+DVI2PS = @DVI2PS@ - - - # do not edit below this line -@@ -198,7 +199,7 @@ dvi: mtools.dvi - - ps: mtools.ps - %.ps: %.dvi -- dvips -f < $< > $@ -+ $(DVI2PS) -f < $< > $@ - - pdf: mtools.pdf - %.pdf: %.texi sysconfdir.texi + AC_ARG_ENABLE(xdf, diff --git a/poky/meta/recipes-devtools/mtools/mtools_4.0.25.bb b/poky/meta/recipes-devtools/mtools/mtools_4.0.25.bb deleted file mode 100644 index bca33a28e..000000000 --- a/poky/meta/recipes-devtools/mtools/mtools_4.0.25.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Utilities to access MS-DOS disks without mounting them" -DESCRIPTION = "Mtools is a collection of utilities to access MS-DOS disks from GNU and Unix without mounting them." -HOMEPAGE = "http://www.gnu.org/software/mtools/" -SECTION = "optional" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS += "virtual/libiconv" - -RDEPENDS_${PN}_libc-glibc = "glibc-gconv-ibm850" -RRECOMMENDS_${PN}_libc-glibc = "\ - glibc-gconv-ibm437 \ - glibc-gconv-ibm737 \ - glibc-gconv-ibm775 \ - glibc-gconv-ibm851 \ - glibc-gconv-ibm852 \ - glibc-gconv-ibm855 \ - glibc-gconv-ibm857 \ - glibc-gconv-ibm860 \ - glibc-gconv-ibm861 \ - glibc-gconv-ibm862 \ - glibc-gconv-ibm863 \ - glibc-gconv-ibm865 \ - glibc-gconv-ibm866 \ - glibc-gconv-ibm869 \ - " -SRC_URI[sha256sum] = "fd161eec3bb7a93d13936db67725ad3e17f2d5f4e6fa8f7667fbc7ac728e2c15" - -SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ - file://mtools-makeinfo.patch \ - file://no-x11.gplv3.patch \ - file://clang_UNUSED.patch \ - " - -SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch" - -inherit autotools texinfo - -EXTRA_OECONF = "--without-x" - -BBCLASSEXTEND = "native nativesdk" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libbsd] = "ac_cv_lib_bsd_main=yes,ac_cv_lib_bsd_main=no,libbsd" - -do_install_prepend () { - # Create bindir to fix parallel installation issues - mkdir -p ${D}/${bindir} - mkdir -p ${D}/${datadir} -} diff --git a/poky/meta/recipes-devtools/mtools/mtools_4.0.26.bb b/poky/meta/recipes-devtools/mtools/mtools_4.0.26.bb new file mode 100644 index 000000000..493871306 --- /dev/null +++ b/poky/meta/recipes-devtools/mtools/mtools_4.0.26.bb @@ -0,0 +1,50 @@ +SUMMARY = "Utilities to access MS-DOS disks without mounting them" +DESCRIPTION = "Mtools is a collection of utilities to access MS-DOS disks from GNU and Unix without mounting them." +HOMEPAGE = "http://www.gnu.org/software/mtools/" +SECTION = "optional" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS += "virtual/libiconv" + +RDEPENDS_${PN}_libc-glibc = "glibc-gconv-ibm850" +RRECOMMENDS_${PN}_libc-glibc = "\ + glibc-gconv-ibm437 \ + glibc-gconv-ibm737 \ + glibc-gconv-ibm775 \ + glibc-gconv-ibm851 \ + glibc-gconv-ibm852 \ + glibc-gconv-ibm855 \ + glibc-gconv-ibm857 \ + glibc-gconv-ibm860 \ + glibc-gconv-ibm861 \ + glibc-gconv-ibm862 \ + glibc-gconv-ibm863 \ + glibc-gconv-ibm865 \ + glibc-gconv-ibm866 \ + glibc-gconv-ibm869 \ + " +SRC_URI[sha256sum] = "539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a" + +SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ + file://mtools-makeinfo.patch \ + file://no-x11.gplv3.patch \ + file://clang_UNUSED.patch \ + " + +SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch" + +inherit autotools texinfo + +EXTRA_OECONF = "--without-x" + +BBCLASSEXTEND = "native nativesdk" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[libbsd] = "ac_cv_lib_bsd_main=yes,ac_cv_lib_bsd_main=no,libbsd" + +do_install_prepend () { + # Create bindir to fix parallel installation issues + mkdir -p ${D}/${bindir} + mkdir -p ${D}/${datadir} +} diff --git a/poky/meta/recipes-devtools/ninja/ninja_1.10.1.bb b/poky/meta/recipes-devtools/ninja/ninja_1.10.1.bb deleted file mode 100644 index ecb0566f3..000000000 --- a/poky/meta/recipes-devtools/ninja/ninja_1.10.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Ninja is a small build system with a focus on speed." -HOMEPAGE = "https://ninja-build.org/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" - -DEPENDS = "re2c-native ninja-native" - -SRCREV = "a1f879b29c9aafe6a2bc0ba885701f8f4f19f772" - -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" - -S = "${WORKDIR}/git" - -do_configure[noexec] = "1" - -do_compile_class-native() { - python3 ./configure.py --bootstrap -} - -do_compile() { - python3 ./configure.py - ninja -} - -do_install() { - install -D -m 0755 ${S}/ninja ${D}${bindir}/ninja -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb b/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb new file mode 100644 index 000000000..88ff84340 --- /dev/null +++ b/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb @@ -0,0 +1,30 @@ +SUMMARY = "Ninja is a small build system with a focus on speed." +HOMEPAGE = "https://ninja-build.org/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" + +DEPENDS = "re2c-native ninja-native" + +SRCREV = "e72d1d581c945c158ed68d9bc48911063022a2c6" + +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" + +S = "${WORKDIR}/git" + +do_configure[noexec] = "1" + +do_compile_class-native() { + python3 ./configure.py --bootstrap +} + +do_compile() { + python3 ./configure.py + ninja +} + +do_install() { + install -D -m 0755 ${S}/ninja ${D}${bindir}/ninja +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/opkg/opkg/0001-tests-let-the-OS-negotiate-relative-package-dirs.patch b/poky/meta/recipes-devtools/opkg/opkg/0001-tests-let-the-OS-negotiate-relative-package-dirs.patch new file mode 100644 index 000000000..33b7280e5 --- /dev/null +++ b/poky/meta/recipes-devtools/opkg/opkg/0001-tests-let-the-OS-negotiate-relative-package-dirs.patch @@ -0,0 +1,43 @@ +From 4acda6d01c5abd33f1a1a3275fd695363f59473f Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Tue, 15 Dec 2020 15:17:54 -0600 +Subject: [opkg][opkg-0.4.4 PATCH] tests: let the OS negotiate relative package + dirs + +In cases where a regression test requires that a package be installed to +a subdirectory in the test feed, the opk.py module will attempt to +resolve the subdirectory and rebase it to the root of the test feed. + +This is unnecessary, since all operations which make use of the +subdirectory path do so from the perspective of the test feed already. +Further, the rebase implementation breaks in cases where the test feed +is beyond a symlink. + +Remove the resolve-and-rebase logic, and allow the OS to negotiate the +relative path. + +Upstream-Status: Submitted [https://groups.google.com/g/opkg-devel/c/dE1o7_OVQSY] + +Signed-off-by: Alex Stewart +--- + tests/opk.py | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/tests/opk.py b/tests/opk.py +index 692339567f72441766c8e658edc5bdf6a339f77d..711abacaeb328283e31524f6a49305fc7d39696a 100644 +--- a/tests/opk.py ++++ b/tests/opk.py +@@ -58,9 +58,7 @@ class Opk: + if 'Version' not in control.keys(): + control['Version'] = '1.0' + if subdirectory is not None: +- subdir = Path(subdirectory).resolve() +- opkdir = Path(cfg.opkdir) +- self._relative_dir = subdir.relative_to(opkdir) ++ self._relative_dir = Path(subdirectory) + else: + self._relative_dir = None + self.control = control +-- +2.29.2 + diff --git a/poky/meta/recipes-devtools/opkg/opkg_0.4.3.bb b/poky/meta/recipes-devtools/opkg/opkg_0.4.3.bb deleted file mode 100644 index 46b7aa252..000000000 --- a/poky/meta/recipes-devtools/opkg/opkg_0.4.3.bb +++ /dev/null @@ -1,74 +0,0 @@ -SUMMARY = "Open Package Manager" -SUMMARY_libopkg = "Open Package Manager library" -SECTION = "base" -HOMEPAGE = "http://code.google.com/p/opkg/" -BUGTRACKER = "http://code.google.com/p/opkg/issues/list" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/opkg.c;beginline=4;endline=18;md5=d6200b0f2b41dee278aa5fad333eecae" - -DEPENDS = "libarchive" - -PE = "1" - -SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ - file://opkg.conf \ - file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ - file://run-ptest \ -" - -SRC_URI[md5sum] = "86ec5eee9362aca0990994a402e077e9" -SRC_URI[sha256sum] = "dda452854bc0cd1334f7ba18a66003d1c12a98600c894111b56919b1ea434718" - -# This needs to be before ptest inherit, otherwise all ptest files end packaged -# in libopkg package if OPKGLIBDIR == libdir, because default -# PTEST_PATH ?= "${libdir}/${BPN}/ptest" -PACKAGES =+ "libopkg" - -inherit autotools pkgconfig ptest - -target_localstatedir := "${localstatedir}" -OPKGLIBDIR ??= "${target_localstatedir}/lib" - -PACKAGECONFIG ??= "libsolv" - -PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,\ - gnupg gpgme libgpg-error,\ - ${@ "gnupg" if ("native" in d.getVar("PN")) else "gnupg-gpg"}\ - " -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" -PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl" -PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" -PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256" -PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv" - -EXTRA_OECONF += " --disable-pathfinder" -EXTRA_OECONF_class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}" - -do_install_append () { - install -d ${D}${sysconfdir}/opkg - install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf - echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf - - # We need to create the lock directory - install -d ${D}${OPKGLIBDIR}/opkg -} - -do_install_ptest () { - sed -i -e '/@echo $^/d' ${D}${PTEST_PATH}/tests/Makefile - sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0" ];then echo "FAIL:"$^;else echo "PASS:"$^;fi' ${D}${PTEST_PATH}/tests/Makefile -} - -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}_class-nativesdk = "" -RDEPENDS_${PN}-ptest += "make binutils python3-core python3-compression" -RREPLACES_${PN} = "opkg-nogpg opkg-collateral" -RCONFLICTS_${PN} = "opkg-collateral" -RPROVIDES_${PN} = "opkg-collateral" - -FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" - -BBCLASSEXTEND = "native nativesdk" - -CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" diff --git a/poky/meta/recipes-devtools/opkg/opkg_0.4.4.bb b/poky/meta/recipes-devtools/opkg/opkg_0.4.4.bb new file mode 100644 index 000000000..f8034ca5f --- /dev/null +++ b/poky/meta/recipes-devtools/opkg/opkg_0.4.4.bb @@ -0,0 +1,75 @@ +SUMMARY = "Open Package Manager" +SUMMARY_libopkg = "Open Package Manager library" +SECTION = "base" +HOMEPAGE = "http://code.google.com/p/opkg/" +BUGTRACKER = "http://code.google.com/p/opkg/issues/list" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://src/opkg.c;beginline=4;endline=18;md5=d6200b0f2b41dee278aa5fad333eecae" + +DEPENDS = "libarchive" + +PE = "1" + +SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ + file://opkg.conf \ + file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ + file://0001-tests-let-the-OS-negotiate-relative-package-dirs.patch \ + file://run-ptest \ +" + +SRC_URI[md5sum] = "345900c1d4747d58455867f9fe88ca43" +SRC_URI[sha256sum] = "2217acc58b8eb31300631ebae75e222ebc700c9c1cf6408088705d19a472c839" + +# This needs to be before ptest inherit, otherwise all ptest files end packaged +# in libopkg package if OPKGLIBDIR == libdir, because default +# PTEST_PATH ?= "${libdir}/${BPN}/ptest" +PACKAGES =+ "libopkg" + +inherit autotools pkgconfig ptest + +target_localstatedir := "${localstatedir}" +OPKGLIBDIR ??= "${target_localstatedir}/lib" + +PACKAGECONFIG ??= "libsolv" + +PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,\ + gnupg gpgme libgpg-error,\ + ${@ "gnupg" if ("native" in d.getVar("PN")) else "gnupg-gpg"}\ + " +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" +PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" +PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256" +PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv" + +EXTRA_OECONF += " --disable-pathfinder" +EXTRA_OECONF_class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}" + +do_install_append () { + install -d ${D}${sysconfdir}/opkg + install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf + echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf + + # We need to create the lock directory + install -d ${D}${OPKGLIBDIR}/opkg +} + +do_install_ptest () { + sed -i -e '/@echo $^/d' ${D}${PTEST_PATH}/tests/Makefile + sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0" ];then echo "FAIL:"$^;else echo "PASS:"$^;fi' ${D}${PTEST_PATH}/tests/Makefile +} + +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive" +RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}_class-nativesdk = "" +RDEPENDS_${PN}-ptest += "make binutils python3-core python3-compression" +RREPLACES_${PN} = "opkg-nogpg opkg-collateral" +RCONFLICTS_${PN} = "opkg-collateral" +RPROVIDES_${PN} = "opkg-collateral" + +FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" + +BBCLASSEXTEND = "native nativesdk" + +CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" diff --git a/poky/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch b/poky/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch new file mode 100644 index 000000000..03988a179 --- /dev/null +++ b/poky/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch @@ -0,0 +1,31 @@ +From 15b158db3ae11cb835f2eb8d2eb48e09d1a4af48 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Mon, 15 Jul 2019 19:10:02 +0200 +Subject: Avoid invalid memory access in context format diffs + +* src/pch.c (another_hunk): Avoid invalid memory access in context format +diffs. + +CVE: CVE-2019-20633 +Upstream-Status: Backport[https://git.savannah.gnu.org/cgit/patch.git/patch/?id=15b158db3ae11cb835f2eb8d2eb48e09d1a4af48] +Signed-off-by: Scott Murray + +--- + src/pch.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pch.c b/src/pch.c +index a500ad9..cb54e03 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -1328,6 +1328,7 @@ another_hunk (enum diff difftype, bool rev) + ptrn_prefix_context = context; + ptrn_suffix_context = context; + if (repl_beginning ++ || p_end <= 0 + || (p_end + != p_ptrn_lines + 1 + (p_Char[p_end - 1] == '\n'))) + { +-- +cgit v1.2.1 + diff --git a/poky/meta/recipes-devtools/patch/patch_2.7.6.bb b/poky/meta/recipes-devtools/patch/patch_2.7.6.bb index b5897b357..1997af0c2 100644 --- a/poky/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/poky/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -10,6 +10,7 @@ SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-Invoke-ed-directly-instead-of-using-the-shell.patch \ file://0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch \ file://0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch \ + file://CVE-2019-20633.patch \ " SRC_URI[md5sum] = "4c68cee989d83c87b00a3860bcd05600" diff --git a/poky/meta/recipes-devtools/perl/perl_5.32.0.bb b/poky/meta/recipes-devtools/perl/perl_5.32.0.bb index bba8263b9..3815dd44b 100644 --- a/poky/meta/recipes-devtools/perl/perl_5.32.0.bb +++ b/poky/meta/recipes-devtools/perl/perl_5.32.0.bb @@ -137,8 +137,9 @@ do_install() { install lib/ExtUtils/typemap ${D}${libdir}/perl5/${PV}/ExtUtils/ # 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 + dir=$(echo ${D}/${libdir}/perl5/${PV}/*/CORE) + rm $dir/libperl.so + ln -sf ../../../../libperl.so.${PERL_LIB_VER} $dir/libperl.so # Try to catch Bug #13946 if [ -e ${D}/${libdir}/perl5/${PV}/Storable.pm ]; then diff --git a/poky/meta/recipes-devtools/pseudo/files/0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch b/poky/meta/recipes-devtools/pseudo/files/0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch deleted file mode 100644 index e4a5356f5..000000000 --- a/poky/meta/recipes-devtools/pseudo/files/0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 28c760542eecd7c5b35ea88aa2b14d62afbda961 Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt -Date: Sat, 21 Nov 2020 17:22:38 +0100 -Subject: [PATCH] pseudo_client: Lessen indentation of - pseudo_client_ignore_path_chroot() - -Change-Id: I739b18efb7a95ce2d2d907d0faf7df539ab9af1c ---- - pseudo_client.c | 45 +++++++++++++++++++++++++-------------------- - 1 file changed, 25 insertions(+), 20 deletions(-) - -diff --git a/pseudo_client.c b/pseudo_client.c -index 116d926..a8bc3dc 100644 ---- a/pseudo_client.c -+++ b/pseudo_client.c -@@ -1527,28 +1527,33 @@ int pseudo_client_ignore_fd(int fd) { - - int pseudo_client_ignore_path_chroot(const char *path, int ignore_chroot) { - char *env; -- if (path) { -- if (ignore_chroot && pseudo_chroot && strncmp(path, pseudo_chroot, pseudo_chroot_len) == 0) -- return 0; -- env = pseudo_get_value("PSEUDO_IGNORE_PATHS"); -- if (env) { -- char *p = env; -- while (*p) { -- char *next = strchr(p, ','); -- if (!next) -- next = strchr(p, '\0'); -- if ((next - p) && !strncmp(path, p, next - p)) { -- pseudo_debug(PDBGF_PATH | PDBGF_VERBOSE, "ignoring path: '%s'\n", path); -- return 1; -- } -- if (next && *next != '\0') -- p = next+1; -- else -- break; -- } -- free(env); -+ -+ if (!path) -+ return 0; -+ -+ if (ignore_chroot && pseudo_chroot && strncmp(path, pseudo_chroot, pseudo_chroot_len) == 0) -+ return 0; -+ -+ env = pseudo_get_value("PSEUDO_IGNORE_PATHS"); -+ if (!env) -+ return 0; -+ -+ char *p = env; -+ while (*p) { -+ char *next = strchr(p, ','); -+ if (!next) -+ next = strchr(p, '\0'); -+ if ((next - p) && !strncmp(path, p, next - p)) { -+ pseudo_debug(PDBGF_PATH | PDBGF_VERBOSE, "ignoring path: '%s'\n", path); -+ return 1; - } -+ if (next && *next != '\0') -+ p = next+1; -+ else -+ break; - } -+ free(env); -+ - return 0; - } - diff --git a/poky/meta/recipes-devtools/pseudo/files/0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch b/poky/meta/recipes-devtools/pseudo/files/0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch deleted file mode 100644 index a657a27f2..000000000 --- a/poky/meta/recipes-devtools/pseudo/files/0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a1d61d68777373a50ae23b9dd83b428abe2f748d Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt -Date: Sat, 21 Nov 2020 17:30:33 +0100 -Subject: [PATCH] pseudo_client: Simplify pseudo_client_ignore_path_chroot() - -This also plugs a memory leak by making sure env is freed. - -Change-Id: Ia8635fd2c6b1e85919e4743713a85e0b52c28fac ---- - pseudo_client.c | 21 ++++++++++----------- - 1 file changed, 10 insertions(+), 11 deletions(-) - -diff --git a/pseudo_client.c b/pseudo_client.c -index a8bc3dc..7dc0345 100644 ---- a/pseudo_client.c -+++ b/pseudo_client.c -@@ -1538,23 +1538,22 @@ int pseudo_client_ignore_path_chroot(const char *path, int ignore_chroot) { - if (!env) - return 0; - -+ int ret = 0; - char *p = env; -- while (*p) { -+ while (p) { - char *next = strchr(p, ','); -- if (!next) -- next = strchr(p, '\0'); -- if ((next - p) && !strncmp(path, p, next - p)) { -- pseudo_debug(PDBGF_PATH | PDBGF_VERBOSE, "ignoring path: '%s'\n", path); -- return 1; -- } -- if (next && *next != '\0') -- p = next+1; -- else -+ if (next) -+ *next++ = '\0'; -+ if (*p && !strncmp(path, p, strlen(p))) { -+ pseudo_debug(PDBGF_PATH | PDBGF_VERBOSE, "ignoring path: '%s'\n", path); -+ ret = 1; - break; -+ } -+ p = next; - } - free(env); - -- return 0; -+ return ret; - } - - int pseudo_client_ignore_path(const char *path) { diff --git a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb index a9f7aa966..7fa11a54e 100644 --- a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -4,11 +4,9 @@ SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \ file://0001-configure-Prune-PIE-flags.patch \ file://fallback-passwd \ file://fallback-group \ - file://0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch \ - file://0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch \ " -SRCREV = "69f205c41902e17933b81b1450636848e8da2126" +SRCREV = "1ee9a1e05e200f189f6644411ba9304e8a479b0b" S = "${WORKDIR}/git" PV = "1.9.0+git${SRCPV}" diff --git a/poky/meta/recipes-devtools/python/python3-hypothesis_5.41.4.bb b/poky/meta/recipes-devtools/python/python3-hypothesis_5.41.4.bb deleted file mode 100644 index 416acc8d7..000000000 --- a/poky/meta/recipes-devtools/python/python3-hypothesis_5.41.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "A library for property-based testing" -HOMEPAGE = "https://github.com/HypothesisWorks/hypothesis/tree/master/hypothesis-python" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4ee62c16ebd0f4f99d906f36b7de8c3c" - -PYPI_PACKAGE = "hypothesis" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "7ef22dd2ae4a906ef1e237dcd6806aa7f97e30c37f924a0e6d595f4639350b53" - -RDEPENDS_${PN} += "python3-core" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-hypothesis_5.43.3.bb b/poky/meta/recipes-devtools/python/python3-hypothesis_5.43.3.bb new file mode 100644 index 000000000..4d93cba86 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-hypothesis_5.43.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "A library for property-based testing" +HOMEPAGE = "https://github.com/HypothesisWorks/hypothesis/tree/master/hypothesis-python" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4ee62c16ebd0f4f99d906f36b7de8c3c" + +PYPI_PACKAGE = "hypothesis" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "d97ba7ae2cfe7096b0c045fdb611ee9850ccdd6050a9b36cb96812242062c2cc" + +RDEPENDS_${PN} += "python3-attrs python3-core python3-sortedcontainers" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-importlib-metadata_3.1.0.bb b/poky/meta/recipes-devtools/python/python3-importlib-metadata_3.1.0.bb deleted file mode 100644 index d89621bed..000000000 --- a/poky/meta/recipes-devtools/python/python3-importlib-metadata_3.1.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Read metadata from Python packages" -HOMEPAGE = "https://pypi.org/project/importlib-metadata/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e88ae122f3925d8bde8319060f2ddb8e" - -inherit pypi setuptools3 - -SRC_URI = "https://files.pythonhosted.org/packages/7d/d4/dbc58eed92be61bae65a7d80a7604d35bf6ded3e3c53c14f2d45b4a28831/importlib_metadata-3.1.0.tar.gz" -SRC_URI[sha256sum] = "d9b8a46a0885337627a6430db287176970fff18ad421becec1d64cfc763c2099" - -S = "${WORKDIR}/importlib_metadata-${PV}" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -RDEPENDS_${PN} += "${PYTHON_PN}-zipp ${PYTHON_PN}-pathlib2" -RDEPENDS_${PN}_append_class-target = " python3-misc" -RDEPENDS_${PN}_append_class-nativesdk = " python3-misc" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-importlib-metadata_3.3.0.bb b/poky/meta/recipes-devtools/python/python3-importlib-metadata_3.3.0.bb new file mode 100644 index 000000000..23f2e2dba --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-importlib-metadata_3.3.0.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Read metadata from Python packages" +HOMEPAGE = "https://pypi.org/project/importlib-metadata/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e88ae122f3925d8bde8319060f2ddb8e" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "importlib_metadata" +UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P(\d+[\.\-_]*)+)/" + +SRC_URI[sha256sum] = "5c5a2720817414a6c41f0a49993908068243ae02c1635a228126519b509c8aed" + +S = "${WORKDIR}/importlib_metadata-${PV}" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +RDEPENDS_${PN} += "${PYTHON_PN}-zipp ${PYTHON_PN}-pathlib2" +RDEPENDS_${PN}_append_class-target = " python3-misc" +RDEPENDS_${PN}_append_class-nativesdk = " python3-misc" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-packaging_20.4.bb b/poky/meta/recipes-devtools/python/python3-packaging_20.4.bb deleted file mode 100644 index c75707e69..000000000 --- a/poky/meta/recipes-devtools/python/python3-packaging_20.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Core utilities for Python packages" -HOMEPAGE = "https://github.com/pypa/packaging" -LICENSE = "Apache-2.0 & BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" - -SRC_URI[md5sum] = "3208229da731c5d8e29d4d8941e75005" -SRC_URI[sha256sum] = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -RDEPENDS_${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-pyparsing" diff --git a/poky/meta/recipes-devtools/python/python3-packaging_20.8.bb b/poky/meta/recipes-devtools/python/python3-packaging_20.8.bb new file mode 100644 index 000000000..658c3d1f3 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-packaging_20.8.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Core utilities for Python packages" +HOMEPAGE = "https://github.com/pypa/packaging" +LICENSE = "Apache-2.0 & BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" + +SRC_URI[sha256sum] = "78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +RDEPENDS_${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-pyparsing" diff --git a/poky/meta/recipes-devtools/python/python3-py_1.10.0.bb b/poky/meta/recipes-devtools/python/python3-py_1.10.0.bb new file mode 100644 index 000000000..4e16ad174 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-py_1.10.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Library with cross-python path, ini-parsing, io, code, log facilities" +HOMEPAGE = "http://py.readthedocs.io/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9" + +SRC_URI[sha256sum] = "21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN} += "${PYTHON_PN}-netclient" diff --git a/poky/meta/recipes-devtools/python/python3-py_1.9.0.bb b/poky/meta/recipes-devtools/python/python3-py_1.9.0.bb deleted file mode 100644 index 794ec2a87..000000000 --- a/poky/meta/recipes-devtools/python/python3-py_1.9.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Library with cross-python path, ini-parsing, io, code, log facilities" -HOMEPAGE = "http://py.readthedocs.io/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9" - -SRC_URI[md5sum] = "b80db4e61eef724f49feb4d20b649e62" -SRC_URI[sha256sum] = "9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS_${PN} += "${PYTHON_PN}-netclient" diff --git a/poky/meta/recipes-devtools/python/python3-pygments_2.7.2.bb b/poky/meta/recipes-devtools/python/python3-pygments_2.7.2.bb deleted file mode 100644 index 00e5dc6e3..000000000 --- a/poky/meta/recipes-devtools/python/python3-pygments_2.7.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Pygments is a syntax highlighting package written in Python." -DESCRIPTION = "Pygments is a syntax highlighting package written in Python." -HOMEPAGE = "http://pygments.org/" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1f5d0c4cf38dfc8122c00d6f1a97a0cc" - -inherit setuptools3 -SRC_URI[sha256sum] = "381985fcc551eb9d37c52088a32914e00517e57f4a21609f48141ba08e193fa0" - -DEPENDS += "\ - ${PYTHON_PN} \ - " - -PYPI_PACKAGE = "Pygments" - -inherit pypi - -BBCLASSEXTEND = "native nativesdk" - diff --git a/poky/meta/recipes-devtools/python/python3-pygments_2.7.3.bb b/poky/meta/recipes-devtools/python/python3-pygments_2.7.3.bb new file mode 100644 index 000000000..379d85dbd --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-pygments_2.7.3.bb @@ -0,0 +1,19 @@ +SUMMARY = "Pygments is a syntax highlighting package written in Python." +DESCRIPTION = "Pygments is a syntax highlighting package written in Python." +HOMEPAGE = "http://pygments.org/" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1f5d0c4cf38dfc8122c00d6f1a97a0cc" + +inherit setuptools3 +SRC_URI[sha256sum] = "ccf3acacf3782cbed4a989426012f1c535c9a90d3a7fc3f16d231b9372d2b716" + +DEPENDS += "\ + ${PYTHON_PN} \ + " + +PYPI_PACKAGE = "Pygments" + +inherit pypi + +BBCLASSEXTEND = "native nativesdk" + diff --git a/poky/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/poky/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch index 8c5c17247..1abd531c6 100644 --- a/poky/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch +++ b/poky/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch @@ -1,8 +1,7 @@ -From ff784f4803ab33f5e3389e40d038d52d1e211843 Mon Sep 17 00:00:00 2001 +From ead04f2da75efeca3369feff6161ea4a8baecbc9 Mon Sep 17 00:00:00 2001 From: Yuan Chao Date: Wed, 28 Aug 2019 16:12:27 +0900 -Subject: [PATCH] [PATCH] setup.py: remove the setup_requires for - setuptools-scm +Subject: [PATCH] setup.py: remove the setup_requires for setuptools-scm The setup_requires argument forces the download of the egg file for setuptools-scm during the do_compile phase. This download is incompatible with the typical fetch @@ -18,22 +17,20 @@ Signed-off-by: Yuan Chao Rebase for pytest 6.1.0. Signed-off-by: Kai Kang + --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg -index 60f6564..c4d1471 100644 +index 6ed0792..0137090 100644 --- a/setup.cfg +++ b/setup.cfg -@@ -55,7 +55,6 @@ package_dir = +@@ -53,7 +53,6 @@ package_dir = =src setup_requires = - setuptools>=40.0 -- setuptools-scm + setuptools>=>=42.0 +- setuptools-scm>=3.4 zip_safe = no [options.entry_points] --- -2.17.1 - diff --git a/poky/meta/recipes-devtools/python/python3-pytest_6.1.2.bb b/poky/meta/recipes-devtools/python/python3-pytest_6.1.2.bb deleted file mode 100644 index 6fc3b6f32..000000000 --- a/poky/meta/recipes-devtools/python/python3-pytest_6.1.2.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Simple powerful testing with python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" - -SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch " - -SRC_URI[sha256sum] = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e" - -inherit update-alternatives pypi setuptools3 - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-atomicwrites \ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-debugger \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-importlib-metadata \ - ${PYTHON_PN}-iniconfig \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-more-itertools \ - ${PYTHON_PN}-packaging \ - ${PYTHON_PN}-pathlib2 \ - ${PYTHON_PN}-pluggy \ - ${PYTHON_PN}-py \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-toml \ - ${PYTHON_PN}-wcwidth \ -" - -ALTERNATIVE_${PN} += "py.test pytest" - -NATIVE_LINK_NAME[pytest] = "${bindir}/pytest" -ALTERNATIVE_TARGET[pytest] = "${bindir}/pytest" - -ALTERNATIVE_LINK_NAME[py.test] = "${bindir}/py.test" -ALTERNATIVE_TARGET[py.test] = "${bindir}/py.test" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-pytest_6.2.1.bb b/poky/meta/recipes-devtools/python/python3-pytest_6.2.1.bb new file mode 100644 index 000000000..6843b4da2 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-pytest_6.2.1.bb @@ -0,0 +1,39 @@ +SUMMARY = "Simple powerful testing with python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" + +SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch " + +SRC_URI[sha256sum] = "66e419b1899bc27346cb2c993e12c5e5e8daba9073c1fbce33b9807abc95c306" + +inherit update-alternatives pypi setuptools3 + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-atomicwrites \ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-debugger \ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-importlib-metadata \ + ${PYTHON_PN}-iniconfig \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-more-itertools \ + ${PYTHON_PN}-packaging \ + ${PYTHON_PN}-pathlib2 \ + ${PYTHON_PN}-pluggy \ + ${PYTHON_PN}-py \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-toml \ + ${PYTHON_PN}-wcwidth \ +" + +ALTERNATIVE_${PN} += "py.test pytest" + +NATIVE_LINK_NAME[pytest] = "${bindir}/pytest" +ALTERNATIVE_TARGET[pytest] = "${bindir}/pytest" + +ALTERNATIVE_LINK_NAME[py.test] = "${bindir}/py.test" +ALTERNATIVE_TARGET[py.test] = "${bindir}/py.test" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-setuptools-scm_4.1.2.bb b/poky/meta/recipes-devtools/python/python3-setuptools-scm_4.1.2.bb deleted file mode 100644 index 48bad2b99..000000000 --- a/poky/meta/recipes-devtools/python/python3-setuptools-scm_4.1.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "the blessed package to manage your versions by scm tags" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" - -SRC_URI[md5sum] = "e6c9fad17c90516d640868eb833d5150" -SRC_URI[sha256sum] = "a8994582e716ec690f33fec70cca0f85bd23ec974e3f783233e4879090a7faa8" - -PYPI_PACKAGE = "setuptools_scm" -inherit pypi setuptools3 - -UPSTREAM_CHECK_REGEX = "setuptools_scm-(?P.*)\.tar" - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-debugger \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-py \ - ${PYTHON_PN}-setuptools \ -" -RDEPENDS_${PN}_class-native = "\ - ${PYTHON_PN}-setuptools-native \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-setuptools-scm_5.0.1.bb b/poky/meta/recipes-devtools/python/python3-setuptools-scm_5.0.1.bb new file mode 100644 index 000000000..406404ec6 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-setuptools-scm_5.0.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "the blessed package to manage your versions by scm tags" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" + +SRC_URI[sha256sum] = "c85b6b46d0edd40d2301038cdea96bb6adc14d62ef943e75afb08b3e7bcf142a" + +PYPI_PACKAGE = "setuptools_scm" +inherit pypi setuptools3 + +UPSTREAM_CHECK_REGEX = "setuptools_scm-(?P.*)\.tar" + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-debugger \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-py \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-toml \ +" +RDEPENDS_${PN}_class-native = "\ + ${PYTHON_PN}-setuptools-native \ + ${PYTHON_PN}-toml-native \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-setuptools_50.3.2.bb b/poky/meta/recipes-devtools/python/python3-setuptools_50.3.2.bb deleted file mode 100644 index 4480d5677..000000000 --- a/poky/meta/recipes-devtools/python/python3-setuptools_50.3.2.bb +++ /dev/null @@ -1,65 +0,0 @@ -SUMMARY = "Download, build, install, upgrade, and uninstall Python packages" -HOMEPAGE = "https://pypi.org/project/setuptools" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=9a33897f1bca1160d7aad3835152e158" - -PYPI_PACKAGE_EXT = "zip" - -inherit pypi setuptools3 - -SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" - -SRC_URI += "file://0001-change-shebang-to-python3.patch" - -SRC_URI[sha256sum] = "ed0519d27a243843b05d82a5e9d01b0b083d9934eaa3d02779a23da18077bd3c" - -DEPENDS += "${PYTHON_PN}" - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-2to3 \ - ${PYTHON_PN}-compile \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-plistlib \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-unittest \ - ${PYTHON_PN}-xml \ -" - -do_install_prepend() { - install -d ${D}${PYTHON_SITEPACKAGES_DIR} -} - -do_install_append() { - mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install -} - -BBCLASSEXTEND = "native nativesdk" - -# The pkg-resources module can be used by itself, without the package downloader -# and easy_install. Ship it in a separate package so that it can be used by -# minimal distributions. -PACKAGES =+ "${PYTHON_PN}-pkg-resources " -FILES_${PYTHON_PN}-pkg-resources = "${PYTHON_SITEPACKAGES_DIR}/pkg_resources/*" -RDEPENDS_${PYTHON_PN}-pkg-resources = "\ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-plistlib \ - ${PYTHON_PN}-pprint \ -" -# Due to the way OE-Core implemented native recipes, the native class cannot -# have a dependency on something that is not a recipe name. Work around that by -# manually setting RPROVIDES. -RDEPENDS_${PN}_append = " ${PYTHON_PN}-pkg-resources" -RPROVIDES_append_class-native = " ${PYTHON_PN}-pkg-resources-native" diff --git a/poky/meta/recipes-devtools/python/python3-setuptools_51.0.0.bb b/poky/meta/recipes-devtools/python/python3-setuptools_51.0.0.bb new file mode 100644 index 000000000..6ee935f8f --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-setuptools_51.0.0.bb @@ -0,0 +1,65 @@ +SUMMARY = "Download, build, install, upgrade, and uninstall Python packages" +HOMEPAGE = "https://pypi.org/project/setuptools" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=9a33897f1bca1160d7aad3835152e158" + +PYPI_PACKAGE_EXT = "zip" + +inherit pypi setuptools3 + +SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" + +SRC_URI += "file://0001-change-shebang-to-python3.patch" + +SRC_URI[sha256sum] = "029c49fd713e9230f6a41c0298e6e1f5839f2cde7104c0ad5e053a37777e7688" + +DEPENDS += "${PYTHON_PN}" + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-2to3 \ + ${PYTHON_PN}-compile \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-distutils \ + ${PYTHON_PN}-email \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-plistlib \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-stringold \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-unittest \ + ${PYTHON_PN}-xml \ +" + +do_install_prepend() { + install -d ${D}${PYTHON_SITEPACKAGES_DIR} +} + +do_install_append() { + mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install +} + +BBCLASSEXTEND = "native nativesdk" + +# The pkg-resources module can be used by itself, without the package downloader +# and easy_install. Ship it in a separate package so that it can be used by +# minimal distributions. +PACKAGES =+ "${PYTHON_PN}-pkg-resources " +FILES_${PYTHON_PN}-pkg-resources = "${PYTHON_SITEPACKAGES_DIR}/pkg_resources/*" +RDEPENDS_${PYTHON_PN}-pkg-resources = "\ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-email \ + ${PYTHON_PN}-plistlib \ + ${PYTHON_PN}-pprint \ +" +# Due to the way OE-Core implemented native recipes, the native class cannot +# have a dependency on something that is not a recipe name. Work around that by +# manually setting RPROVIDES. +RDEPENDS_${PN}_append = " ${PYTHON_PN}-pkg-resources" +RPROVIDES_append_class-native = " ${PYTHON_PN}-pkg-resources-native" diff --git a/poky/meta/recipes-devtools/python/python3/CVE-2020-27619.patch b/poky/meta/recipes-devtools/python/python3/CVE-2020-27619.patch deleted file mode 100644 index b2053e7a4..000000000 --- a/poky/meta/recipes-devtools/python/python3/CVE-2020-27619.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b664a1df4ee71d3760ab937653b10997081b1794 Mon Sep 17 00:00:00 2001 -From: "Miss Skeleton (bot)" <31488909+miss-islington@users.noreply.github.com> -Date: Tue, 6 Oct 2020 05:37:36 -0700 -Subject: [PATCH] bpo-41944: No longer call eval() on content received via HTTP - in the CJK codec tests (GH-22566) - -(cherry picked from commit 2ef5caa58febc8968e670e39e3d37cf8eef3cab8) - -Co-authored-by: Serhiy Storchaka - -Upstream-Status: Backport [https://github.com/python/cpython/commit/b664a1df4ee71d3760ab937653b10997081b1794] -CVE: CVE-2020-27619 -Signed-off-by: Chee Yang Lee - ---- - Lib/test/multibytecodec_support.py | 22 +++++++------------ - .../2020-10-05-17-43-46.bpo-41944.rf1dYb.rst | 1 + - 2 files changed, 9 insertions(+), 14 deletions(-) - create mode 100644 Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst - -diff --git a/Lib/test/multibytecodec_support.py b/Lib/test/multibytecodec_support.py -index cca8af67d6d1d..f76c0153f5ecf 100644 ---- a/Lib/test/multibytecodec_support.py -+++ b/Lib/test/multibytecodec_support.py -@@ -305,29 +305,23 @@ def test_mapping_file(self): - self._test_mapping_file_plain() - - def _test_mapping_file_plain(self): -- unichrs = lambda s: ''.join(map(chr, map(eval, s.split('+')))) -+ def unichrs(s): -+ return ''.join(chr(int(x, 16)) for x in s.split('+')) -+ - urt_wa = {} - - with self.open_mapping_file() as f: - for line in f: - if not line: - break -- data = line.split('#')[0].strip().split() -+ data = line.split('#')[0].split() - if len(data) != 2: - continue - -- csetval = eval(data[0]) -- if csetval <= 0x7F: -- csetch = bytes([csetval & 0xff]) -- elif csetval >= 0x1000000: -- csetch = bytes([(csetval >> 24), ((csetval >> 16) & 0xff), -- ((csetval >> 8) & 0xff), (csetval & 0xff)]) -- elif csetval >= 0x10000: -- csetch = bytes([(csetval >> 16), ((csetval >> 8) & 0xff), -- (csetval & 0xff)]) -- elif csetval >= 0x100: -- csetch = bytes([(csetval >> 8), (csetval & 0xff)]) -- else: -+ if data[0][:2] != '0x': -+ self.fail(f"Invalid line: {line!r}") -+ csetch = bytes.fromhex(data[0][2:]) -+ if len(csetch) == 1 and 0x80 <= csetch[0]: - continue - - unich = unichrs(data[1]) -diff --git a/Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst b/Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst -new file mode 100644 -index 0000000000000..4f9782f1c85af ---- /dev/null -+++ b/Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst -@@ -0,0 +1 @@ -+Tests for CJK codecs no longer call ``eval()`` on content received via HTTP. diff --git a/poky/meta/recipes-devtools/python/python3_3.9.0.bb b/poky/meta/recipes-devtools/python/python3_3.9.0.bb deleted file mode 100644 index 19a8950f1..000000000 --- a/poky/meta/recipes-devtools/python/python3_3.9.0.bb +++ /dev/null @@ -1,376 +0,0 @@ -SUMMARY = "The Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSFv2" -SECTION = "devel/python" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=33223c9ef60c31e3f0e866cb09b65e83" - -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ - file://run-ptest \ - file://create_manifest3.py \ - file://get_module_deps3.py \ - file://python3-manifest.json \ - file://check_build_completeness.py \ - file://reformat_sysconfig.py \ - file://cgi_py.patch \ - file://0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch \ - ${@bb.utils.contains('PACKAGECONFIG', 'tk', '', 'file://avoid_warning_about_tkinter.patch', d)} \ - file://0001-Do-not-use-the-shell-version-of-python-config-that-w.patch \ - file://python-config.patch \ - file://0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch \ - file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ - file://0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch \ - file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \ - file://crosspythonpath.patch \ - file://0001-Use-FLAG_REF-always-for-interned-strings.patch \ - file://0001-test_locale.py-correct-the-test-output-format.patch \ - 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://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ - file://0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch \ - file://CVE-2020-27619.patch \ - " - -SRC_URI_append_class-native = " \ - file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \ - file://12-distutils-prefix-is-inside-staging-area.patch \ - file://0001-Don-t-search-system-for-headers-libraries.patch \ - " - -SRC_URI[sha256sum] = "9c73e63c99855709b9be0b3cc9e5b072cb60f37311e8c4e50f15576a0bf82854" - -# exclude pre-releases for both python 2.x and 3.x -UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P\d+(\.\d+)+).tar" -UPSTREAM_CHECK_URI = "https://www.python.org/downloads/source/" - -CVE_PRODUCT = "python" - -# Upstream consider this expected behaviour -CVE_CHECK_WHITELIST += "CVE-2007-4559" -# This is not exploitable when glibc has CVE-2016-10739 fixed. -CVE_CHECK_WHITELIST += "CVE-2019-18348" - -# This is windows only issue. -CVE_CHECK_WHITELIST += "CVE-2020-15523" - -PYTHON_MAJMIN = "3.9" - -S = "${WORKDIR}/Python-${PV}" - -BBCLASSEXTEND = "native nativesdk" - -inherit autotools pkgconfig qemu ptest multilib_header update-alternatives - -MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}" - -ALTERNATIVE_${PN}-dev = "python3-config" -ALTERNATIVE_LINK_NAME[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config" -ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}" - - -DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2" -DEPENDS_append_class-target = " python3-native" -DEPENDS_append_class-nativesdk = " python3-native" - -EXTRA_OECONF = " --without-ensurepip --enable-shared --with-platlibdir=${baselib}" -EXTRA_OECONF_append_class-native = " --bindir=${bindir}/${PN}" - -export CROSSPYTHONPATH="${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/" - -EXTRANATIVEPATH += "python3-native" - -# LTO will be enabled via packageconfig depending upong distro features -LTO_class-target = "" - -CACHED_CONFIGUREVARS = " \ - ac_cv_file__dev_ptmx=yes \ - ac_cv_file__dev_ptc=no \ - ac_cv_working_tzset=yes \ -" - -def possibly_include_pgo(d): - # PGO currently causes builds to not be reproducible, so disable it for - # now. See YOCTO #13407 - if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) and d.getVar('BUILD_REPRODUCIBLE_BINARIES') != '1': - return 'pgo' - - return '' - -PACKAGECONFIG_class-target ??= "readline ${@possibly_include_pgo(d)} gdbm ${@bb.utils.filter('DISTRO_FEATURES', 'lto', d)}" -PACKAGECONFIG_class-native ??= "readline gdbm" -PACKAGECONFIG_class-nativesdk ??= "readline gdbm" -PACKAGECONFIG[readline] = ",,readline" -# Use profile guided optimisation by running PyBench inside qemu-user -PACKAGECONFIG[pgo] = "--enable-optimizations,,qemu-native" -PACKAGECONFIG[tk] = ",,tk" -PACKAGECONFIG[gdbm] = ",,gdbm" -PACKAGECONFIG[lto] = "--with-lto,," - -do_configure_prepend () { - mkdir -p ${B}/Modules - cat > ${B}/Modules/Setup.local << EOF -*disabled* -${@bb.utils.contains('PACKAGECONFIG', 'gdbm', '', '_gdbm _dbm', d)} -${@bb.utils.contains('PACKAGECONFIG', 'readline', '', 'readline', d)} -EOF -} - -CPPFLAGS_append = " -I${STAGING_INCDIR}/ncursesw -I${STAGING_INCDIR}/uuid" - -EXTRA_OEMAKE = '\ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - LIB=${baselib} \ -' - -do_compile_prepend_class-target() { - if ${@bb.utils.contains('PACKAGECONFIG', 'pgo', 'true', 'false', d)}; then - qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}', ['${B}', '${STAGING_DIR_TARGET}/${base_libdir}'])}" - cat >pgo-wrapper < ${B}/Modules/Setup.local << EOF +*disabled* +${@bb.utils.contains('PACKAGECONFIG', 'gdbm', '', '_gdbm _dbm', d)} +${@bb.utils.contains('PACKAGECONFIG', 'readline', '', 'readline', d)} +EOF +} + +CPPFLAGS_append = " -I${STAGING_INCDIR}/ncursesw -I${STAGING_INCDIR}/uuid" + +EXTRA_OEMAKE = '\ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + LIB=${baselib} \ +' + +do_compile_prepend_class-target() { + if ${@bb.utils.contains('PACKAGECONFIG', 'pgo', 'true', 'false', d)}; then + qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}', ['${B}', '${STAGING_DIR_TARGET}/${base_libdir}'])}" + cat >pgo-wrapper < +Date: Wed, 12 Aug 2020 09:17:27 -0700 +Subject: [PATCH] hw: ehci: check return value of 'usb_packet_map' + +If 'usb_packet_map' fails, we should stop to process the usb +request. + +Signed-off-by: Li Qiang +Message-Id: <20200812161727.29412-1-liq3ea@163.com> +Signed-off-by: Gerd Hoffmann + +Upstream-Status: Backport +CVE: CVE-2020-25723 +[https://git.qemu.org/?p=qemu.git;a=commit;h=2fdb42d840400d58f2e706ecca82c142b97bcbd6] +Signed-off-by: Li Wang +--- + hw/usb/hcd-ehci.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c +index 1495e8f..1fbb02a 100644 +--- a/hw/usb/hcd-ehci.c ++++ b/hw/usb/hcd-ehci.c +@@ -1373,7 +1373,10 @@ static int ehci_execute(EHCIPacket *p, const char *action) + spd = (p->pid == USB_TOKEN_IN && NLPTR_TBIT(p->qtd.altnext) == 0); + usb_packet_setup(&p->packet, p->pid, ep, 0, p->qtdaddr, spd, + (p->qtd.token & QTD_TOKEN_IOC) != 0); +- usb_packet_map(&p->packet, &p->sgl); ++ if (usb_packet_map(&p->packet, &p->sgl)) { ++ qemu_sglist_destroy(&p->sgl); ++ return -1; ++ } + p->async = EHCI_ASYNC_INITIALIZED; + } + +@@ -1452,7 +1455,10 @@ static int ehci_process_itd(EHCIState *ehci, + if (ep && ep->type == USB_ENDPOINT_XFER_ISOC) { + usb_packet_setup(&ehci->ipacket, pid, ep, 0, addr, false, + (itd->transact[i] & ITD_XACT_IOC) != 0); +- usb_packet_map(&ehci->ipacket, &ehci->isgl); ++ if (usb_packet_map(&ehci->ipacket, &ehci->isgl)) { ++ qemu_sglist_destroy(&ehci->isgl); ++ return -1; ++ } + usb_handle_packet(dev, &ehci->ipacket); + usb_packet_unmap(&ehci->ipacket, &ehci->isgl); + } else { +-- +2.17.1 + diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch b/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch new file mode 100644 index 000000000..521219683 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch @@ -0,0 +1,49 @@ +From c2cb511634012344e3d0fe49a037a33b12d8a98a Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit +Date: Wed, 11 Nov 2020 18:36:36 +0530 +Subject: [PATCH] hw/net/e1000e: advance desc_offset in case of null +descriptor + +While receiving packets via e1000e_write_packet_to_guest() routine, +'desc_offset' is advanced only when RX descriptor is processed. And +RX descriptor is not processed if it has NULL buffer address. +This may lead to an infinite loop condition. Increament 'desc_offset' +to process next descriptor in the ring to avoid infinite loop. + +Reported-by: Cheol-woo Myung <330cjfdn@gmail.com> +Signed-off-by: Prasad J Pandit +Signed-off-by: Jason Wang + +Upstream-Status: Backport +CVE: CVE-2020-28916 +[https://git.qemu.org/?p=qemu.git;a=commit;h=c2cb511634012344e3d0fe49a037a33b12d8a98a] +Signed-off-by: Li Wang +--- + hw/net/e1000e_core.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c +index bcd186c..d3e3cdc 100644 +--- a/hw/net/e1000e_core.c ++++ b/hw/net/e1000e_core.c +@@ -1596,13 +1596,13 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct NetRxPkt *pkt, + (const char *) &fcs_pad, e1000x_fcs_len(core->mac)); + } + } +- desc_offset += desc_size; +- if (desc_offset >= total_size) { +- is_last = true; +- } + } else { /* as per intel docs; skip descriptors with null buf addr */ + trace_e1000e_rx_null_descriptor(); + } ++ desc_offset += desc_size; ++ if (desc_offset >= total_size) { ++ is_last = true; ++ } + + e1000e_write_rx_descr(core, desc, is_last ? core->rx_pkt : NULL, + rss_info, do_ps ? ps_hdr_len : 0, &bastate.written); +-- +2.17.1 + diff --git a/poky/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/poky/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch index 30975faea..38d755205 100644 --- a/poky/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +++ b/poky/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch @@ -1,4 +1,4 @@ -From 4fd37bc9d8d0777aa038777dd81a76b64f536efd Mon Sep 17 00:00:00 2001 +From 9bbe3f8564705aafcdcc5f2f033f9241a97f47c6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 27 Feb 2017 09:43:30 +0200 Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 186e4aeec..5df252085 100644 +index 6c78568e4..76b1d40e4 100644 --- a/configure.ac +++ b/configure.ac -@@ -944,7 +944,7 @@ else +@@ -966,7 +966,7 @@ else usrprefix=$prefix fi @@ -40,7 +40,7 @@ index 35c8cf9df..9d8b2825c 100644 %_infodir %{_datadir}/info %_mandir %{_datadir}/man diff --git a/rpm.am b/rpm.am -index b46c6b7da..02d5c7a0a 100644 +index cd40a16be..e6941e09f 100644 --- a/rpm.am +++ b/rpm.am @@ -1,10 +1,10 @@ @@ -55,4 +55,4 @@ index b46c6b7da..02d5c7a0a 100644 +rpmconfigdir = $(libdir)/rpm # Libtool version (current-revision-age) for all our libraries - rpm_version_info = 10:0:1 + rpm_version_info = 10:2:1 diff --git a/poky/meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch b/poky/meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch deleted file mode 100644 index c7ae158f8..000000000 --- a/poky/meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9de15c7e1f4ca23a10edb9a3b657f06b2b13e841 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 20 Oct 2020 22:16:39 +0200 -Subject: [PATCH] rpmdb.c: add a missing include - -This addressed build failures on non-glibc systems. - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - lib/rpmdb.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/rpmdb.c b/lib/rpmdb.c -index 4c101569f..73187630b 100644 ---- a/lib/rpmdb.c -+++ b/lib/rpmdb.c -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - - #ifndef DYING /* XXX already in "system.h" */ - #include diff --git a/poky/meta/recipes-devtools/rpm/rpm_4.16.0.bb b/poky/meta/recipes-devtools/rpm/rpm_4.16.0.bb deleted file mode 100644 index 4125f3f9d..000000000 --- a/poky/meta/recipes-devtools/rpm/rpm_4.16.0.bb +++ /dev/null @@ -1,165 +0,0 @@ -SUMMARY = "The RPM package management system" -DESCRIPTION = "The RPM Package Manager (RPM) is a powerful command line driven \ -package management system capable of installing, uninstalling, \ -verifying, querying, and updating software packages. Each software \ -package consists of an archive of files along with information about \ -the package like its version, a description, etc." - -SUMMARY_${PN}-dev = "Development files for manipulating RPM packages" -DESCRIPTION_${PN}-dev = "This package contains the RPM C library and header files. These \ -development files will simplify the process of writing programs that \ -manipulate RPM packages and databases. These files are intended to \ -simplify the process of creating graphical package managers or any \ -other tools that need an intimate knowledge of RPM packages in order \ -to function." - -SUMMARY_python3-rpm = "Python bindings for apps which will manupulate RPM packages" -DESCRIPTION_python3-rpm = "The python3-rpm package contains a module that permits applications \ -written in the Python programming language to use the interface \ -supplied by the RPM Package Manager libraries." - -HOMEPAGE = "http://www.rpm.org" - -# libraries are also LGPL - how to express this? -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" - -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \ - file://environment.d-rpm.sh \ - file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \ - file://0001-Do-not-read-config-files-from-HOME.patch \ - file://0001-When-cross-installing-execute-package-scriptlets-wit.patch \ - file://0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch \ - file://0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch \ - file://0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch \ - file://0001-Fix-build-with-musl-C-library.patch \ - file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \ - file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \ - file://0001-perl-disable-auto-reqs.patch \ - file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ - file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ - file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ - file://0001-rpmdb.c-add-a-missing-include.patch \ - file://0001-tools-Add-error.h-for-non-glibc-case.patch \ - " - -PE = "1" -SRCREV = "cd7f9303ef1070f027493cad7d00bc66935af2a0" - -S = "${WORKDIR}/git" - -DEPENDS = "libgcrypt db file popt xz bzip2 elfutils python3" -DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native" - -inherit autotools gettext pkgconfig python3native -export PYTHON_ABI - -AUTOTOOLS_AUXDIR = "${S}/build-aux" - -# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe -EXTRA_AUTORECONF_append = " --exclude=gnu-configize" - -EXTRA_OECONF_append = " --without-lua --enable-python --with-crypto=libgcrypt" -EXTRA_OECONF_append_libc-musl = " --disable-nls --disable-openmp" - -# --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs -# --localstatedir prevents rpm from writing its database to native sysroot when building images -# Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset -# plugins both behave badly inside builds. -EXTRA_OECONF_append_class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" -EXTRA_OECONF_append_class-nativesdk = " --sysconfdir=/etc --disable-plugins" - -BBCLASSEXTEND = "native nativesdk" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)}" -# The inhibit plugin serves no purpose outside of the target -PACKAGECONFIG_remove_class-native = "inhibit" -PACKAGECONFIG_remove_class-nativesdk = "inhibit" - -PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" -PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" -PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" - -ASNEEDED = "" - -# Direct rpm-native to read configuration from our sysroot, not the one it was compiled in -# libmagic also has sysroot path contamination, so override it - -WRAPPER_TOOLS = " \ - ${bindir}/rpm \ - ${bindir}/rpm2archive \ - ${bindir}/rpm2cpio \ - ${bindir}/rpmbuild \ - ${bindir}/rpmdb \ - ${bindir}/rpmgraph \ - ${bindir}/rpmkeys \ - ${bindir}/rpmsign \ - ${bindir}/rpmspec \ - ${libdir}/rpm/rpmdeps \ -" - -do_configure_prepend() { - mkdir -p ${S}/build-aux -} - -do_install_append_class-native() { - for tool in ${WRAPPER_TOOLS}; do - test -x ${D}$tool && create_wrapper ${D}$tool \ - RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ - RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} \ - MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ - RPM_NO_CHROOT_FOR_SCRIPTS=1 - done -} - -do_install_append_class-nativesdk() { - for tool in ${WRAPPER_TOOLS}; do - test -x ${D}$tool && create_wrapper ${D}$tool \ - RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \ - RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/..} \ - MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/misc/magic.mgc \ - RPM_NO_CHROOT_FOR_SCRIPTS=1 - done - - rm -rf ${D}/var - - mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d - install -m 644 ${WORKDIR}/environment.d-rpm.sh ${D}${SDKPATHNATIVE}/environment-setup.d/rpm.sh -} - -# Rpm's make install creates var/tmp which clashes with base-files packaging -do_install_append_class-target() { - rm -rf ${D}/var -} - -do_install_append () { - sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${libdir}/rpm/macros - - sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \ - ${D}${libdir}/rpm/pythondistdeps.py -} - -FILES_${PN} += "${libdir}/rpm-plugins/*.so \ - " -FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/rpm.sh" - -FILES_${PN}-dev += "${libdir}/rpm-plugins/*.la \ - " - -PACKAGES += "python3-rpm" -PROVIDES += "python3-rpm" -FILES_python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*" - -# rpm 5.x was packaging the rpm build tools separately -RPROVIDES_${PN} += "rpm-build" - -RDEPENDS_${PN} = "bash perl python3-core" - -PACKAGE_PREPROCESS_FUNCS += "rpm_package_preprocess" - -# Do not specify a sysroot when compiling on a target. -rpm_package_preprocess () { - sed -i -e 's:--sysroot[^ ]*::g' \ - ${PKGD}/${libdir}/rpm/macros -} diff --git a/poky/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb b/poky/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb new file mode 100644 index 000000000..9195d66dd --- /dev/null +++ b/poky/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb @@ -0,0 +1,164 @@ +SUMMARY = "The RPM package management system" +DESCRIPTION = "The RPM Package Manager (RPM) is a powerful command line driven \ +package management system capable of installing, uninstalling, \ +verifying, querying, and updating software packages. Each software \ +package consists of an archive of files along with information about \ +the package like its version, a description, etc." + +SUMMARY_${PN}-dev = "Development files for manipulating RPM packages" +DESCRIPTION_${PN}-dev = "This package contains the RPM C library and header files. These \ +development files will simplify the process of writing programs that \ +manipulate RPM packages and databases. These files are intended to \ +simplify the process of creating graphical package managers or any \ +other tools that need an intimate knowledge of RPM packages in order \ +to function." + +SUMMARY_python3-rpm = "Python bindings for apps which will manupulate RPM packages" +DESCRIPTION_python3-rpm = "The python3-rpm package contains a module that permits applications \ +written in the Python programming language to use the interface \ +supplied by the RPM Package Manager libraries." + +HOMEPAGE = "http://www.rpm.org" + +# libraries are also LGPL - how to express this? +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" + +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \ + file://environment.d-rpm.sh \ + file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \ + file://0001-Do-not-read-config-files-from-HOME.patch \ + file://0001-When-cross-installing-execute-package-scriptlets-wit.patch \ + file://0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch \ + file://0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch \ + file://0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch \ + file://0001-Fix-build-with-musl-C-library.patch \ + file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \ + file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \ + file://0001-perl-disable-auto-reqs.patch \ + file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ + file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ + file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ + file://0001-tools-Add-error.h-for-non-glibc-case.patch \ + " + +PE = "1" +SRCREV = "278883a704ea36c97974d0f2d65d41abe78b0e2a" + +S = "${WORKDIR}/git" + +DEPENDS = "libgcrypt db file popt xz bzip2 elfutils python3" +DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native" + +inherit autotools gettext pkgconfig python3native +export PYTHON_ABI + +AUTOTOOLS_AUXDIR = "${S}/build-aux" + +# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe +EXTRA_AUTORECONF_append = " --exclude=gnu-configize" + +EXTRA_OECONF_append = " --without-lua --enable-python --with-crypto=libgcrypt" +EXTRA_OECONF_append_libc-musl = " --disable-nls --disable-openmp" + +# --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs +# --localstatedir prevents rpm from writing its database to native sysroot when building images +# Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset +# plugins both behave badly inside builds. +EXTRA_OECONF_append_class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" +EXTRA_OECONF_append_class-nativesdk = " --sysconfdir=/etc --disable-plugins" + +BBCLASSEXTEND = "native nativesdk" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)}" +# The inhibit plugin serves no purpose outside of the target +PACKAGECONFIG_remove_class-native = "inhibit" +PACKAGECONFIG_remove_class-nativesdk = "inhibit" + +PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" +PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" +PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" + +ASNEEDED = "" + +# Direct rpm-native to read configuration from our sysroot, not the one it was compiled in +# libmagic also has sysroot path contamination, so override it + +WRAPPER_TOOLS = " \ + ${bindir}/rpm \ + ${bindir}/rpm2archive \ + ${bindir}/rpm2cpio \ + ${bindir}/rpmbuild \ + ${bindir}/rpmdb \ + ${bindir}/rpmgraph \ + ${bindir}/rpmkeys \ + ${bindir}/rpmsign \ + ${bindir}/rpmspec \ + ${libdir}/rpm/rpmdeps \ +" + +do_configure_prepend() { + mkdir -p ${S}/build-aux +} + +do_install_append_class-native() { + for tool in ${WRAPPER_TOOLS}; do + test -x ${D}$tool && create_wrapper ${D}$tool \ + RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ + RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} \ + MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ + RPM_NO_CHROOT_FOR_SCRIPTS=1 + done +} + +do_install_append_class-nativesdk() { + for tool in ${WRAPPER_TOOLS}; do + test -x ${D}$tool && create_wrapper ${D}$tool \ + RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \ + RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/..} \ + MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/misc/magic.mgc \ + RPM_NO_CHROOT_FOR_SCRIPTS=1 + done + + rm -rf ${D}/var + + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d + install -m 644 ${WORKDIR}/environment.d-rpm.sh ${D}${SDKPATHNATIVE}/environment-setup.d/rpm.sh +} + +# Rpm's make install creates var/tmp which clashes with base-files packaging +do_install_append_class-target() { + rm -rf ${D}/var +} + +do_install_append () { + sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${libdir}/rpm/macros + + sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \ + ${D}${libdir}/rpm/pythondistdeps.py +} + +FILES_${PN} += "${libdir}/rpm-plugins/*.so \ + " +FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/rpm.sh" + +FILES_${PN}-dev += "${libdir}/rpm-plugins/*.la \ + " + +PACKAGES += "python3-rpm" +PROVIDES += "python3-rpm" +FILES_python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*" + +# rpm 5.x was packaging the rpm build tools separately +RPROVIDES_${PN} += "rpm-build" + +RDEPENDS_${PN} = "bash perl python3-core" + +PACKAGE_PREPROCESS_FUNCS += "rpm_package_preprocess" + +# Do not specify a sysroot when compiling on a target. +rpm_package_preprocess () { + sed -i -e 's:--sysroot[^ ]*::g' \ + ${PKGD}/${libdir}/rpm/macros +} diff --git a/poky/meta/recipes-devtools/ruby/ruby.inc b/poky/meta/recipes-devtools/ruby/ruby.inc index a38b3fe62..7b6d4edc6 100644 --- a/poky/meta/recipes-devtools/ruby/ruby.inc +++ b/poky/meta/recipes-devtools/ruby/ruby.inc @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "\ file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ " -DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" +DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi" DEPENDS_class-native = "openssl-native libyaml-native readline-native zlib-native" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" diff --git a/poky/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch b/poky/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch deleted file mode 100644 index cd53f33f6..000000000 --- a/poky/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 387d3b6fba95cb47c4dacc6bcd330148a9168850 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 7 Oct 2020 12:54:03 -0700 -Subject: [PATCH] xlat: Mark IPPROTO_MAX last in IPPROTO_* constants - -* xlat/inet_protocols.in (IPPROTO_MAX): It should be the last entry - after adding IPPROTO_MPTCP this should have new value as - IPPROTO_MPTCP + 1. - -Signed-off-by: Khem Raj -Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2020-October/010253.html] ---- - xlat/inet_protocols.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/xlat/inet_protocols.in -+++ b/xlat/inet_protocols.in -@@ -32,5 +32,5 @@ IPPROTO_UDPLITE 136 - IPPROTO_MPLS 137 - IPPROTO_ETHERNET 143 - IPPROTO_RAW 255 --IPPROTO_MAX 256 - IPPROTO_MPTCP 262 -+IPPROTO_MAX 263 ---- a/xlat/inet_protocols.h -+++ b/xlat/inet_protocols.h -@@ -234,19 +234,19 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else - # define IPPROTO_RAW 255 - #endif --#if defined(IPPROTO_MAX) || (defined(HAVE_DECL_IPPROTO_MAX) && HAVE_DECL_IPPROTO_MAX) -+#if defined(IPPROTO_MPTCP) || (defined(HAVE_DECL_IPPROTO_MPTCP) && HAVE_DECL_IPPROTO_MPTCP) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((IPPROTO_MAX) == (256), "IPPROTO_MAX != 256"); -+static_assert((IPPROTO_MPTCP) == (262), "IPPROTO_MPTCP != 262"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define IPPROTO_MAX 256 -+# define IPPROTO_MPTCP 262 - #endif --#if defined(IPPROTO_MPTCP) || (defined(HAVE_DECL_IPPROTO_MPTCP) && HAVE_DECL_IPPROTO_MPTCP) -+#if defined(IPPROTO_MAX) || (defined(HAVE_DECL_IPPROTO_MAX) && HAVE_DECL_IPPROTO_MAX) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((IPPROTO_MPTCP) == (262), "IPPROTO_MPTCP != 262"); -+static_assert((IPPROTO_MAX) == (263), "IPPROTO_MAX != 263"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define IPPROTO_MPTCP 262 -+# define IPPROTO_MAX 263 - #endif - - #ifndef XLAT_MACROS_ONLY -@@ -353,12 +353,12 @@ static const struct xlat_data inet_proto - XLAT(IPPROTO_RAW), - #define XLAT_VAL_32 ((unsigned) (IPPROTO_RAW)) - #define XLAT_STR_32 STRINGIFY(IPPROTO_RAW) -- XLAT(IPPROTO_MAX), -- #define XLAT_VAL_33 ((unsigned) (IPPROTO_MAX)) -- #define XLAT_STR_33 STRINGIFY(IPPROTO_MAX) - XLAT(IPPROTO_MPTCP), -- #define XLAT_VAL_34 ((unsigned) (IPPROTO_MPTCP)) -- #define XLAT_STR_34 STRINGIFY(IPPROTO_MPTCP) -+ #define XLAT_VAL_33 ((unsigned) (IPPROTO_MPTCP)) -+ #define XLAT_STR_33 STRINGIFY(IPPROTO_MPTCP) -+ XLAT(IPPROTO_MAX), -+ #define XLAT_VAL_34 ((unsigned) (IPPROTO_MAX)) -+ #define XLAT_STR_34 STRINGIFY(IPPROTO_MAX) - }; - const struct xlat inet_protocols[1] = { { - .data = inet_protocols_xdata, diff --git a/poky/meta/recipes-devtools/strace/strace_5.10.bb b/poky/meta/recipes-devtools/strace/strace_5.10.bb new file mode 100644 index 000000000..22572fb93 --- /dev/null +++ b/poky/meta/recipes-devtools/strace/strace_5.10.bb @@ -0,0 +1,59 @@ +SUMMARY = "System call tracing tool" +HOMEPAGE = "http://strace.io" +SECTION = "console/utils" +LICENSE = "LGPL-2.1+ & GPL-2+" +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://update-gawk-paths.patch \ + file://Makefile-ptest.patch \ + file://run-ptest \ + file://mips-SIGEMT.patch \ + file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ + file://ptest-spacesave.patch \ + file://uintptr_t.patch \ + file://0001-strace-fix-reproducibilty-issues.patch \ + " +SRC_URI[sha256sum] = "fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c" + +inherit autotools ptest + +PACKAGECONFIG_class-target ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ +" + +PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,bluez5" +PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" + +EXTRA_OECONF += "--enable-mpers=no --disable-gcc-Werror" + +CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext" + +TESTDIR = "tests" +PTEST_BUILD_HOST_PATTERN = "^(DEB_CHANGELOGTIME|RPM_CHANGELOGTIME|WARN_CFLAGS_FOR_BUILD|LDFLAGS_FOR_BUILD)" + +do_install_append() { + # We don't ship strace-graph here because it needs perl + rm ${D}${bindir}/strace-graph +} + +do_compile_ptest() { + oe_runmake -C ${TESTDIR} buildtest-TESTS +} + +do_install_ptest() { + oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} + install -m 755 ${S}/test-driver ${D}${PTEST_PATH} + install -m 644 ${B}/config.h ${D}${PTEST_PATH} + sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile +} + +RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" + +RDEPENDS_${PN}-ptest_append_libc-glibc = "\ + locale-base-en-us.iso-8859-1 \ +" + +BBCLASSEXTEND = "native" +TOOLCHAIN = "gcc" diff --git a/poky/meta/recipes-devtools/strace/strace_5.9.bb b/poky/meta/recipes-devtools/strace/strace_5.9.bb deleted file mode 100644 index bee2616a4..000000000 --- a/poky/meta/recipes-devtools/strace/strace_5.9.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "System call tracing tool" -HOMEPAGE = "http://strace.io" -SECTION = "console/utils" -LICENSE = "LGPL-2.1+ & GPL-2+" -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://update-gawk-paths.patch \ - file://Makefile-ptest.patch \ - file://run-ptest \ - file://mips-SIGEMT.patch \ - file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ - file://ptest-spacesave.patch \ - file://uintptr_t.patch \ - file://0001-strace-fix-reproducibilty-issues.patch \ - file://0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch \ - " -SRC_URI[sha256sum] = "39473eb8465546c3e940fb663cb381eba5613160c7302794699d194a4d5d66d9" - -inherit autotools ptest - -PACKAGECONFIG_class-target ??= "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ -" - -PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,bluez5" -PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" - -EXTRA_OECONF += "--enable-mpers=no --disable-gcc-Werror" - -CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext" - -TESTDIR = "tests" -PTEST_BUILD_HOST_PATTERN = "^(DEB_CHANGELOGTIME|RPM_CHANGELOGTIME|WARN_CFLAGS_FOR_BUILD|LDFLAGS_FOR_BUILD)" - -do_install_append() { - # We don't ship strace-graph here because it needs perl - rm ${D}${bindir}/strace-graph -} - -do_compile_ptest() { - oe_runmake -C ${TESTDIR} buildtest-TESTS -} - -do_install_ptest() { - oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} - install -m 755 ${S}/test-driver ${D}${PTEST_PATH} - install -m 644 ${B}/config.h ${D}${PTEST_PATH} - sed -i -e '/^src/s/strace.*[1-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile -} - -RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" - -BBCLASSEXTEND = "native" -TOOLCHAIN = "gcc" diff --git a/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb b/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb index 3e7eef3a7..1b0b45f2f 100644 --- a/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +++ b/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb @@ -4,10 +4,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://README;beginline=35;endline=41;md5=558f2c71cb1fb9ba511ccd4858e48e8a" -# If you really want to run syslinux, you need mtools. We just want the -# ldlinux.* stuff for now, so skip mtools-native DEPENDS = "nasm-native util-linux e2fsprogs" -PV = "6.04-pre2" SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz \ file://syslinux-remove-clean-script.patch \ @@ -27,64 +24,77 @@ SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz SRC_URI[md5sum] = "2b31c78f087f99179feb357da312d7ec" SRC_URI[sha256sum] = "4441a5d593f85bb6e8d578cf6653fb4ec30f9e8f4a2315a3d8f2d0a8b3fadf94" +RECIPE_NO_UPDATE_REASON = "6.04-pre3 is broken" UPSTREAM_CHECK_URI = "https://www.zytor.com/pub/syslinux/" UPSTREAM_CHECK_REGEX = "syslinux-(?P.+)\.tar" UPSTREAM_VERSION_UNKNOWN = "1" -COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)' +# We can build the native parts anywhere, but the target has to be x86 +COMPATIBLE_HOST_class-target = '(x86_64|i.86).*-(linux|freebsd.*)' + # Don't let the sanity checker trip on the 32 bit real mode BIOS binaries INSANE_SKIP_${PN}-misc = "arch" INSANE_SKIP_${PN}-chain = "arch" +# When building the installer, CC is used to link. When building the bootloader, +# LD is used. However, these variables assume that GCC is used and break the +# build, so unset them. +TARGET_LDFLAGS = "" +SECURITY_LDFLAGS = "" +LDFLAGS_SECTION_REMOVAL = "" + EXTRA_OEMAKE = " \ BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \ DATADIR=${datadir} MANDIR=${mandir} INCDIR=${includedir} \ + CC="${CC} ${CFLAGS} ${LDFLAGS}" \ + LD="${LD} ${LDFLAGS}" \ + OBJDUMP="${OBJDUMP}" \ + OBJCOPY="${OBJCOPY}" \ + AR="${AR}" \ + STRIP="${STRIP}" \ + NM="${NM}" \ + RANLIB="${RANLIB}" \ " +# +# Tasks for native/nativesdk which just build the installer. +# do_configure() { - # drop win32 targets or build fails - sed -e 's,win32/\S*,,g' -i Makefile - - # clean installer executables included in source tarball - oe_runmake clean firmware="efi32" EFIINC="${includedir}" - # NOTE: There is a temporary work around above to specify - # the efi32 as the firmware else the pre-built bios - # files get erased contrary to the doc/distib.txt - # In the future this should be "bios" and not "efi32". + oe_runmake firmware="bios" clean } do_compile() { - # Make sure the recompile is OK. - # Though the ${B} should always exist, still check it before find and rm. - [ -d "${B}" ] && find ${B} -name '.*.d' -type f -exec rm -f {} \; - - # Rebuild only the installer; keep precompiled bootloaders - # as per author's request (doc/distrib.txt) - oe_runmake CC="${CC} ${CFLAGS}" \ - LD="${LD}" LDFLAGS="${LDFLAGS}" \ - OBJDUMP="${OBJDUMP}" \ - OBJCOPY="${OBJCOPY}" \ - AR="${AR}" \ - STRIP="${STRIP}" \ - NM="${NM}" \ - RANLIB="${RANLIB}" \ - firmware="bios" installer + oe_runmake firmware="bios" installer } do_install() { - oe_runmake CC="${CC} ${CFLAGS}" LD="${LD}" \ - OBJDUMP="${OBJDUMP}" \ - OBJCOPY="${OBJCOPY}" \ - AR="${AR}" \ - STRIP="${STRIP}" \ - NM="${NM}" \ - RANLIB="${RANLIB}" \ - firmware="bios" install INSTALLROOT="${D}" + install -d ${D}${bindir} + install \ + ${B}/bios/mtools/syslinux \ + ${B}/bios/extlinux/extlinux \ + ${B}/bios/utils/isohybrid \ + ${D}${bindir} +} + +# +# Tasks for target which ship the precompiled bootloader and installer +# +do_configure_class-target() { + # No need to do anything as we're mostly shipping the precompiled binaries + : +} + +do_compile_class-target() { + # No need to do anything as we're mostly shipping the precompiled binaries + : +} + +do_install_class-target() { + oe_runmake firmware="bios" install INSTALLROOT="${D}" install -d ${D}${datadir}/syslinux/ install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/ install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/ - install -m 755 ${S}/bios/linux/syslinux-nomtools ${D}${bindir}/ } PACKAGES += "${PN}-nomtools ${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc" diff --git a/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb deleted file mode 100644 index a7a1f0ff1..000000000 --- a/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb +++ /dev/null @@ -1,39 +0,0 @@ -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \ - file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https \ - file://0001-architecture-Recognise-RISCV-32-RISCV-64.patch \ - file://mips64.patch \ -" - -SRC_URI_append_libc-musl = " \ - file://0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch \ - file://0002-musl-does-not-provide-printf-h.patch \ - file://0003-musl-does-not-provide-canonicalize_file_name.patch \ - " - - -# Modify these as desired -PV = "233+git${SRCPV}" -SRCREV = "fe1c5e41e6bdb78043dad8fa863fc2df66d1dadf" - -S = "${WORKDIR}/git" - -DEPENDS = "systemd libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native intltool" - -inherit pkgconfig autotools systemd features_check - -REQUIRED_DISTRO_FEATURES = "systemd" - -SYSTEMD_SERVICE_${PN} = "systemd-bootchart.service" - -do_configure_prepend() { - # intltool.m4 is a soft link to /usr/share/aclocal/m4, delete it and use the one in our sysroot - rm -f ${S}/m4/intltool.m4 -} - -FILES_${PN} += "${systemd_unitdir}/systemd-bootchart" - -EXTRA_OECONF = " --with-rootprefix=${root_prefix} \ - --with-rootlibdir=${base_libdir}" diff --git a/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb new file mode 100644 index 000000000..4c857c3fd --- /dev/null +++ b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb @@ -0,0 +1,37 @@ +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https \ + file://0001-architecture-Recognise-RISCV-32-RISCV-64.patch \ + file://mips64.patch \ +" + +SRC_URI_append_libc-musl = " \ + file://0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch \ + file://0002-musl-does-not-provide-printf-h.patch \ + file://0003-musl-does-not-provide-canonicalize_file_name.patch \ + " + + +SRCREV = "8183cfd9dad8beca5434d625cf6b2df87775e956" + +S = "${WORKDIR}/git" + +DEPENDS = "systemd libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native intltool" + +inherit pkgconfig autotools systemd features_check + +REQUIRED_DISTRO_FEATURES = "systemd" + +SYSTEMD_SERVICE_${PN} = "systemd-bootchart.service" + +do_configure_prepend() { + # intltool.m4 is a soft link to /usr/share/aclocal/m4, delete it and use the one in our sysroot + rm -f ${S}/m4/intltool.m4 +} + +FILES_${PN} += "${systemd_unitdir}/systemd-bootchart" + +EXTRA_OECONF = " --with-rootprefix=${root_prefix} \ + --with-rootlibdir=${base_libdir}" diff --git a/poky/meta/recipes-devtools/vala/vala_0.50.1.bb b/poky/meta/recipes-devtools/vala/vala_0.50.1.bb deleted file mode 100644 index cca7eef52..000000000 --- a/poky/meta/recipes-devtools/vala/vala_0.50.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require ${BPN}.inc - -SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch" - -SRC_URI[sha256sum] = "958d9f06c9c3d7d1b2145512a9bc2a7c6aefbbf0416a04c7a0ecf463f7138f6c" diff --git a/poky/meta/recipes-devtools/vala/vala_0.50.2.bb b/poky/meta/recipes-devtools/vala/vala_0.50.2.bb new file mode 100644 index 000000000..b5913fca8 --- /dev/null +++ b/poky/meta/recipes-devtools/vala/vala_0.50.2.bb @@ -0,0 +1,5 @@ +require ${BPN}.inc + +SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch" + +SRC_URI[sha256sum] = "2c0d5dc6d65d070f724063075424c403765ab7935c9e6fbcb84981b94d07ceda" diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 b/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 index a3a0c6e50..93bfd45a4 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 +++ b/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 @@ -31,8 +31,6 @@ drd/tests/annotate_static drd/tests/annotate_trace_memory drd/tests/annotate_trace_memory_xml drd/tests/atomic_var -drd/tests/bar_bad -drd/tests/bar_bad_xml drd/tests/bar_trivial drd/tests/bug-235681 drd/tests/bug322621 diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all b/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all new file mode 100644 index 000000000..d6a85c473 --- /dev/null +++ b/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all @@ -0,0 +1,2 @@ +drd/tests/bar_bad +drd/tests/bar_bad_xml diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest b/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest index 97b0a85db..7217dfca5 100755 --- a/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest +++ b/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest @@ -17,6 +17,12 @@ EXP_TOOLS="exp-bbv exp-dhat exp-sgcheck" GDB_BIN=@bindir@/gdb cd ${VALGRIND_LIB}/ptest && ./gdbserver_tests/make_local_links ${GDB_BIN} +echo "Hide valgrind tests that are non-deterministic" +echo "Reported at https://bugs.kde.org/show_bug.cgi?id=430321" +for i in `cat remove-for-all`; do + mv $i.vgtest $i.IGNORE; +done + arch=`arch` if [ "$arch" = "aarch64" ]; then echo "Aarch64: Hide valgrind tests that result in defunct process and then out of memory" @@ -44,6 +50,10 @@ if [ "$arch" = "aarch64" ]; then done fi +echo "Restore valgrind tests that are non-deterministc" +for i in `cat remove-for-all`; do + mv $i.IGNORE $i.vgtest; +done passed=`grep PASS: ${LOG}|wc -l` failed=`grep FAIL: ${LOG}|wc -l` diff --git a/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb b/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb index 5db181ac1..25fa58249 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb +++ b/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb @@ -16,6 +16,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ file://run-ptest \ file://remove-for-aarch64 \ + file://remove-for-all \ file://0004-Fix-out-of-tree-builds.patch \ file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \ @@ -186,6 +187,7 @@ do_install_ptest() { # The scripts reference config.h so add it to the top ptest dir. cp ${B}/config.h ${D}${PTEST_PATH} install -D ${WORKDIR}/remove-for-aarch64 ${D}${PTEST_PATH} + install -D ${WORKDIR}/remove-for-all ${D}${PTEST_PATH} # Add an executable need by none/tests/bigcode mkdir ${D}${PTEST_PATH}/perf diff --git a/poky/meta/recipes-extended/acpica/acpica_20201113.bb b/poky/meta/recipes-extended/acpica/acpica_20201113.bb deleted file mode 100644 index f2d17ca54..000000000 --- a/poky/meta/recipes-extended/acpica/acpica_20201113.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "ACPICA tools for the development and debug of ACPI tables" -DESCRIPTION = "The ACPI Component Architecture (ACPICA) project provides an \ -OS-independent reference implementation of the Advanced Configuration and \ -Power Interface Specification (ACPI). ACPICA code contains those portions of \ -ACPI meant to be directly integrated into the host OS as a kernel-resident \ -subsystem, and a small set of tools to assist in developing and debugging \ -ACPI tables." - -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=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[sha256sum] = "48c4e0c07b42581d017487cc9264470e6420605ddd24cbb5d16410d02a771461" - -UPSTREAM_CHECK_URI = "https://acpica.org/downloads" - -S = "${WORKDIR}/acpica-unix-${PV}" - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "acpixtract acpidump" - -EXTRA_OEMAKE = "CC='${CC}' \ - OPT_CFLAGS=-Wall \ - DESTDIR=${D} \ - PREFIX=${prefix} \ - INSTALLDIR=${bindir} \ - INSTALLFLAGS= \ - " - -do_install() { - oe_runmake install -} - -# iasl*.bb is a subset of this recipe, so RREPLACE it -PROVIDES = "iasl" -RPROVIDES_${PN} += "iasl" -RREPLACES_${PN} += "iasl" -RCONFLICTS_${PN} += "iasl" - -BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-extended/acpica/acpica_20201217.bb b/poky/meta/recipes-extended/acpica/acpica_20201217.bb new file mode 100644 index 000000000..91bcd8a46 --- /dev/null +++ b/poky/meta/recipes-extended/acpica/acpica_20201217.bb @@ -0,0 +1,49 @@ +SUMMARY = "ACPICA tools for the development and debug of ACPI tables" +DESCRIPTION = "The ACPI Component Architecture (ACPICA) project provides an \ +OS-independent reference implementation of the Advanced Configuration and \ +Power Interface Specification (ACPI). ACPICA code contains those portions of \ +ACPI meant to be directly integrated into the host OS as a kernel-resident \ +subsystem, and a small set of tools to assist in developing and debugging \ +ACPI tables." + +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=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[sha256sum] = "df6bb667c60577c89df5abe3270539c1b9716b69409d1074d6a7fc5c2fea087b" + +UPSTREAM_CHECK_URI = "https://acpica.org/downloads" + +S = "${WORKDIR}/acpica-unix-${PV}" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "acpixtract acpidump" + +EXTRA_OEMAKE = "CC='${CC}' \ + OPT_CFLAGS=-Wall \ + DESTDIR=${D} \ + PREFIX=${prefix} \ + INSTALLDIR=${bindir} \ + INSTALLFLAGS= \ + " + +do_install() { + oe_runmake install +} + +# iasl*.bb is a subset of this recipe, so RREPLACE it +PROVIDES = "iasl" +RPROVIDES_${PN} += "iasl" +RREPLACES_${PN} += "iasl" +RCONFLICTS_${PN} += "iasl" + +BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-extended/bash/bash/CVE-2019-18276.patch b/poky/meta/recipes-extended/bash/bash/CVE-2019-18276.patch new file mode 100644 index 000000000..7b2073201 --- /dev/null +++ b/poky/meta/recipes-extended/bash/bash/CVE-2019-18276.patch @@ -0,0 +1,386 @@ +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. + +Get the patch from [1] to fix the issue. + +Upstream-Status: Inappropriate [the upstream thinks it doesn't increase the credibility of CVEs in general] +CVE: CVE-2019-18276 + +[1] https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=951bdaa + +Signed-off-by: De Huo +Signed-off-by: Kai Kang +Signed-off-by: Mingli Yu +--- + MANIFEST | 2 ++ + bashline.c | 50 +------------------------------------------------- + builtins/help.def | 2 +- + config.h.in | 10 +++++++++- + 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.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/poky/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch b/poky/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch deleted file mode 100644 index 7b2073201..000000000 --- a/poky/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch +++ /dev/null @@ -1,386 +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. - -Get the patch from [1] to fix the issue. - -Upstream-Status: Inappropriate [the upstream thinks it doesn't increase the credibility of CVEs in general] -CVE: CVE-2019-18276 - -[1] https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=951bdaa - -Signed-off-by: De Huo -Signed-off-by: Kai Kang -Signed-off-by: Mingli Yu ---- - MANIFEST | 2 ++ - bashline.c | 50 +------------------------------------------------- - builtins/help.def | 2 +- - config.h.in | 10 +++++++++- - 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.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/poky/meta/recipes-extended/bash/bash_5.0.bb b/poky/meta/recipes-extended/bash/bash_5.0.bb index 257a03bd8..53e05869c 100644 --- a/poky/meta/recipes-extended/bash/bash_5.0.bb +++ b/poky/meta/recipes-extended/bash/bash_5.0.bb @@ -30,7 +30,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 \ + file://CVE-2019-18276.patch \ " SRC_URI[tarball.md5sum] = "2b44b47b905be16f45709648f671820b" diff --git a/poky/meta/recipes-extended/bzip2/bzip2/Makefile.am b/poky/meta/recipes-extended/bzip2/bzip2/Makefile.am index d4498947e..7338df03e 100644 --- a/poky/meta/recipes-extended/bzip2/bzip2/Makefile.am +++ b/poky/meta/recipes-extended/bzip2/bzip2/Makefile.am @@ -46,7 +46,7 @@ runtest: else echo "FAIL: sample2 decompress"; fi @if cmp sample3.tst sample3.ref; then echo "PASS: sample3 decompress";\ else echo "FAIL: sample3 decompress"; fi - ./bzip2-tests/run-tests.sh --tests-dir="$(PWD)/bzip2-tests" + ./bzip2-tests/run-tests.sh --without-valgrind --tests-dir="$(PWD)/bzip2-tests" install-ptest: sed -n '/^runtest:/,/^install-ptest:/{/^install-ptest:/!p}' \ diff --git a/poky/meta/recipes-extended/cups/cups.inc b/poky/meta/recipes-extended/cups/cups.inc index df8d4d284..e7a704134 100644 --- a/poky/meta/recipes-extended/cups/cups.inc +++ b/poky/meta/recipes-extended/cups/cups.inc @@ -20,6 +20,10 @@ SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.t UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" UPSTREAM_CHECK_REGEX = "cups-(?P\d+\.\d+(\.\d+)?)-source.tar" +# Issue only applies to MacOS +CVE_CHECK_WHITELIST += "CVE-2008-1033" +# Issue affects pdfdistiller plugin used with but not part of cups +CVE_CHECK_WHITELIST += "CVE-2009-0032" # This is an Ubuntu only issue. CVE_CHECK_WHITELIST += "CVE-2018-6553" diff --git a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 673b35033..54aec0128 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From 538bd5ec36d88f17803cb848cbbfe62ad51fc2f4 Mon Sep 17 00:00:00 2001 +From b493e2fb472307997576eef33cce784594070f44 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 0162155..6866e72 100644 +index 13c2bc0..0b6ca1d 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 5.9, netdev@vger.kernel.org) + AC_INIT(ethtool, 5.10, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) diff --git a/poky/meta/recipes-extended/ethtool/ethtool_5.10.bb b/poky/meta/recipes-extended/ethtool/ethtool_5.10.bb new file mode 100644 index 000000000..5c0df3acb --- /dev/null +++ b/poky/meta/recipes-extended/ethtool/ethtool_5.10.bb @@ -0,0 +1,37 @@ +SUMMARY = "Display or change ethernet card settings" +DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." +HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/" +SECTION = "console/network" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" + +SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ + file://run-ptest \ + file://avoid_parallel_tests.patch \ + " + +SRC_URI[sha256sum] = "4b86adb3ed913c1ef14a276301981f696ab4ec360c19f0a5b68235c4756abae5" + +UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" + +inherit autotools ptest bash-completion pkgconfig + +RDEPENDS_${PN}-ptest += "make" + +PACKAGECONFIG ?= "netlink" +PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl," + +do_compile_ptest() { + oe_runmake buildtest-TESTS +} + +do_install_ptest () { + cp ${B}/Makefile ${D}${PTEST_PATH} + install ${B}/test-cmdline ${D}${PTEST_PATH} + if ${@bb.utils.contains('PACKAGECONFIG', 'netlink', 'false', 'true', d)}; then + install ${B}/test-features ${D}${PTEST_PATH} + fi + install ${B}/ethtool ${D}${PTEST_PATH}/ethtool + sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile +} diff --git a/poky/meta/recipes-extended/ethtool/ethtool_5.9.bb b/poky/meta/recipes-extended/ethtool/ethtool_5.9.bb deleted file mode 100644 index 2d2f9b77f..000000000 --- a/poky/meta/recipes-extended/ethtool/ethtool_5.9.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Display or change ethernet card settings" -DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." -HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/" -SECTION = "console/network" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" - -SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ - file://run-ptest \ - file://avoid_parallel_tests.patch \ - " - -SRC_URI[sha256sum] = "f934a830554c46d7d60b1a9147f4cab15589b7e09344c4b79b1948b740f0a725" - -UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" - -inherit autotools ptest bash-completion pkgconfig - -RDEPENDS_${PN}-ptest += "make" - -PACKAGECONFIG ?= "netlink" -PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl," - -do_compile_ptest() { - oe_runmake buildtest-TESTS -} - -do_install_ptest () { - cp ${B}/Makefile ${D}${PTEST_PATH} - install ${B}/test-cmdline ${D}${PTEST_PATH} - if ${@bb.utils.contains('PACKAGECONFIG', 'netlink', 'false', 'true', d)}; then - install ${B}/test-features ${D}${PTEST_PATH} - fi - install ${B}/ethtool ${D}${PTEST_PATH}/ethtool - sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile -} diff --git a/poky/meta/recipes-extended/gawk/gawk_5.1.0.bb b/poky/meta/recipes-extended/gawk/gawk_5.1.0.bb index 8c6411c86..ae897be62 100644 --- a/poky/meta/recipes-extended/gawk/gawk_5.1.0.bb +++ b/poky/meta/recipes-extended/gawk/gawk_5.1.0.bb @@ -53,4 +53,8 @@ do_install_ptest() { RDEPENDS_${PN}-ptest += "make" +RDEPENDS_${PN}-ptest_append_libc-glibc = "\ + locale-base-en-us.iso-8859-1 \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-extended/grep/grep_3.6.bb b/poky/meta/recipes-extended/grep/grep_3.6.bb index edf9b29c8..cb009b913 100644 --- a/poky/meta/recipes-extended/grep/grep_3.6.bb +++ b/poky/meta/recipes-extended/grep/grep_3.6.bb @@ -41,3 +41,5 @@ ALTERNATIVE_${PN} = "grep egrep fgrep" ALTERNATIVE_LINK_NAME[grep] = "${base_bindir}/grep" ALTERNATIVE_LINK_NAME[egrep] = "${base_bindir}/egrep" ALTERNATIVE_LINK_NAME[fgrep] = "${base_bindir}/fgrep" + +BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-extended/groff/groff_1.22.4.bb b/poky/meta/recipes-extended/groff/groff_1.22.4.bb index e39847834..0867452ce 100644 --- a/poky/meta/recipes-extended/groff/groff_1.22.4.bb +++ b/poky/meta/recipes-extended/groff/groff_1.22.4.bb @@ -28,7 +28,7 @@ MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bind EXTRA_OECONF = "--without-x --without-doc" PARALLEL_MAKE = "" -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl' ac_cv_path_BASH_PROG='no'" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl' ac_cv_path_BASH_PROG='no' PAGE=A4" do_install_append() { # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location diff --git a/poky/meta/recipes-extended/libaio/libaio/destdir.patch b/poky/meta/recipes-extended/libaio/libaio/destdir.patch deleted file mode 100644 index 0f90406be..000000000 --- a/poky/meta/recipes-extended/libaio/libaio/destdir.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -from openembedded, added by Qing He - -Index: libaio-0.3.110/Makefile -=================================================================== ---- libaio-0.3.110.orig/Makefile -+++ libaio-0.3.110/Makefile -@@ -15,7 +15,7 @@ all: - @$(MAKE) -C src - - install: -- @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir) -+ @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) - - check: - @$(MAKE) -C harness check diff --git a/poky/meta/recipes-extended/libaio/libaio/system-linkage.patch b/poky/meta/recipes-extended/libaio/libaio/system-linkage.patch index 0b1f47569..cc91ea99d 100644 --- a/poky/meta/recipes-extended/libaio/libaio/system-linkage.patch +++ b/poky/meta/recipes-extended/libaio/libaio/system-linkage.patch @@ -12,26 +12,22 @@ undefined reference to `__stack_chk_fail_local' Upstream-Status: Pending Signed-off-by: Ross Burton --- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index eadb336..56ab701 100644 +index 37ae219..22e0c9a 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -3,10 +3,10 @@ includedir=$(prefix)/include - libdir=$(prefix)/lib - - CFLAGS ?= -g -fomit-frame-pointer -O2 --CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC -+CFLAGS += -Wall -I. -fPIC +@@ -6,7 +6,7 @@ CFLAGS ?= -g -fomit-frame-pointer -O2 + CFLAGS += -Wall -I. -fPIC SO_CFLAGS=-shared $(CFLAGS) L_CFLAGS=$(CFLAGS) -LINK_FLAGS= +LINK_FLAGS=$(LDFLAGS) LINK_FLAGS+=$(LDFLAGS) + ENABLE_SHARED ?= 1 - soname=libaio.so.1 -- -2.1.4 +2.25.1 diff --git a/poky/meta/recipes-extended/libaio/libaio_0.3.111.bb b/poky/meta/recipes-extended/libaio/libaio_0.3.111.bb deleted file mode 100644 index 8e1cd349a..000000000 --- a/poky/meta/recipes-extended/libaio/libaio_0.3.111.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Asynchronous I/O library" -DESCRIPTION = "Asynchronous input/output library that uses the kernels native interface" -HOMEPAGE = "http://lse.sourceforge.net/io/aio.html" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" - -SRC_URI = "git://pagure.io/libaio.git;protocol=https \ - file://00_arches.patch \ - file://destdir.patch \ - file://libaio_fix_for_mips_syscalls.patch \ - file://system-linkage.patch \ - " -SRCREV = "f66be22ab0a59a39858900ab72a8c6a6e8b0b7ec" -S = "${WORKDIR}/git" - -EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}" - -do_install () { - oe_runmake install DESTDIR=${D} -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-extended/libaio/libaio_0.3.112.bb b/poky/meta/recipes-extended/libaio/libaio_0.3.112.bb new file mode 100644 index 000000000..b3606474a --- /dev/null +++ b/poky/meta/recipes-extended/libaio/libaio_0.3.112.bb @@ -0,0 +1,22 @@ +SUMMARY = "Asynchronous I/O library" +DESCRIPTION = "Asynchronous input/output library that uses the kernels native interface" +HOMEPAGE = "http://lse.sourceforge.net/io/aio.html" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" + +SRC_URI = "git://pagure.io/libaio.git;protocol=https \ + file://00_arches.patch \ + file://libaio_fix_for_mips_syscalls.patch \ + file://system-linkage.patch \ + " +SRCREV = "d025927efa75a0d1b46ca3a5ef331caa2f46ee0e" +S = "${WORKDIR}/git" + +EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}" + +do_install () { + oe_runmake install DESTDIR=${D} +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-extended/libtirpc/libtirpc_1.2.6.bb b/poky/meta/recipes-extended/libtirpc/libtirpc_1.2.6.bb deleted file mode 100644 index 10a324c3b..000000000 --- a/poky/meta/recipes-extended/libtirpc/libtirpc_1.2.6.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Transport-Independent RPC library" -DESCRIPTION = "Libtirpc is a port of Suns Transport-Independent RPC library to Linux" -SECTION = "libs/network" -HOMEPAGE = "http://sourceforge.net/projects/libtirpc/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=183075&atid=903784" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ - file://src/netname.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" - -PROVIDES = "virtual/librpc" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2" -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -SRC_URI[md5sum] = "b25f9cc18bfad50f7c446c77f4ae00bb" -SRC_URI[sha256sum] = "4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-gssapi" - -do_install_append() { - chown root:root ${D}${sysconfdir}/netconfig -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-extended/libtirpc/libtirpc_1.3.1.bb b/poky/meta/recipes-extended/libtirpc/libtirpc_1.3.1.bb new file mode 100644 index 000000000..579226425 --- /dev/null +++ b/poky/meta/recipes-extended/libtirpc/libtirpc_1.3.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "Transport-Independent RPC library" +DESCRIPTION = "Libtirpc is a port of Suns Transport-Independent RPC library to Linux" +SECTION = "libs/network" +HOMEPAGE = "http://sourceforge.net/projects/libtirpc/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=183075&atid=903784" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ + file://src/netname.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" + +PROVIDES = "virtual/librpc" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" +SRC_URI[sha256sum] = "245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gssapi" + +do_install_append() { + chown root:root ${D}${sysconfdir}/netconfig +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.56.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.56.bb deleted file mode 100644 index 97d3a2aab..000000000 --- a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.56.bb +++ /dev/null @@ -1,83 +0,0 @@ -SUMMARY = "Lightweight high-performance web server" -HOMEPAGE = "http://www.lighttpd.net/" -BUGTRACKER = "http://redmine.lighttpd.net/projects/lighttpd/issues" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" - -SECTION = "net" -RDEPENDS_${PN} = "lighttpd-module-dirlisting \ - lighttpd-module-indexfile \ - lighttpd-module-staticfile" -RRECOMMENDS_${PN} = "lighttpd-module-access \ - lighttpd-module-accesslog" - -SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.xz \ - file://index.html.lighttpd \ - file://lighttpd.conf \ - file://lighttpd \ - file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ - " - -SRC_URI[md5sum] = "9d94f68c8106bfcdfe7aafa0a13f45a8" -SRC_URI[sha256sum] = "e4ce84cd79e8ae8ba193c7a7cc79c4afba9a076b443ef9f8d4bcd13a3354df77" - -PACKAGECONFIG ??= "openssl pcre zlib \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" - -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" -PACKAGECONFIG[mmap] = "--enable-mmap,--disable-mmap" -PACKAGECONFIG[libev] = "--with-libev,--without-libev,libev" -PACKAGECONFIG[mysql] = "--with-mysql,--without-mysql,mariadb" -PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" -PACKAGECONFIG[krb5] = "--with-krb5,--without-krb5,krb5" -PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre" -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" -PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" -PACKAGECONFIG[webdav-props] = "--with-webdav-props,--without-webdav-props,libxml2 sqlite3" -PACKAGECONFIG[webdav-locks] = "--with-webdav-locks,--without-webdav-locks,util-linux" -PACKAGECONFIG[gdbm] = "--with-gdbm,--without-gdbm,gdbm" -PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached" -PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" - -EXTRA_OECONF += "--enable-lfs --without-fam" - -inherit autotools pkgconfig update-rc.d gettext systemd - -INITSCRIPT_NAME = "lighttpd" -INITSCRIPT_PARAMS = "defaults 70" - -SYSTEMD_SERVICE_${PN} = "lighttpd.service" - -do_install_append() { - install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav - install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd - install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@BASE_BINDIR@,${base_bindir},g' \ - ${D}${systemd_unitdir}/system/lighttpd.service - #For FHS compliance, create symbolic links to /var/log and /var/tmp for logs and temporary data - ln -sf ${localstatedir}/log ${D}/www/logs - ln -sf ${localstatedir}/tmp ${D}/www/var -} - -FILES_${PN} += "${sysconfdir} /www" - -CONFFILES_${PN} = "${sysconfdir}/lighttpd/lighttpd.conf" - -PACKAGES_DYNAMIC += "^lighttpd-module-.*" - -python populate_packages_prepend () { - lighttpd_libdir = d.expand('${libdir}') - do_split_packages(d, lighttpd_libdir, r'^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') -} diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.57.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.57.bb new file mode 100644 index 000000000..9a9cad68c --- /dev/null +++ b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.57.bb @@ -0,0 +1,82 @@ +SUMMARY = "Lightweight high-performance web server" +HOMEPAGE = "http://www.lighttpd.net/" +BUGTRACKER = "http://redmine.lighttpd.net/projects/lighttpd/issues" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" + +SECTION = "net" +RDEPENDS_${PN} = "lighttpd-module-dirlisting \ + lighttpd-module-indexfile \ + lighttpd-module-staticfile" +RRECOMMENDS_${PN} = "lighttpd-module-access \ + lighttpd-module-accesslog" + +SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.xz \ + file://index.html.lighttpd \ + file://lighttpd.conf \ + file://lighttpd \ + file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ + " + +SRC_URI[sha256sum] = "52ca961b89c12f7ecbb2e4e0c5a9e79b2863c64e33c42832a165e7f894d6217f" + +PACKAGECONFIG ??= "openssl pcre zlib \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" + +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" +PACKAGECONFIG[mmap] = "--enable-mmap,--disable-mmap" +PACKAGECONFIG[libev] = "--with-libev,--without-libev,libev" +PACKAGECONFIG[mysql] = "--with-mysql,--without-mysql,mariadb" +PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" +PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" +PACKAGECONFIG[krb5] = "--with-krb5,--without-krb5,krb5" +PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre" +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" +PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" +PACKAGECONFIG[webdav-props] = "--with-webdav-props,--without-webdav-props,libxml2 sqlite3" +PACKAGECONFIG[webdav-locks] = "--with-webdav-locks,--without-webdav-locks,util-linux" +PACKAGECONFIG[gdbm] = "--with-gdbm,--without-gdbm,gdbm" +PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached" +PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" + +EXTRA_OECONF += "--enable-lfs --without-fam" + +inherit autotools pkgconfig update-rc.d gettext systemd + +INITSCRIPT_NAME = "lighttpd" +INITSCRIPT_PARAMS = "defaults 70" + +SYSTEMD_SERVICE_${PN} = "lighttpd.service" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav + install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd + install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@BASE_BINDIR@,${base_bindir},g' \ + ${D}${systemd_unitdir}/system/lighttpd.service + #For FHS compliance, create symbolic links to /var/log and /var/tmp for logs and temporary data + ln -sf ${localstatedir}/log ${D}/www/logs + ln -sf ${localstatedir}/tmp ${D}/www/var +} + +FILES_${PN} += "${sysconfdir} /www" + +CONFFILES_${PN} = "${sysconfdir}/lighttpd/lighttpd.conf" + +PACKAGES_DYNAMIC += "^lighttpd-module-.*" + +python populate_packages_prepend () { + lighttpd_libdir = d.expand('${libdir}') + do_split_packages(d, lighttpd_libdir, r'^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') +} diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-ltp-pan-Use-long-long-int-to-print-time_t.patch b/poky/meta/recipes-extended/ltp/ltp/0001-ltp-pan-Use-long-long-int-to-print-time_t.patch new file mode 100644 index 000000000..381ac417c --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0001-ltp-pan-Use-long-long-int-to-print-time_t.patch @@ -0,0 +1,33 @@ +From 6c2085badea7b461245837c452a0d3d8a8c2afff Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 20 Dec 2020 22:09:28 -0800 +Subject: [PATCH] ltp-pan: Use long long int to print time_t + +Some newer 32bit architectures ( e.g. riscv32 ) uses 64bit time_t so +using %ld is not sufficient to print time_t, this also fixes a crash in +ltp-pan on riscv32 + +Upstream-Status: Submitted [https://patchwork.ozlabs.org/project/ltp/patch/20201221061415.2540216-1-raj.khem@gmail.com/] +Signed-off-by: Khem Raj +--- + pan/ltp-pan.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pan/ltp-pan.c b/pan/ltp-pan.c +index 8b9fbe5594..54b7cb8f26 100644 +--- a/pan/ltp-pan.c ++++ b/pan/ltp-pan.c +@@ -1389,8 +1389,8 @@ static void write_test_start(struct tag_pgrp *running, int no_kmsg) + if (!strcmp(reporttype, "rts")) { + + printf +- ("%s\ntag=%s stime=%ld\ncmdline=\"%s\"\ncontacts=\"%s\"\nanalysis=%s\n%s\n", +- "<<>>", running->cmd->name, running->mystime, ++ ("%s\ntag=%s stime=%lld\ncmdline=\"%s\"\ncontacts=\"%s\"\nanalysis=%s\n%s\n", ++ "<<>>", running->cmd->name, (long long)running->mystime, + running->cmd->cmdline, "", "exit", "<<>>"); + } + fflush(stdout); +-- +2.29.2 + diff --git a/poky/meta/recipes-extended/ltp/ltp_20200930.bb b/poky/meta/recipes-extended/ltp/ltp_20200930.bb index 7acf15b36..e3c49fbf5 100644 --- a/poky/meta/recipes-extended/ltp/ltp_20200930.bb +++ b/poky/meta/recipes-extended/ltp/ltp_20200930.bb @@ -34,6 +34,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ + file://0001-ltp-pan-Use-long-long-int-to-print-time_t.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/man-db/man-db_2.9.3.bb b/poky/meta/recipes-extended/man-db/man-db_2.9.3.bb index 0e6016a73..e8da92bd1 100644 --- a/poky/meta/recipes-extended/man-db/man-db_2.9.3.bb +++ b/poky/meta/recipes-extended/man-db/man-db_2.9.3.bb @@ -11,6 +11,7 @@ SRC_URI[sha256sum] = "fa5aa11ab0692daf737e76947f45669225db310b2801a5911bceb7551c DEPENDS = "libpipeline gdbm groff-native base-passwd" RDEPENDS_${PN} += "base-passwd" +PACKAGE_WRITE_DEPS += "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' USE_NLS_libc-musl = "no" @@ -20,6 +21,11 @@ inherit gettext pkgconfig autotools systemd EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_unitdir}/system" EXTRA_AUTORECONF += "-I ${S}/gl/m4" +# Can be dropped when the output next changes, avoids failures after +# reproducibility issues +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" + do_install() { autotools_do_install diff --git a/poky/meta/recipes-extended/man-pages/man-pages_5.09.bb b/poky/meta/recipes-extended/man-pages/man-pages_5.09.bb deleted file mode 100644 index 00d6eb5c2..000000000 --- a/poky/meta/recipes-extended/man-pages/man-pages_5.09.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Linux man-pages" -DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs" -SECTION = "console/utils" -HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" -LICENSE = "GPLv2+" - -LIC_FILES_CHKSUM = "file://README;md5=207f70f56526417514ac46b6680e314f" -SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" - -SRC_URI[sha256sum] = "3bd9029b94520c730fe1a1fb78ed7d8d878236da0f725ca86ee71c1969de6c4f" - -inherit manpages - -MAN_PKG = "${PN}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[manpages] = "" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - oe_runmake install DESTDIR=${D} -} - -# Only deliveres man-pages so FILES_${PN} gets everything -FILES_${PN}-doc = "" -FILES_${PN} = "${mandir}/*" - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "passwd.5 getspnam.3 crypt.3" -ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" -ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" -ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3" diff --git a/poky/meta/recipes-extended/man-pages/man-pages_5.10.bb b/poky/meta/recipes-extended/man-pages/man-pages_5.10.bb new file mode 100644 index 000000000..8874516aa --- /dev/null +++ b/poky/meta/recipes-extended/man-pages/man-pages_5.10.bb @@ -0,0 +1,36 @@ +SUMMARY = "Linux man-pages" +DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs" +SECTION = "console/utils" +HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM = "file://README;md5=207f70f56526417514ac46b6680e314f" +SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" + +SRC_URI[sha256sum] = "f2ce94a7250c49910db91806996699e1deac656097d4d53bdf56bdab4b61f228" + +inherit manpages + +MAN_PKG = "${PN}" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[manpages] = "" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + oe_runmake install DESTDIR=${D} +} + +# Only deliveres man-pages so FILES_${PN} gets everything +FILES_${PN}-doc = "" +FILES_${PN} = "${mandir}/*" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "passwd.5 getspnam.3 crypt.3" +ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" +ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" +ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3" diff --git a/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb b/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb index c584b7589..12003ff49 100644 --- a/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb +++ b/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb @@ -29,3 +29,5 @@ do_install() { } RRECOMMENDS_${PN} += "lrzsz" + +RDEPENDS_${PN} += "ncurses-terminfo-base" diff --git a/poky/meta/recipes-extended/msmtp/msmtp_1.8.13.bb b/poky/meta/recipes-extended/msmtp/msmtp_1.8.13.bb deleted file mode 100644 index 994f1c5d9..000000000 --- a/poky/meta/recipes-extended/msmtp/msmtp_1.8.13.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "msmtp is an SMTP client" -DESCRIPTION = "A sendmail replacement for use in MTAs like mutt" -HOMEPAGE = "https://marlam.de/msmtp/" -SECTION = "console/network" - -LICENSE = "GPLv3" -DEPENDS = "zlib gnutls" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" - -SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" -SRC_URI[sha256sum] = "ada945ab8d519102bb632f197273b3326ded25b38c003b0cf3861d1d6d4a9bb9" - -inherit gettext autotools update-alternatives pkgconfig - -EXTRA_OECONF += "--without-libsecret --without-libgsasl --without-libidn" - -ALTERNATIVE_${PN} = "sendmail" -# /usr/lib/sendmial is required by LSB core test -ALTERNATIVE_${PN}_linuxstdbase = "sendmail usr-lib-sendmail" -ALTERNATIVE_TARGET[sendmail] = "${bindir}/msmtp" -ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" -ALTERNATIVE_TARGET[usr-lib-sendmail] = "${bindir}/msmtp" -ALTERNATIVE_LINK_NAME[usr-lib-sendmail] = "/usr/lib/sendmail" -ALTERNATIVE_PRIORITY = "100" diff --git a/poky/meta/recipes-extended/msmtp/msmtp_1.8.14.bb b/poky/meta/recipes-extended/msmtp/msmtp_1.8.14.bb new file mode 100644 index 000000000..3bd5f9ede --- /dev/null +++ b/poky/meta/recipes-extended/msmtp/msmtp_1.8.14.bb @@ -0,0 +1,27 @@ +SUMMARY = "msmtp is an SMTP client" +DESCRIPTION = "A sendmail replacement for use in MTAs like mutt" +HOMEPAGE = "https://marlam.de/msmtp/" +SECTION = "console/network" + +LICENSE = "GPLv3" +DEPENDS = "zlib gnutls" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" + +SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" +SRC_URI[sha256sum] = "d56f065d711486e9c234618515a02a48a48dab4051b34f3e108fbecb6fb773b4" + +inherit gettext autotools update-alternatives pkgconfig + +EXTRA_OECONF += "--without-libsecret --without-libgsasl --without-libidn" + +ALTERNATIVE_${PN} = "sendmail" +# /usr/lib/sendmial is required by LSB core test +ALTERNATIVE_${PN}_linuxstdbase = "sendmail usr-lib-sendmail" +ALTERNATIVE_TARGET[sendmail] = "${bindir}/msmtp" +ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" +ALTERNATIVE_TARGET[usr-lib-sendmail] = "${bindir}/msmtp" +ALTERNATIVE_LINK_NAME[usr-lib-sendmail] = "/usr/lib/sendmail" +ALTERNATIVE_PRIORITY = "100" diff --git a/poky/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch b/poky/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch deleted file mode 100644 index c55b64813..000000000 --- a/poky/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 45d1ed58927593968faead7dbb295f3922f41a2f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 8 Aug 2015 14:16:43 -0700 -Subject: [PATCH] Add support for defining missing funcitonality - -In order to support alternative libc on linux ( musl, bioninc ) etc we -need to check for glibc-only features and provide alternatives, in this -list strndupa is first one, when configure detects that its not included -in system C library then the altrnative implementation from missing.h is -used - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - configure.ac | 3 +++ - libpam/include/missing.h | 12 ++++++++++++ - modules/pam_exec/pam_exec.c | 1 + - 3 files changed, 16 insertions(+) - create mode 100644 libpam/include/missing.h - -diff --git a/configure.ac b/configure.ac -index 9e1257f..cbed979 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -599,6 +599,9 @@ dnl - AC_CHECK_DECL(__NR_keyctl, [have_key_syscalls=1],[have_key_syscalls=0],[#include ]) - AC_CHECK_DECL(ENOKEY, [have_key_errors=1],[have_key_errors=0],[#include ]) - -+# musl and bionic don't have strndupa -+AC_CHECK_DECLS_ONCE([strndupa]) -+ - HAVE_KEY_MANAGEMENT=0 - if test $have_key_syscalls$have_key_errors = 11 - then -diff --git a/libpam/include/missing.h b/libpam/include/missing.h -new file mode 100644 -index 0000000..3cf011c ---- /dev/null -+++ b/libpam/include/missing.h -@@ -0,0 +1,12 @@ -+#pragma once -+ -+#if !HAVE_DECL_STRNDUPA -+#define strndupa(s, n) \ -+ ({ \ -+ const char *__old = (s); \ -+ size_t __len = strnlen(__old, (n)); \ -+ char *__new = alloca(__len + 1); \ -+ __new[__len] = '\0'; \ -+ memcpy(__new, __old, __len); \ -+ }) -+#endif -diff --git a/modules/pam_exec/pam_exec.c b/modules/pam_exec/pam_exec.c -index 17ba6ca..3aa2694 100644 ---- a/modules/pam_exec/pam_exec.c -+++ b/modules/pam_exec/pam_exec.c -@@ -59,6 +59,7 @@ - #include - #include - #include -+#include - - #define ENV_ITEM(n) { (n), #n } - static struct { --- -2.1.4 - diff --git a/poky/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch b/poky/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch new file mode 100644 index 000000000..5c6bc9270 --- /dev/null +++ b/poky/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch @@ -0,0 +1,28 @@ +From c09e012590c1ec2d3b622b64f1bfc10a2286c9ea Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Wed, 6 Jan 2021 12:08:20 +0800 +Subject: [PATCH] Makefile.am: support usrmage + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Changqing Li +--- + modules/pam_namespace/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am +index ddd5fc0..a1f1bec 100644 +--- a/modules/pam_namespace/Makefile.am ++++ b/modules/pam_namespace/Makefile.am +@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) + securelibdir = $(SECUREDIR) + secureconfdir = $(SCONFIGDIR) + namespaceddir = $(SCONFIGDIR)/namespace.d +-servicedir = /lib/systemd/system ++servicedir = $(systemd_system_unitdir) + + AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ + -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) +-- +2.17.1 + diff --git a/poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch b/poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch new file mode 100644 index 000000000..b41d1e596 --- /dev/null +++ b/poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch @@ -0,0 +1,28 @@ +From e2db4082f6b988f1d5803028e9e47aee5f3519ac Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 27 Dec 2020 00:30:45 +0100 +Subject: [PATCH] modules/pam_namespace/Makefile.am: correctly install systemd + unit file + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + modules/pam_namespace/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am +index 21e1b33..ddd5fc0 100644 +--- a/modules/pam_namespace/Makefile.am ++++ b/modules/pam_namespace/Makefile.am +@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) + securelibdir = $(SECUREDIR) + secureconfdir = $(SCONFIGDIR) + namespaceddir = $(SCONFIGDIR)/namespace.d +-servicedir = $(prefix)/lib/systemd/system ++servicedir = /lib/systemd/system + + AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ + -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) +-- +2.24.0 + diff --git a/poky/meta/recipes-extended/pam/libpam/crypt_configure.patch b/poky/meta/recipes-extended/pam/libpam/crypt_configure.patch deleted file mode 100644 index 917a8af64..000000000 --- a/poky/meta/recipes-extended/pam/libpam/crypt_configure.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b86575ab4a0df07da160283459da270e1c0372a0 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" -Date: Tue, 24 May 2016 14:11:09 +0300 -Subject: [PATCH] crypt_configure - -This patch fixes a case where it find crypt defined in libc (musl) but -not in specified libraries then it ends up assigning -LIBCRYPT="-l" which then goes into makefile cause all sort of problems -e.g. - -ld: cannot find -l-m32 -| collect2: error: ld returned 1 exit status -The reason is that -l appears on commandline with -out any library and compiler treats the next argument as library name -whatever it is. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -Signed-off-by: Maxin B. John ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index df39d07..e68d856 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -401,7 +401,7 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], - [crypt_libs="crypt"]) - - BACKUP_LIBS=$LIBS --AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="${ac_lib:+-l$ac_lib}", LIBCRYPT="") -+AC_SEARCH_LIBS([crypt],[$crypt_libs], [test "$ac_cv_search_crypt" = "none required" || LIBCRYPT="$ac_cv_search_crypt"]) - AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) - LIBS=$BACKUP_LIBS - AC_SUBST(LIBCRYPT) --- -2.4.0 - diff --git a/poky/meta/recipes-extended/pam/libpam/include_paths_header.patch b/poky/meta/recipes-extended/pam/libpam/include_paths_header.patch deleted file mode 100644 index e4eb95669..000000000 --- a/poky/meta/recipes-extended/pam/libpam/include_paths_header.patch +++ /dev/null @@ -1,59 +0,0 @@ -This patch adds missing include for paths.h which should provide -_PATH_LASTLOG definition - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -Index: Linux-PAM-1.1.6/modules/pam_lastlog/pam_lastlog.c -=================================================================== ---- Linux-PAM-1.1.6.orig/modules/pam_lastlog/pam_lastlog.c -+++ Linux-PAM-1.1.6/modules/pam_lastlog/pam_lastlog.c -@@ -23,9 +23,11 @@ - #include - #include - #include -+#include - #include - #include - #include -+#include - - #if defined(hpux) || defined(sunos) || defined(solaris) - # ifndef _PATH_LASTLOG -@@ -332,6 +334,23 @@ last_login_read(pam_handle_t *pamh, int - return retval; - } - -+#ifndef __GLIBC__ -+static void logwtmp(const char * line, const char * name, const char * host) -+{ -+ struct utmp u; -+ memset(&u, 0, sizeof(u)); -+ -+ u.ut_pid = getpid(); -+ u.ut_type = name[0] ? USER_PROCESS : DEAD_PROCESS; -+ strncpy(u.ut_line, line, sizeof(u.ut_line)); -+ strncpy(u.ut_name, name, sizeof(u.ut_name)); -+ strncpy(u.ut_host, host, sizeof(u.ut_host)); -+ gettimeofday(&(u.ut_tv), NULL); -+ -+ updwtmp(_PATH_WTMP, &u); -+} -+#endif /* __GLIBC__ */ -+ - static int - last_login_write(pam_handle_t *pamh, int announce, int last_fd, - uid_t uid, const char *user) -Index: Linux-PAM-1.1.6/modules/Makefile.am -=================================================================== ---- Linux-PAM-1.1.6.orig/modules/Makefile.am -+++ Linux-PAM-1.1.6/modules/Makefile.am -@@ -7,7 +7,7 @@ SUBDIRS = pam_access pam_cracklib pam_de - pam_group pam_issue pam_keyinit pam_lastlog pam_limits \ - pam_listfile pam_localuser pam_loginuid pam_mail \ - pam_mkhomedir pam_motd pam_namespace pam_nologin \ -- pam_permit pam_pwhistory pam_rhosts pam_rootok pam_securetty \ -+ pam_permit pam_pwhistory pam_rootok pam_securetty \ - pam_selinux pam_sepermit pam_shells pam_stress \ - pam_succeed_if pam_tally pam_tally2 pam_time pam_timestamp \ - pam_tty_audit pam_umask \ diff --git a/poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch b/poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch deleted file mode 100644 index 9b8d4c297..000000000 --- a/poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch +++ /dev/null @@ -1,203 +0,0 @@ -Description: extract the securetty logic for use with the "nullok_secure" option - introduced in the "055_pam_unix_nullok_secure" patch. - -Upstream-Status: Pending - -Signed-off-by: Ming Liu -=================================================================== -Index: Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am -=================================================================== ---- Linux-PAM-1.3.0.orig/modules/pam_securetty/Makefile.am -+++ Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am -@@ -24,6 +24,10 @@ endif - securelib_LTLIBRARIES = pam_securetty.la - pam_securetty_la_LIBADD = $(top_builddir)/libpam/libpam.la - -+pam_securetty_la_SOURCES = \ -+ pam_securetty.c \ -+ tty_secure.c -+ - if ENABLE_REGENERATE_MAN - noinst_DATA = README - README: pam_securetty.8.xml -Index: Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c -=================================================================== ---- Linux-PAM-1.3.0.orig/modules/pam_securetty/pam_securetty.c -+++ Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c -@@ -1,7 +1,5 @@ - /* pam_securetty module */ - --#define SECURETTY_FILE "/etc/securetty" --#define TTY_PREFIX "/dev/" - #define CMDLINE_FILE "/proc/cmdline" - #define CONSOLEACTIVE_FILE "/sys/class/tty/console/active" - -@@ -40,6 +38,9 @@ - #include - #include - -+extern int _pammodutil_tty_secure(const pam_handle_t *pamh, -+ const char *uttyname); -+ - #define PAM_DEBUG_ARG 0x0001 - #define PAM_NOCONSOLE_ARG 0x0002 - -@@ -73,11 +74,7 @@ securetty_perform_check (pam_handle_t *p - const char *username; - const char *uttyname; - const void *void_uttyname; -- char ttyfileline[256]; -- char ptname[256]; -- struct stat ttyfileinfo; - struct passwd *user_pwd; -- FILE *ttyfile; - - /* log a trail for debugging */ - if (ctrl & PAM_DEBUG_ARG) { -@@ -105,50 +102,7 @@ securetty_perform_check (pam_handle_t *p - return PAM_SERVICE_ERR; - } - -- /* The PAM_TTY item may be prefixed with "/dev/" - skip that */ -- if (strncmp(TTY_PREFIX, uttyname, sizeof(TTY_PREFIX)-1) == 0) { -- uttyname += sizeof(TTY_PREFIX)-1; -- } -- -- if (stat(SECURETTY_FILE, &ttyfileinfo)) { -- pam_syslog(pamh, LOG_NOTICE, "Couldn't open %s: %m", SECURETTY_FILE); -- return PAM_SUCCESS; /* for compatibility with old securetty handling, -- this needs to succeed. But we still log the -- error. */ -- } -- -- if ((ttyfileinfo.st_mode & S_IWOTH) || !S_ISREG(ttyfileinfo.st_mode)) { -- /* If the file is world writable or is not a -- normal file, return error */ -- pam_syslog(pamh, LOG_ERR, -- "%s is either world writable or not a normal file", -- SECURETTY_FILE); -- return PAM_AUTH_ERR; -- } -- -- ttyfile = fopen(SECURETTY_FILE,"r"); -- if (ttyfile == NULL) { /* Check that we opened it successfully */ -- pam_syslog(pamh, LOG_ERR, "Error opening %s: %m", SECURETTY_FILE); -- return PAM_SERVICE_ERR; -- } -- -- if (isdigit(uttyname[0])) { -- snprintf(ptname, sizeof(ptname), "pts/%s", uttyname); -- } else { -- ptname[0] = '\0'; -- } -- -- retval = 1; -- -- while ((fgets(ttyfileline, sizeof(ttyfileline)-1, ttyfile) != NULL) -- && retval) { -- if (ttyfileline[strlen(ttyfileline) - 1] == '\n') -- ttyfileline[strlen(ttyfileline) - 1] = '\0'; -- -- retval = ( strcmp(ttyfileline, uttyname) -- && (!ptname[0] || strcmp(ptname, uttyname)) ); -- } -- fclose(ttyfile); -+ retval = _pammodutil_tty_secure(pamh, uttyname); - - if (retval && !(ctrl & PAM_NOCONSOLE_ARG)) { - FILE *cmdlinefile; -Index: Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c -=================================================================== ---- /dev/null -+++ Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c -@@ -0,0 +1,90 @@ -+/* -+ * A function to determine if a particular line is in /etc/securetty -+ */ -+ -+ -+#define SECURETTY_FILE "/etc/securetty" -+#define TTY_PREFIX "/dev/" -+ -+/* This function taken out of pam_securetty by Sam Hartman -+ * */ -+/* -+ * by Elliot Lee , Red Hat Software. -+ * July 25, 1996. -+ * Slight modifications AGM. 1996/12/3 -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+extern int _pammodutil_tty_secure(const pam_handle_t *pamh, -+ const char *uttyname); -+ -+int _pammodutil_tty_secure(const pam_handle_t *pamh, const char *uttyname) -+{ -+ int retval = PAM_AUTH_ERR; -+ char ttyfileline[256]; -+ char ptname[256]; -+ struct stat ttyfileinfo; -+ FILE *ttyfile; -+ /* The PAM_TTY item may be prefixed with "/dev/" - skip that */ -+ if (strncmp(TTY_PREFIX, uttyname, sizeof(TTY_PREFIX)-1) == 0) -+ uttyname += sizeof(TTY_PREFIX)-1; -+ -+ if (stat(SECURETTY_FILE, &ttyfileinfo)) { -+ pam_syslog(pamh, LOG_NOTICE, "Couldn't open %s: %m", -+ SECURETTY_FILE); -+ return PAM_SUCCESS; /* for compatibility with old securetty handling, -+ this needs to succeed. But we still log the -+ error. */ -+ } -+ -+ if ((ttyfileinfo.st_mode & S_IWOTH) || !S_ISREG(ttyfileinfo.st_mode)) { -+ /* If the file is world writable or is not a -+ normal file, return error */ -+ pam_syslog(pamh, LOG_ERR, -+ "%s is either world writable or not a normal file", -+ SECURETTY_FILE); -+ return PAM_AUTH_ERR; -+ } -+ -+ ttyfile = fopen(SECURETTY_FILE,"r"); -+ if(ttyfile == NULL) { /* Check that we opened it successfully */ -+ pam_syslog(pamh, LOG_ERR, "Error opening %s: %m", SECURETTY_FILE); -+ return PAM_SERVICE_ERR; -+ } -+ -+ if (isdigit(uttyname[0])) { -+ snprintf(ptname, sizeof(ptname), "pts/%s", uttyname); -+ } else { -+ ptname[0] = '\0'; -+ } -+ -+ retval = 1; -+ -+ while ((fgets(ttyfileline,sizeof(ttyfileline)-1, ttyfile) != NULL) -+ && retval) { -+ if(ttyfileline[strlen(ttyfileline) - 1] == '\n') -+ ttyfileline[strlen(ttyfileline) - 1] = '\0'; -+ retval = ( strcmp(ttyfileline,uttyname) -+ && (!ptname[0] || strcmp(ptname, uttyname)) ); -+ } -+ fclose(ttyfile); -+ -+ if(retval) { -+ retval = PAM_AUTH_ERR; -+ } -+ -+ return retval; -+} diff --git a/poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch b/poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch deleted file mode 100644 index d2cc66882..000000000 --- a/poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch +++ /dev/null @@ -1,195 +0,0 @@ -From b6545b83f94c5fb7aec1478b8d458a1393f479c8 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" -Date: Wed, 25 May 2016 14:12:25 +0300 -Subject: [PATCH] pam_unix: support 'nullok_secure' option - -Debian patch to add a new 'nullok_secure' option to pam_unix, -which accepts users with null passwords only when the applicant is -connected from a tty listed in /etc/securetty. - -Authors: Sam Hartman , - Steve Langasek - -Upstream-Status: Pending - -Signed-off-by: Ming Liu -Signed-off-by: Amarnath Valluri -Signed-off-by: Maxin B. John ---- - modules/pam_unix/Makefile.am | 3 ++- - modules/pam_unix/pam_unix.8.xml | 19 ++++++++++++++++++- - modules/pam_unix/support.c | 40 +++++++++++++++++++++++++++++++++++----- - modules/pam_unix/support.h | 8 ++++++-- - 4 files changed, 61 insertions(+), 9 deletions(-) - -diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am -index 56df178..2bba460 100644 ---- a/modules/pam_unix/Makefile.am -+++ b/modules/pam_unix/Makefile.am -@@ -30,7 +30,8 @@ if HAVE_VERSIONING - pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map - endif - pam_unix_la_LIBADD = $(top_builddir)/libpam/libpam.la \ -- @LIBCRYPT@ @LIBSELINUX@ @TIRPC_LIBS@ @NSL_LIBS@ -+ @LIBCRYPT@ @LIBSELINUX@ @TIRPC_LIBS@ @NSL_LIBS@ \ -+ ../pam_securetty/tty_secure.lo - - securelib_LTLIBRARIES = pam_unix.la - -diff --git a/modules/pam_unix/pam_unix.8.xml b/modules/pam_unix/pam_unix.8.xml -index 1b318f1..be0330e 100644 ---- a/modules/pam_unix/pam_unix.8.xml -+++ b/modules/pam_unix/pam_unix.8.xml -@@ -159,7 +159,24 @@ - - The default action of this module is to not permit the - user access to a service if their official password is blank. -- The argument overrides this default. -+ The argument overrides this default -+ and allows any user with a blank password to access the -+ service. -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ The default action of this module is to not permit the -+ user access to a service if their official password is blank. -+ The argument overrides this -+ default and allows any user with a blank password to access -+ the service as long as the value of PAM_TTY is set to one of -+ the values found in /etc/securetty. - - - -diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c -index fc8595e..29e3341 100644 ---- a/modules/pam_unix/support.c -+++ b/modules/pam_unix/support.c -@@ -183,13 +183,22 @@ int _set_ctrl(pam_handle_t *pamh, int flags, int *remember, int *rounds, - /* now parse the arguments to this module */ - - for (; argc-- > 0; ++argv) { -+ int sl; - - D(("pam_unix arg: %s", *argv)); - - for (j = 0; j < UNIX_CTRLS_; ++j) { -- if (unix_args[j].token -- && !strncmp(*argv, unix_args[j].token, strlen(unix_args[j].token))) { -- break; -+ if (unix_args[j].token) { -+ sl = strlen(unix_args[j].token); -+ if (unix_args[j].token[sl-1] == '=') { -+ /* exclude argument from comparison */ -+ if (!strncmp(*argv, unix_args[j].token, sl)) -+ break; -+ } else { -+ /* compare full strings */ -+ if (!strcmp(*argv, unix_args[j].token)) -+ break; -+ } - } - } - -@@ -560,6 +569,7 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, - if (child == 0) { - static char *envp[] = { NULL }; - const char *args[] = { NULL, NULL, NULL, NULL }; -+ int nullok = off(UNIX__NONULL, ctrl); - - /* XXX - should really tidy up PAM here too */ - -@@ -587,7 +597,16 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, - /* exec binary helper */ - args[0] = CHKPWD_HELPER; - args[1] = user; -- if (off(UNIX__NONULL, ctrl)) { /* this means we've succeeded */ -+ if (on(UNIX_NULLOK_SECURE, ctrl)) { -+ const void *uttyname; -+ retval = pam_get_item(pamh, PAM_TTY, &uttyname); -+ if (retval != PAM_SUCCESS || uttyname == NULL -+ || _pammodutil_tty_secure(pamh, (const char *)uttyname) != PAM_SUCCESS) { -+ nullok = 0; -+ } -+ } -+ -+ if (nullok) { - args[2]="nullok"; - } else { - args[2]="nonull"; -@@ -672,6 +691,17 @@ _unix_blankpasswd (pam_handle_t *pamh, unsigned int ctrl, const char *name) - if (on(UNIX__NONULL, ctrl)) - return 0; /* will fail but don't let on yet */ - -+ if (on(UNIX_NULLOK_SECURE, ctrl)) { -+ int retval2; -+ const void *uttyname; -+ retval2 = pam_get_item(pamh, PAM_TTY, &uttyname); -+ if (retval2 != PAM_SUCCESS || uttyname == NULL) -+ return 0; -+ -+ if (_pammodutil_tty_secure(pamh, (const char *)uttyname) != PAM_SUCCESS) -+ return 0; -+ } -+ - /* UNIX passwords area */ - - retval = get_pwd_hash(pamh, name, &pwd, &salt); -@@ -758,7 +788,7 @@ int _unix_verify_password(pam_handle_t * pamh, const char *name - } - } - } else { -- retval = verify_pwd_hash(p, salt, off(UNIX__NONULL, ctrl)); -+ retval = verify_pwd_hash(p, salt, _unix_blankpasswd(pamh, ctrl, name)); - } - - if (retval == PAM_SUCCESS) { -diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h -index b4c279c..8da4a8e 100644 ---- a/modules/pam_unix/support.h -+++ b/modules/pam_unix/support.h -@@ -98,8 +98,9 @@ typedef struct { - #define UNIX_QUIET 28 /* Don't print informational messages */ - #define UNIX_NO_PASS_EXPIRY 29 /* Don't check for password expiration if not used for authentication */ - #define UNIX_DES 30 /* DES, default */ -+#define UNIX_NULLOK_SECURE 31 /* NULL passwords allowed only on secure ttys */ - /* -------------- */ --#define UNIX_CTRLS_ 31 /* number of ctrl arguments defined */ -+#define UNIX_CTRLS_ 32 /* number of ctrl arguments defined */ - - #define UNIX_DES_CRYPT(ctrl) (off(UNIX_MD5_PASS,ctrl)&&off(UNIX_BIGCRYPT,ctrl)&&off(UNIX_SHA256_PASS,ctrl)&&off(UNIX_SHA512_PASS,ctrl)&&off(UNIX_BLOWFISH_PASS,ctrl)) - -@@ -117,7 +118,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = - /* UNIX_AUTHTOK_TYPE */ {"authtok_type=", _ALL_ON_, 0100, 0}, - /* UNIX__PRELIM */ {NULL, _ALL_ON_^(0600), 0200, 0}, - /* UNIX__UPDATE */ {NULL, _ALL_ON_^(0600), 0400, 0}, --/* UNIX__NONULL */ {NULL, _ALL_ON_, 01000, 0}, -+/* UNIX__NONULL */ {NULL, _ALL_ON_^(02000000000), 01000, 0}, - /* UNIX__QUIET */ {NULL, _ALL_ON_, 02000, 0}, - /* UNIX_USE_AUTHTOK */ {"use_authtok", _ALL_ON_, 04000, 0}, - /* UNIX_SHADOW */ {"shadow", _ALL_ON_, 010000, 0}, -@@ -139,6 +140,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = - /* UNIX_QUIET */ {"quiet", _ALL_ON_, 01000000000, 0}, - /* UNIX_NO_PASS_EXPIRY */ {"no_pass_expiry", _ALL_ON_, 02000000000, 0}, - /* UNIX_DES */ {"des", _ALL_ON_^(0260420000), 0, 1}, -+/* UNIX_NULLOK_SECURE */ {"nullok_secure", _ALL_ON_^(01000), 02000000000, 0}, - }; - - #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag) -@@ -172,6 +174,8 @@ extern int _unix_read_password(pam_handle_t * pamh - ,const char *data_name - ,const void **pass); - -+extern int _pammodutil_tty_secure(const pam_handle_t *pamh, const char *uttyname); -+ - extern int _unix_run_verify_binary(pam_handle_t *pamh, - unsigned int ctrl, const char *user, int *daysleft); - #endif /* _PAM_UNIX_SUPPORT_H */ --- -2.4.0 - diff --git a/poky/meta/recipes-extended/pam/libpam_1.3.1.bb b/poky/meta/recipes-extended/pam/libpam_1.3.1.bb deleted file mode 100644 index bc72afe6a..000000000 --- a/poky/meta/recipes-extended/pam/libpam_1.3.1.bb +++ /dev/null @@ -1,168 +0,0 @@ -DISABLE_STATIC = "" -SUMMARY = "Linux-PAM (Pluggable Authentication Modules)" -DESCRIPTION = "Linux-PAM (Pluggable Authentication Modules for Linux), a flexible mechanism for authenticating users" -HOMEPAGE = "https://fedorahosted.org/linux-pam/" -BUGTRACKER = "https://fedorahosted.org/linux-pam/newticket" -SECTION = "base" -# PAM is dual licensed under GPL and BSD. -# /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time -# libpam-runtime-1.0.1 is GPLv2+), by openembedded -LICENSE = "GPLv2+ | BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 \ - file://libpamc/License;md5=a4da476a14c093fdc73be3c3c9ba8fb3 \ - " - -SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux-PAM-${PV}.tar.xz \ - file://99_pam \ - file://pam.d/common-account \ - file://pam.d/common-auth \ - file://pam.d/common-password \ - file://pam.d/common-session \ - file://pam.d/common-session-noninteractive \ - file://pam.d/other \ - file://libpam-xtests.patch \ - file://pam-security-abstract-securetty-handling.patch \ - file://pam-unix-nullok-secure.patch \ - file://crypt_configure.patch \ - " - -SRC_URI[md5sum] = "558ff53b0fc0563ca97f79e911822165" -SRC_URI[sha256sum] = "eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db" - -SRC_URI_append_libc-musl = " file://0001-Add-support-for-defining-missing-funcitonality.patch \ - file://include_paths_header.patch \ - " - -DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt" - -EXTRA_OECONF = "--includedir=${includedir}/security \ - --libdir=${base_libdir} \ - --disable-nis \ - --disable-regenerate-docu \ - --disable-prelude" - -CFLAGS_append = " -fPIC " - -S = "${WORKDIR}/Linux-PAM-${PV}" - -inherit autotools gettext pkgconfig - -PACKAGECONFIG ??= "" -PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," -PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," - -PACKAGES += "${PN}-runtime ${PN}-xtests" -FILES_${PN} = "${base_libdir}/lib*${SOLIBS}" -FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" -FILES_${PN}-runtime = "${sysconfdir}" -FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" - -PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" - -def get_multilib_bit(d): - baselib = d.getVar('baselib') or '' - return baselib.replace('lib', '') - -libpam_suffix = "suffix${@get_multilib_bit(d)}" - -RPROVIDES_${PN} += "${PN}-${libpam_suffix}" -RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" - -RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \ - " -RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-succeed-if-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-time-${libpam_suffix} \ - coreutils" - -# FIXME: Native suffix breaks here, disable it for now -RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" -RRECOMMENDS_${PN}_class-native = "" - -python populate_packages_prepend () { - def pam_plugin_append_file(pn, dir, file): - nf = os.path.join(dir, file) - of = d.getVar('FILES_' + pn) - if of: - nf = of + " " + nf - d.setVar('FILES_' + pn, nf) - - def pam_plugin_hook(file, pkg, pattern, format, basename): - pn = d.getVar('PN') - libpam_suffix = d.getVar('libpam_suffix') - - rdeps = d.getVar('RDEPENDS_' + pkg) - if rdeps: - rdeps = rdeps + " " + pn + "-" + libpam_suffix - else: - rdeps = pn + "-" + libpam_suffix - d.setVar('RDEPENDS_' + pkg, rdeps) - - provides = d.getVar('RPROVIDES_' + pkg) - if provides: - provides = provides + " " + pkg + "-" + libpam_suffix - else: - provides = pkg + "-" + libpam_suffix - d.setVar('RPROVIDES_' + pkg, provides) - - mlprefix = d.getVar('MLPREFIX') or '' - dvar = d.expand('${WORKDIR}/package') - pam_libdir = d.expand('${base_libdir}/security') - pam_sbindir = d.expand('${sbindir}') - pam_filterdir = d.expand('${base_libdir}/security/pam_filter') - pam_pkgname = mlprefix + 'pam-plugin%s' - - do_split_packages(d, pam_libdir, r'^pam(.*)\.so$', pam_pkgname, - 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='') - pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd') - pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update') - pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally') - pam_plugin_append_file('%spam-plugin-tally2' % mlprefix, pam_sbindir, 'pam_tally2') - pam_plugin_append_file('%spam-plugin-timestamp' % mlprefix, pam_sbindir, 'pam_timestamp_check') - pam_plugin_append_file('%spam-plugin-mkhomedir' % mlprefix, pam_sbindir, 'mkhomedir_helper') - pam_plugin_append_file('%spam-plugin-console' % mlprefix, pam_sbindir, 'pam_console_apply') - do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') -} - -do_install() { - autotools_do_install - - # don't install /var/run when populating rootfs. Do it through volatile - rm -rf ${D}${localstatedir} - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/99_pam ${D}${sysconfdir}/default/volatiles - - install -d ${D}${sysconfdir}/pam.d/ - install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ - - # The lsb requires unix_chkpwd has setuid permission - chmod 4755 ${D}${sbindir}/unix_chkpwd - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session - fi -} - -inherit features_check -REQUIRED_DISTRO_FEATURES = "pam" - -BBCLASSEXTEND = "nativesdk native" - -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-auth" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-password" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-account" -CONFFILES_${PN}-runtime += "${sysconfdir}/security/limits.conf" - -UPSTREAM_CHECK_URI = "https://github.com/linux-pam/linux-pam/releases" - -CVE_PRODUCT = "linux-pam" diff --git a/poky/meta/recipes-extended/pam/libpam_1.5.1.bb b/poky/meta/recipes-extended/pam/libpam_1.5.1.bb new file mode 100644 index 000000000..8c008a970 --- /dev/null +++ b/poky/meta/recipes-extended/pam/libpam_1.5.1.bb @@ -0,0 +1,162 @@ +DISABLE_STATIC = "" +SUMMARY = "Linux-PAM (Pluggable Authentication Modules)" +DESCRIPTION = "Linux-PAM (Pluggable Authentication Modules for Linux), a flexible mechanism for authenticating users" +HOMEPAGE = "https://fedorahosted.org/linux-pam/" +BUGTRACKER = "https://fedorahosted.org/linux-pam/newticket" +SECTION = "base" +# PAM is dual licensed under GPL and BSD. +# /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time +# libpam-runtime-1.0.1 is GPLv2+), by openembedded +LICENSE = "GPLv2+ | BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 \ + file://libpamc/License;md5=a4da476a14c093fdc73be3c3c9ba8fb3 \ + " + +SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux-PAM-${PV}.tar.xz \ + file://99_pam \ + file://pam.d/common-account \ + file://pam.d/common-auth \ + file://pam.d/common-password \ + file://pam.d/common-session \ + file://pam.d/common-session-noninteractive \ + file://pam.d/other \ + file://libpam-xtests.patch \ + file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \ + file://0001-Makefile.am-support-usrmage.patch \ + " + +SRC_URI[sha256sum] = "201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc" + +DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt" + +EXTRA_OECONF = "--includedir=${includedir}/security \ + --libdir=${base_libdir} \ + --disable-nis \ + --disable-regenerate-docu \ + --disable-doc \ + --disable-prelude" + +CFLAGS_append = " -fPIC " + +S = "${WORKDIR}/Linux-PAM-${PV}" + +inherit autotools gettext pkgconfig systemd + +PACKAGECONFIG ??= "" +PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," +PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," + +PACKAGES += "${PN}-runtime ${PN}-xtests" +FILES_${PN} = "${base_libdir}/lib*${SOLIBS}" +FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" +FILES_${PN}-runtime = "${sysconfdir} ${sbindir} ${systemd_system_unitdir}" +FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" + +PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" + +def get_multilib_bit(d): + baselib = d.getVar('baselib') or '' + return baselib.replace('lib', '') + +libpam_suffix = "suffix${@get_multilib_bit(d)}" + +RPROVIDES_${PN} += "${PN}-${libpam_suffix}" +RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" + +RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \ + " +RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-succeed-if-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-time-${libpam_suffix} \ + bash coreutils" + +# FIXME: Native suffix breaks here, disable it for now +RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" +RRECOMMENDS_${PN}_class-native = "" + +python populate_packages_prepend () { + def pam_plugin_append_file(pn, dir, file): + nf = os.path.join(dir, file) + of = d.getVar('FILES_' + pn) + if of: + nf = of + " " + nf + d.setVar('FILES_' + pn, nf) + + def pam_plugin_hook(file, pkg, pattern, format, basename): + pn = d.getVar('PN') + libpam_suffix = d.getVar('libpam_suffix') + + rdeps = d.getVar('RDEPENDS_' + pkg) + if rdeps: + rdeps = rdeps + " " + pn + "-" + libpam_suffix + else: + rdeps = pn + "-" + libpam_suffix + d.setVar('RDEPENDS_' + pkg, rdeps) + + provides = d.getVar('RPROVIDES_' + pkg) + if provides: + provides = provides + " " + pkg + "-" + libpam_suffix + else: + provides = pkg + "-" + libpam_suffix + d.setVar('RPROVIDES_' + pkg, provides) + + mlprefix = d.getVar('MLPREFIX') or '' + dvar = d.expand('${WORKDIR}/package') + pam_libdir = d.expand('${base_libdir}/security') + pam_sbindir = d.expand('${sbindir}') + pam_filterdir = d.expand('${base_libdir}/security/pam_filter') + pam_pkgname = mlprefix + 'pam-plugin%s' + + do_split_packages(d, pam_libdir, r'^pam(.*)\.so$', pam_pkgname, + 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='') + pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd') + pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update') + pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally') + pam_plugin_append_file('%spam-plugin-tally2' % mlprefix, pam_sbindir, 'pam_tally2') + pam_plugin_append_file('%spam-plugin-timestamp' % mlprefix, pam_sbindir, 'pam_timestamp_check') + pam_plugin_append_file('%spam-plugin-mkhomedir' % mlprefix, pam_sbindir, 'mkhomedir_helper') + pam_plugin_append_file('%spam-plugin-console' % mlprefix, pam_sbindir, 'pam_console_apply') + do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') +} + +do_install() { + autotools_do_install + + # don't install /var/run when populating rootfs. Do it through volatile + rm -rf ${D}${localstatedir} + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/99_pam ${D}${sysconfdir}/default/volatiles + + install -d ${D}${sysconfdir}/pam.d/ + install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ + + # The lsb requires unix_chkpwd has setuid permission + chmod 4755 ${D}${sbindir}/unix_chkpwd + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session + fi +} + +inherit features_check +REQUIRED_DISTRO_FEATURES = "pam" + +BBCLASSEXTEND = "nativesdk native" + +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session" +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-auth" +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-password" +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-account" +CONFFILES_${PN}-runtime += "${sysconfdir}/security/limits.conf" + +UPSTREAM_CHECK_URI = "https://github.com/linux-pam/linux-pam/releases" + +CVE_PRODUCT = "linux-pam" diff --git a/poky/meta/recipes-extended/parted/parted_3.3.bb b/poky/meta/recipes-extended/parted/parted_3.3.bb index a1fd3ef07..ce40c04ad 100644 --- a/poky/meta/recipes-extended/parted/parted_3.3.bb +++ b/poky/meta/recipes-extended/parted/parted_3.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" SECTION = "console/tools" -DEPENDS = "ncurses readline util-linux virtual/libiconv" +DEPENDS = "ncurses util-linux virtual/libiconv" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://no_check.patch \ @@ -22,6 +22,9 @@ EXTRA_OECONF = "--disable-device-mapper" inherit autotools pkgconfig gettext texinfo ptest +PACKAGECONFIG ?= "readline" +PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" + BBCLASSEXTEND = "native nativesdk" do_compile_ptest() { diff --git a/poky/meta/recipes-extended/sed/sed_4.8.bb b/poky/meta/recipes-extended/sed/sed_4.8.bb index 39e3a61df..048db47e1 100644 --- a/poky/meta/recipes-extended/sed/sed_4.8.bb +++ b/poky/meta/recipes-extended/sed/sed_4.8.bb @@ -63,3 +63,5 @@ do_install_ptest() { } RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sed', '', d)}" + +BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-extended/shadow/shadow.inc b/poky/meta/recipes-extended/shadow/shadow.inc index f86e5e03c..4ae7a78c5 100644 --- a/poky/meta/recipes-extended/shadow/shadow.inc +++ b/poky/meta/recipes-extended/shadow/shadow.inc @@ -71,6 +71,8 @@ PAM_PLUGINS = "libpam-runtime \ pam-plugin-shells \ pam-plugin-rootok" +PAM_PLUGINS_remove_libc-musl = "pam-plugin-lastlog" + PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" PACKAGECONFIG_class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.24.bb b/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.24.bb deleted file mode 100644 index 3516c1545..000000000 --- a/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.24.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "System load testing utility" -DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \ -imposes a configurable amount of CPU, memory, I/O, and disk stress on the system." -HOMEPAGE = "https://kernel.ubuntu.com/~cking/stress-ng/" -LICENSE = "GPLv2" -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 \ - file://no_daddr_t.patch \ - " -SRC_URI[sha256sum] = "5b3a724a85eed48743dedf37eab851b617ecf921b7fff427c6d0bbf405534671" - -DEPENDS = "coreutils-native" - -PROVIDES = "stress" -RPROVIDES_${PN} = "stress" -RREPLACES_${PN} = "stress" -RCONFLICTS_${PN} = "stress" - -inherit bash-completion - -do_install() { - oe_runmake DESTDIR=${D} install - ln -s stress-ng ${D}${bindir}/stress -} - diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.00.bb b/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.00.bb new file mode 100644 index 000000000..3b38b3989 --- /dev/null +++ b/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.00.bb @@ -0,0 +1,27 @@ +SUMMARY = "System load testing utility" +DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \ +imposes a configurable amount of CPU, memory, I/O, and disk stress on the system." +HOMEPAGE = "https://kernel.ubuntu.com/~cking/stress-ng/" +LICENSE = "GPLv2" +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 \ + file://no_daddr_t.patch \ + " +SRC_URI[sha256sum] = "b2b738f574671926654b1623103a7aa58ee6911894ac78760ee188c4bfa96fe2" + +DEPENDS = "coreutils-native" + +PROVIDES = "stress" +RPROVIDES_${PN} = "stress" +RREPLACES_${PN} = "stress" +RCONFLICTS_${PN} = "stress" + +inherit bash-completion + +do_install() { + oe_runmake DESTDIR=${D} install + ln -s stress-ng ${D}${bindir}/stress +} + diff --git a/poky/meta/recipes-extended/sudo/sudo_1.9.3p1.bb b/poky/meta/recipes-extended/sudo/sudo_1.9.3p1.bb deleted file mode 100644 index ba61a7f24..000000000 --- a/poky/meta/recipes-extended/sudo/sudo_1.9.3p1.bb +++ /dev/null @@ -1,49 +0,0 @@ -require sudo.inc - -SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ - file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \ - " - -PAM_SRC_URI = "file://sudo.pam" - -SRC_URI[sha256sum] = "dcb9de53e45e1c39042074b847f5e0d8ae1890725dd6a9d9101a81569e6eb49e" - -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 += " \ - ${@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-rundir=/run/sudo \ - --with-vardir=/var/lib/sudo \ - --libexecdir=${libdir} \ - " - -do_install_append () { - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then - install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo - if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then - echo 'auth required pam_wheel.so use_uid' >>${D}${sysconfdir}/pam.d/sudo - sed -i 's/# \(%wheel ALL=(ALL) ALL\)/\1/' ${D}${sysconfdir}/sudoers - fi - fi - - chmod 4111 ${D}${bindir}/sudo - chmod 0440 ${D}${sysconfdir}/sudoers - - # Explicitly remove the /sudo directory to avoid QA error - rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo -} - -FILES_${PN} += "${nonarch_libdir}/tmpfiles.d" -FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la \ - ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" diff --git a/poky/meta/recipes-extended/sudo/sudo_1.9.4p1.bb b/poky/meta/recipes-extended/sudo/sudo_1.9.4p1.bb new file mode 100644 index 000000000..040130b49 --- /dev/null +++ b/poky/meta/recipes-extended/sudo/sudo_1.9.4p1.bb @@ -0,0 +1,49 @@ +require sudo.inc + +SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \ + " + +PAM_SRC_URI = "file://sudo.pam" + +SRC_URI[sha256sum] = "1172099dfcdd2fa497e13a3c274a9f5920abd36ae7d2f7aaacd6bc6bc92fd677" + +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 += " \ + ${@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-rundir=/run/sudo \ + --with-vardir=/var/lib/sudo \ + --libexecdir=${libdir} \ + " + +do_install_append () { + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then + install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo + if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then + echo 'auth required pam_wheel.so use_uid' >>${D}${sysconfdir}/pam.d/sudo + sed -i 's/# \(%wheel ALL=(ALL) ALL\)/\1/' ${D}${sysconfdir}/sudoers + fi + fi + + chmod 4111 ${D}${bindir}/sudo + chmod 0440 ${D}${sysconfdir}/sudoers + + # Explicitly remove the /sudo directory to avoid QA error + rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo +} + +FILES_${PN} += "${nonarch_libdir}/tmpfiles.d" +FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la \ + ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" diff --git a/poky/meta/recipes-extended/timezone/timezone.inc b/poky/meta/recipes-extended/timezone/timezone.inc index 5368464f3..9a19093e2 100644 --- a/poky/meta/recipes-extended/timezone/timezone.inc +++ b/poky/meta/recipes-extended/timezone/timezone.inc @@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "PD & BSD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2020d" +PV = "2020f" 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 \ @@ -14,5 +14,5 @@ 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.sha256sum] = "6cf050ba28e8053029d3f32d71341d11a794c6b5dd51a77fc769d6dae364fad5" -SRC_URI[tzdata.sha256sum] = "8d813957de363387696f05af8a8889afa282ab5016a764c701a20758d39cbaf3" +SRC_URI[tzcode.sha256sum] = "cfeeea2a7745164f64bd9f6d76e47916f4ac820c4434493674adbbd4324329c5" +SRC_URI[tzdata.sha256sum] = "121131918c3ae6dc5d40f0eb87563a2be920b71a76e2392c09519a5e4a666881" diff --git a/poky/meta/recipes-extended/which/which_2.21.bb b/poky/meta/recipes-extended/which/which_2.21.bb index fc9185061..1da69c548 100644 --- a/poky/meta/recipes-extended/which/which_2.21.bb +++ b/poky/meta/recipes-extended/which/which_2.21.bb @@ -33,3 +33,5 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}-doc = "which.1" ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1" + +BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch b/poky/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch new file mode 100644 index 000000000..178124a2e --- /dev/null +++ b/poky/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch @@ -0,0 +1,80 @@ +From 8d01b0753162681dcdbb7cf56f1e393c261e3eb0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 23 Dec 2020 19:14:32 +0100 +Subject: [PATCH] Makefile: sort all wildcard file list expansions + +Otherwise the order is non-deterministic and breaks +reproducible builds. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + programs/Makefile | 10 +++++----- + tests/Makefile | 4 ++-- + tests/fuzz/Makefile | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/programs/Makefile b/programs/Makefile +index 8641d0ee..26fee45f 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -72,11 +72,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy + + vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS) $(ZDICT_DIR) $(ZSTDLEGACY_DIR) + +-ZSTDLIB_COMMON_C := $(wildcard $(ZSTDLIB_COMMON)/*.c) +-ZSTDLIB_COMPRESS_C := $(wildcard $(ZSTDLIB_COMPRESS)/*.c) +-ZSTDLIB_DECOMPRESS_C := $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c) ++ZSTDLIB_COMMON_C := $(sort $(wildcard $(ZSTDLIB_COMMON)/*.c)) ++ZSTDLIB_COMPRESS_C := $(sort $(wildcard $(ZSTDLIB_COMPRESS)/*.c)) ++ZSTDLIB_DECOMPRESS_C := $(sort $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c)) + ZSTDLIB_CORE_SRC := $(ZSTDLIB_DECOMPRESS_C) $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) +-ZDICT_SRC := $(wildcard $(ZDICT_DIR)/*.c) ++ZDICT_SRC := $(sort $(wildcard $(ZDICT_DIR)/*.c)) + + ZSTD_LEGACY_SUPPORT ?= 5 + ZSTDLEGACY_SRC := +@@ -91,7 +91,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) $(ZSTDLEGACY_SRC) $(ZDICT_SRC)) + ZSTDLIB_LOCAL_SRC := $(notdir $(ZSTDLIB_FULL_SRC)) + ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o) + +-ZSTD_CLI_SRC := $(wildcard *.c) ++ZSTD_CLI_SRC := $(sort $(wildcard *.c)) + ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o) + + ZSTD_ALL_SRC := $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC) +diff --git a/tests/Makefile b/tests/Makefile +index 42bc353c..5f5654f0 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -49,7 +49,7 @@ ZSTD_FILES := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES) + ZBUFF_FILES := $(ZSTDDIR)/deprecated/*.c + ZDICT_FILES := $(ZSTDDIR)/dictBuilder/*.c + +-ZSTD_F1 := $(wildcard $(ZSTD_FILES)) ++ZSTD_F1 := $(sort $(wildcard $(ZSTD_FILES))) + ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1)) + ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1)) + ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2)) +@@ -212,7 +212,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c bigdict.c + invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c + + legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4 +-legacy : $(ZSTD_FILES) $(wildcard $(ZSTDDIR)/legacy/*.c) legacy.c ++legacy : $(ZSTD_FILES) $(sort $(wildcard $(ZSTDDIR)/legacy/*.c)) legacy.c + + decodecorpus : LDLIBS += -lm + decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS)) $(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c +diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile +index 36232a8c..574fe877 100644 +--- a/tests/fuzz/Makefile ++++ b/tests/fuzz/Makefile +@@ -58,7 +58,7 @@ FUZZ_SRC := \ + $(ZSTDCOMP_SRC) \ + $(ZSTDDICT_SRC) \ + $(ZSTDLEGACY_SRC) +-FUZZ_SRC := $(wildcard $(FUZZ_SRC)) ++FUZZ_SRC := $(sort $(wildcard $(FUZZ_SRC))) + + FUZZ_D_OBJ1 := $(subst $(ZSTDDIR)/common/,d_lib_common_,$(FUZZ_SRC)) + FUZZ_D_OBJ2 := $(subst $(ZSTDDIR)/compress/,d_lib_compress_,$(FUZZ_D_OBJ1)) diff --git a/poky/meta/recipes-extended/zstd/zstd_1.4.8.bb b/poky/meta/recipes-extended/zstd/zstd_1.4.8.bb new file mode 100644 index 000000000..10a6334cb --- /dev/null +++ b/poky/meta/recipes-extended/zstd/zstd_1.4.8.bb @@ -0,0 +1,37 @@ +SUMMARY = "Zstandard - Fast real-time compression algorithm" +DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ +real-time compression scenarios at zlib-level and better compression ratios. \ +It's backed by a very fast entropy stage, provided by Huff0 and FSE library." +HOMEPAGE = "http://www.zstd.net/" +SECTION = "console/utils" + +LICENSE = "BSD-3-Clause & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ + file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" + +SRC_URI = "git://github.com/facebook/zstd.git;branch=release \ + file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \ + " + +SRCREV = "97a3da1df009d4dc67251de0c4b1c9d7fe286fc1" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" +PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" +PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" + +# See programs/README.md for how to use this +ZSTD_LEGACY_SUPPORT ??= "4" + +do_compile () { + oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-gnome/epiphany/epiphany_3.38.1.bb b/poky/meta/recipes-gnome/epiphany/epiphany_3.38.1.bb deleted file mode 100644 index f9daa8bfe..000000000 --- a/poky/meta/recipes-gnome/epiphany/epiphany_3.38.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "WebKit based web browser for GNOME" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/epiphany" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ - gsettings-desktop-schemas libxml2-native \ - glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings features_check upstream-version-is-even gettext mime-xdg -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.sha256sum] = "59b7576acb11fbb52eaca6dbf6fce28664de5c915ca2580c47f0b08ba83d2843" - -FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" -RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" diff --git a/poky/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb b/poky/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb new file mode 100644 index 000000000..70148c96d --- /dev/null +++ b/poky/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "WebKit based web browser for GNOME" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/epiphany" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ + gsettings-desktop-schemas libxml2-native \ + glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gsettings features_check upstream-version-is-even gettext mime-xdg +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.sha256sum] = "8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d" + +FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" +RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" diff --git a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch new file mode 100644 index 000000000..3fef2bc1e --- /dev/null +++ b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch @@ -0,0 +1,55 @@ +From bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81 Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Mon, 30 Nov 2020 12:26:12 +1300 +Subject: [PATCH 02/13] gif: Fix LZW decoder accepting invalid LZW code. + +The code value after a reset wasn't being validated, which means we would +accept invalid codes. This could cause an infinite loop in the decoder. + +Fixes CVE-2020-29385 + +Fixes https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/164 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81] +CVE: CVE-2020-29385 +Signed-off-by: Chee Yang Lee + +--- + gdk-pixbuf/lzw.c | 13 +++++++------ + 1 files changed, 7 insertions(+), 6 deletions(-) + create mode 100644 tests/test-images/fail/hang_114.gif + +diff --git a/gdk-pixbuf/lzw.c b/gdk-pixbuf/lzw.c +index 9e052a6f7..105daf2b1 100644 +--- a/gdk-pixbuf/lzw.c ++++ b/gdk-pixbuf/lzw.c +@@ -195,19 +195,20 @@ lzw_decoder_feed (LZWDecoder *self, + if (self->last_code != self->clear_code && self->code_table_size < MAX_CODES) { + if (self->code < self->code_table_size) + add_code (self, self->code); +- else if (self->code == self->code_table_size) ++ else + add_code (self, self->last_code); +- else { +- /* Invalid code received - just stop here */ +- self->last_code = self->eoi_code; +- return output_length; +- } + + /* When table is full increase code size */ + if (self->code_table_size == (1 << self->code_size) && self->code_size < LZW_CODE_MAX) + self->code_size++; + } + ++ /* Invalid code received - just stop here */ ++ if (self->code >= self->code_table_size) { ++ self->last_code = self->eoi_code; ++ return output_length; ++ } ++ + /* Convert codeword into indexes */ + n_written += write_indexes (self, output + n_written, output_length - n_written); + } +-- +2.25.1 + diff --git a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb index 3dec5ed05..16708fd58 100644 --- a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +++ b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb @@ -24,6 +24,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0004-Do-not-run-tests-when-building.patch \ file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ file://missing-test-data.patch \ + file://CVE-2020-29385.patch \ " SRC_URI_append_class-target = " \ diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.23.bb b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.23.bb deleted file mode 100644 index 338b7030e..000000000 --- a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.23.bb +++ /dev/null @@ -1,18 +0,0 @@ -require gtk+3.inc - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ - file://0001-Hardcoded-libtool.patch \ - file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ - file://0003-Add-disable-opengl-configure-option.patch \ - file://link_fribidi.patch \ - " -SRC_URI[sha256sum] = "5d864d248357a2251545b3387b35942de5f66e4c66013f0962eb5cb6f8dae2b1" - -S = "${WORKDIR}/gtk+-${PV}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ - file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ - file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.24.bb b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.24.bb new file mode 100644 index 000000000..01a2a94ce --- /dev/null +++ b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.24.bb @@ -0,0 +1,18 @@ +require gtk+3.inc + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ + file://0001-Hardcoded-libtool.patch \ + file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ + file://0003-Add-disable-opengl-configure-option.patch \ + file://link_fribidi.patch \ + " +SRC_URI[sha256sum] = "cc9d4367c55b724832f6b09ab85481738ea456871f0381768a6a99335a98378a" + +S = "${WORKDIR}/gtk+-${PV}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ + file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ + file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" diff --git a/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.201.bb b/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.201.bb deleted file mode 100644 index 29e839b6b..000000000 --- a/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.201.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Cantarell, a Humanist sans-serif font family" - -DESCRIPTION = "The Cantarell font typeface is designed as a \ - contemporary Humanist sans serif, and was developed for \ - on-screen reading; in particular, reading web pages on an \ - HTC Dream mobile phone." - -HOMEPAGE = "https://gitlab.gnome.org/GNOME/cantarell-fonts/" -SECTION = "fonts" -LICENSE = "OFL-1.1 & Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb1ef92b6909969a472a6ea3c4e99cb7" - -inherit gnomebase meson allarch fontcache pkgconfig -SRC_URI[archive.sha256sum] = "b61f64e5f6a48aa0abc7a53cdcbce60de81908ca36048a64730978fcd9ac9863" - -EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false" - -FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig" diff --git a/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb b/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb new file mode 100644 index 000000000..890c08bf4 --- /dev/null +++ b/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb @@ -0,0 +1,18 @@ +SUMMARY = "Cantarell, a Humanist sans-serif font family" + +DESCRIPTION = "The Cantarell font typeface is designed as a \ + contemporary Humanist sans serif, and was developed for \ + on-screen reading; in particular, reading web pages on an \ + HTC Dream mobile phone." + +HOMEPAGE = "https://gitlab.gnome.org/GNOME/cantarell-fonts/" +SECTION = "fonts" +LICENSE = "OFL-1.1 & Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb1ef92b6909969a472a6ea3c4e99cb7" + +inherit gnomebase meson allarch fontcache pkgconfig +SRC_URI[archive.sha256sum] = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83" + +EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false" + +FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig" diff --git a/poky/meta/recipes-graphics/libva/libva-initial_2.10.0.bb b/poky/meta/recipes-graphics/libva/libva-initial_2.10.0.bb new file mode 100644 index 000000000..5c6abeafe --- /dev/null +++ b/poky/meta/recipes-graphics/libva/libva-initial_2.10.0.bb @@ -0,0 +1,5 @@ +require libva.inc + +do_install_append () { + rm -f ${D}${libdir}/*.so* +} diff --git a/poky/meta/recipes-graphics/libva/libva-initial_2.9.0.bb b/poky/meta/recipes-graphics/libva/libva-initial_2.9.0.bb deleted file mode 100644 index 5c6abeafe..000000000 --- a/poky/meta/recipes-graphics/libva/libva-initial_2.9.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require libva.inc - -do_install_append () { - rm -f ${D}${libdir}/*.so* -} diff --git a/poky/meta/recipes-graphics/libva/libva-utils_2.10.0.bb b/poky/meta/recipes-graphics/libva/libva-utils_2.10.0.bb new file mode 100644 index 000000000..828f4fb31 --- /dev/null +++ b/poky/meta/recipes-graphics/libva/libva-utils_2.10.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "libva-utils is a collection of utilities from libva project" + +DESCRIPTION = "libva-utils is a collection of utilities \ +and examples to exercise VA-API in accordance with the libva \ +project.VA-API is an open-source library and API specification, \ +which provides access to graphics hardware acceleration capabilities \ +for video processing. It consists of a main library and driver-specific \ +acceleration backends for each supported hardware vendor" + +HOMEPAGE = "https://01.org/linuxmedia/vaapi" +BUGTRACKER = "https://github.com/intel/libva-utils/issues" + +SECTION = "x11" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" + +SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.10-branch" +SRCREV = "f112ee75fcd1472131b20f901b93f6ac1d293fad" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))$" + +DEPENDS = "libva" + +inherit meson pkgconfig features_check + +# depends on libva which requires opengl +REQUIRED_DISTRO_FEATURES = "opengl" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" +PACKAGECONFIG[x11] = "-Dx11=true, -Dx11=false,virtual/libx11 libxext libxfixes" +PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false,wayland-native wayland" diff --git a/poky/meta/recipes-graphics/libva/libva-utils_2.9.1.bb b/poky/meta/recipes-graphics/libva/libva-utils_2.9.1.bb deleted file mode 100644 index feb9ce166..000000000 --- a/poky/meta/recipes-graphics/libva/libva-utils_2.9.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "libva-utils is a collection of utilities from libva project" - -DESCRIPTION = "libva-utils is a collection of utilities \ -and examples to exercise VA-API in accordance with the libva \ -project.VA-API is an open-source library and API specification, \ -which provides access to graphics hardware acceleration capabilities \ -for video processing. It consists of a main library and driver-specific \ -acceleration backends for each supported hardware vendor" - -HOMEPAGE = "https://01.org/linuxmedia/vaapi" -BUGTRACKER = "https://github.com/intel/libva-utils/issues" - -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" - -SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.9-branch" -SRCREV = "50c7f19d65e2535940e31c6711352b36d6d64fd7" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))$" - -DEPENDS = "libva" - -inherit meson pkgconfig features_check - -# depends on libva which requires opengl -REQUIRED_DISTRO_FEATURES = "opengl" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" -PACKAGECONFIG[x11] = "-Dx11=true, -Dx11=false,virtual/libx11 libxext libxfixes" -PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false,wayland-native wayland" diff --git a/poky/meta/recipes-graphics/libva/libva.inc b/poky/meta/recipes-graphics/libva/libva.inc index 7b6f11674..d251afa12 100644 --- a/poky/meta/recipes-graphics/libva/libva.inc +++ b/poky/meta/recipes-graphics/libva/libva.inc @@ -18,7 +18,7 @@ LICENSE = "MIT" SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" -SRC_URI[sha256sum] = "e344c1392dde92696c9ffd9cb3c7277d0a3b912236eb4e0fdedf7f375434584b" +SRC_URI[sha256sum] = "fa81e35b50d9818fce5ec9eeeeff08a24a8864ceeb9a5c8e7ae4446eacfc0236" S = "${WORKDIR}/libva-${PV}" diff --git a/poky/meta/recipes-graphics/libva/libva_2.10.0.bb b/poky/meta/recipes-graphics/libva/libva_2.10.0.bb new file mode 100644 index 000000000..4d3fa5096 --- /dev/null +++ b/poky/meta/recipes-graphics/libva/libva_2.10.0.bb @@ -0,0 +1,20 @@ +require libva.inc + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} \ +" + +PACKAGECONFIG[x11] = "-Dwith_x11=yes,-Dwith_x11=no,virtual/libx11 libxext libxfixes" +PACKAGECONFIG[glx] = "-Dwith_glx=yes,-Dwith_glx=no,virtual/mesa" + +PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland" + +PACKAGES =+ "${PN}-x11 ${PN}-glx ${PN}-wayland" + +RDEPENDS_${PN}-x11 =+ "${PN}" +RDEPENDS_${PN}-glx =+ "${PN}-x11" + +FILES_${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}" +FILES_${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}" +FILES_${PN}-wayland =+ "${libdir}/libva-wayland*${SOLIBS}" diff --git a/poky/meta/recipes-graphics/libva/libva_2.9.0.bb b/poky/meta/recipes-graphics/libva/libva_2.9.0.bb deleted file mode 100644 index 4d3fa5096..000000000 --- a/poky/meta/recipes-graphics/libva/libva_2.9.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -require libva.inc - -PACKAGECONFIG ??= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} \ -" - -PACKAGECONFIG[x11] = "-Dwith_x11=yes,-Dwith_x11=no,virtual/libx11 libxext libxfixes" -PACKAGECONFIG[glx] = "-Dwith_glx=yes,-Dwith_glx=no,virtual/mesa" - -PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland" - -PACKAGES =+ "${PN}-x11 ${PN}-glx ${PN}-wayland" - -RDEPENDS_${PN}-x11 =+ "${PN}" -RDEPENDS_${PN}-glx =+ "${PN}-x11" - -FILES_${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}" -FILES_${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}" -FILES_${PN}-wayland =+ "${libdir}/libva-wayland*${SOLIBS}" diff --git a/poky/meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch b/poky/meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch deleted file mode 100644 index 9ee72880a..000000000 --- a/poky/meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch +++ /dev/null @@ -1,36 +0,0 @@ -From cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c Mon Sep 17 00:00:00 2001 -From: Duncan Hopkins -Date: Thu, 15 Oct 2020 12:14:57 +0100 -Subject: [PATCH] meson: Add xcb-fixes to loader when using x11 and dri3. Fixes - undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c - -loader_dr3_helper.c uses xcb_xfixes_create_region() that requires dep_xcb_xfixes to link. This is dependent on with_platform_x11 and with_dri3. -But the source meson file does not set this up dependent on with_dri3. -The build was initialsed using platforms=x11 and gallium-drivers=zink,swrast. - -Reviewed-by: Eric Anholt -Part-of: - -Upstream-Status: Backport [cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c] - ---- - meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index cfe02fa6373..3cb3c904927 100644 ---- a/meson.build -+++ b/meson.build -@@ -1782,7 +1782,8 @@ if with_platform_x11 - dep_xxf86vm = dependency('xxf86vm') - endif - endif -- if (with_egl or ( -+ if (with_egl or -+ with_dri3 or ( - with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or - with_gallium_omx != 'disabled')) - dep_xcb_xfixes = dependency('xcb-xfixes') --- -2.17.1 - diff --git a/poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch b/poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch index 74f7fe5c2..89c0d150f 100644 --- a/poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +++ b/poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch @@ -6,6 +6,21 @@ Subject: [PATCH] meson.build: make TLS ELF optional USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make TLS GLX optional again" patch updated to the latest mesa. +For details, see: +https://gitlab.freedesktop.org/mesa/mesa/-/issues/966 + +This prevents runtime segfault on musl: + +Traceback (most recent call last): + File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f + return func(*args, **kwargs) + File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 378, in test_parselogs + self.assertEqual(errcount, 0, msg=self.msg) +AssertionError: 1 != 0 : Log: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/qemux86-poky-linux-musl/core-image-sato-sdk/1.0-r0/target_logs/Xorg.0.log +----------------------- +Central error: [ 10.477] (EE) Failed to load /usr/lib/xorg/modules/extensions/libglx.so: Error relocating /usr/lib/libGL.so.1: alphasort: initial-exec TLS resolves to dynamic definition in /usr/lib/libGL.so.1 +*********************** + Upstream-Status: Inappropriate [configuration] Signed-off-by: Alistair Francis diff --git a/poky/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch b/poky/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch deleted file mode 100644 index 833742359..000000000 --- a/poky/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 43d9e40db7357f27e91002b2bb7688b6775ebb43 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Thu, 14 Nov 2019 09:06:02 -0800 -Subject: [PATCH] Revert "mesa: Enable asm unconditionally, now that - gen_matypes is gone." - -This reverts commit 20294dceebc23236e33b22578245f7e6f41b6997. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Alistair Francis - ---- - meson.build | 94 ++++++++++++++++++++++++++++++----------------- - meson_options.txt | 6 +++ - 2 files changed, 67 insertions(+), 33 deletions(-) - -diff --git a/meson.build b/meson.build -index e7dc599..e2fc934 100644 ---- a/meson.build -+++ b/meson.build -@@ -52,6 +52,7 @@ pre_args = [ - with_vulkan_icd_dir = get_option('vulkan-icd-dir') - with_tests = get_option('build-tests') - with_aco_tests = get_option('build-aco-tests') -+with_asm = get_option('asm') - with_glx_read_only_text = get_option('glx-read-only-text') - with_glx_direct = get_option('glx-direct') - with_osmesa = get_option('osmesa') -@@ -1154,41 +1155,68 @@ dep_ws2_32 = cc.find_library('ws2_32', required : with_platform_windows) - - # TODO: shared/static? Is this even worth doing? - -+# When cross compiling we generally need to turn off the use of assembly, -+# because mesa's assembly relies on building an executable for the host system, -+# and running it to get information about struct sizes. There is at least one -+# case of cross compiling where we can use asm, and that's x86_64 -> x86 when -+# host OS == build OS, since in that case the build machine can run the host's -+# binaries. -+if with_asm and meson.is_cross_build() -+ if build_machine.system() != host_machine.system() -+ # TODO: It may be possible to do this with an exe_wrapper (like wine). -+ message('Cross compiling from one OS to another, disabling assembly.') -+ with_asm = false -+ elif not (build_machine.cpu_family().startswith('x86') and host_machine.cpu_family() == 'x86') -+ # FIXME: Gentoo always sets -m32 for x86_64 -> x86 builds, resulting in an -+ # x86 -> x86 cross compile. We use startswith rather than == to handle this -+ # case. -+ # TODO: There may be other cases where the 64 bit version of the -+ # architecture can run 32 bit binaries (aarch64 and armv7 for example) -+ message(''' -+ Cross compiling to different architectures, and the host cannot run -+ the build machine's binaries. Disabling assembly. -+ ''') -+ with_asm = false -+ endif -+endif -+ - with_asm_arch = '' --if host_machine.cpu_family() == 'x86' -- if system_has_kms_drm or host_machine.system() == 'gnu' -- with_asm_arch = 'x86' -- pre_args += ['-DUSE_X86_ASM', '-DUSE_MMX_ASM', '-DUSE_3DNOW_ASM', -- '-DUSE_SSE_ASM'] -- -- if with_glx_read_only_text -- pre_args += ['-DGLX_X86_READONLY_TEXT'] -+if with_asm -+ if host_machine.cpu_family() == 'x86' -+ if system_has_kms_drm or host_machine.system() == 'gnu' -+ with_asm_arch = 'x86' -+ pre_args += ['-DUSE_X86_ASM', '-DUSE_MMX_ASM', '-DUSE_3DNOW_ASM', -+ '-DUSE_SSE_ASM'] -+ -+ if with_glx_read_only_text -+ pre_args += ['-DGLX_X86_READONLY_TEXT'] -+ endif -+ endif -+ elif host_machine.cpu_family() == 'x86_64' -+ if system_has_kms_drm -+ with_asm_arch = 'x86_64' -+ pre_args += ['-DUSE_X86_64_ASM'] -+ endif -+ elif host_machine.cpu_family() == 'arm' -+ if system_has_kms_drm -+ with_asm_arch = 'arm' -+ pre_args += ['-DUSE_ARM_ASM'] -+ endif -+ elif host_machine.cpu_family() == 'aarch64' -+ if system_has_kms_drm -+ with_asm_arch = 'aarch64' -+ pre_args += ['-DUSE_AARCH64_ASM'] -+ endif -+ elif host_machine.cpu_family() == 'sparc64' -+ if system_has_kms_drm -+ with_asm_arch = 'sparc' -+ pre_args += ['-DUSE_SPARC_ASM'] -+ endif -+ elif host_machine.cpu_family().startswith('ppc64') and host_machine.endian() == 'little' -+ if system_has_kms_drm -+ with_asm_arch = 'ppc64le' -+ pre_args += ['-DUSE_PPC64LE_ASM'] - endif -- endif --elif host_machine.cpu_family() == 'x86_64' -- if system_has_kms_drm -- with_asm_arch = 'x86_64' -- pre_args += ['-DUSE_X86_64_ASM'] -- endif --elif host_machine.cpu_family() == 'arm' -- if system_has_kms_drm -- with_asm_arch = 'arm' -- pre_args += ['-DUSE_ARM_ASM'] -- endif --elif host_machine.cpu_family() == 'aarch64' -- if system_has_kms_drm -- with_asm_arch = 'aarch64' -- pre_args += ['-DUSE_AARCH64_ASM'] -- endif --elif host_machine.cpu_family() == 'sparc64' -- if system_has_kms_drm -- with_asm_arch = 'sparc' -- pre_args += ['-DUSE_SPARC_ASM'] -- endif --elif host_machine.cpu_family().startswith('ppc64') and host_machine.endian() == 'little' -- if system_has_kms_drm -- with_asm_arch = 'ppc64le' -- pre_args += ['-DUSE_PPC64LE_ASM'] - endif - endif - -diff --git a/meson_options.txt b/meson_options.txt -index 147cccb..562b059 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -254,6 +254,12 @@ option( - value : false, - description : 'Enable GLVND support.' - ) -+option( -+ 'asm', -+ type : 'boolean', -+ value : true, -+ description : 'Build assembly code if possible' -+) - option( - 'glx-read-only-text', - type : 'boolean', diff --git a/poky/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch b/poky/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch deleted file mode 100644 index dacb1ea1c..000000000 --- a/poky/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 281a636353666bfdd373c62591e744087e750e89 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 4 Dec 2019 14:15:28 -0800 -Subject: [PATCH] vc4: use intmax_t for formatted output of timespec members - -32bit architectures which have 64bit time_t does not fit the assumption -of time_t being same as system long int - -Fixes -error: format specifies type 'long' but the argument has type 'time_t' (aka 'long long') [-Werror,-Wformat] - time.tv_sec); - ^~~~~~~~~~~ - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2966] -Signed-off-by: Khem Raj - ---- - src/gallium/drivers/v3d/v3d_bufmgr.c | 4 ++-- - src/gallium/drivers/vc4/vc4_bufmgr.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/gallium/drivers/v3d/v3d_bufmgr.c b/src/gallium/drivers/v3d/v3d_bufmgr.c -index 31a0803..cc2e2af 100644 ---- a/src/gallium/drivers/v3d/v3d_bufmgr.c -+++ b/src/gallium/drivers/v3d/v3d_bufmgr.c -@@ -80,8 +80,8 @@ v3d_bo_dump_stats(struct v3d_screen *screen) - - struct timespec time; - clock_gettime(CLOCK_MONOTONIC, &time); -- fprintf(stderr, " now: %ld\n", -- (long)time.tv_sec); -+ fprintf(stderr, " now: %jd\n", -+ (intmax_t)time.tv_sec); - } - } - -diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c -index a786e8e..975d49e 100644 ---- a/src/gallium/drivers/vc4/vc4_bufmgr.c -+++ b/src/gallium/drivers/vc4/vc4_bufmgr.c -@@ -99,8 +99,8 @@ vc4_bo_dump_stats(struct vc4_screen *screen) - - struct timespec time; - clock_gettime(CLOCK_MONOTONIC, &time); -- fprintf(stderr, " now: %ld\n", -- (long)time.tv_sec); -+ fprintf(stderr, " now: %jd\n", -+ (intmax_t)time.tv_sec); - } - } - diff --git a/poky/meta/recipes-graphics/mesa/mesa-gl_20.2.4.bb b/poky/meta/recipes-graphics/mesa/mesa-gl_20.2.4.bb deleted file mode 100644 index e50782be1..000000000 --- a/poky/meta/recipes-graphics/mesa/mesa-gl_20.2.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -require mesa.inc - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -# At least one DRI rendering engine is required to build mesa. -# When no X11 is available, use osmesa for the rendering engine. -PACKAGECONFIG ??= "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" -PACKAGECONFIG_class-target = "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" - -# When NOT using X11, we need to make sure we have swrast available. -DRIDRIVERS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', ',swrast', d)}" diff --git a/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.1.bb b/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.1.bb new file mode 100644 index 000000000..e50782be1 --- /dev/null +++ b/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.1.bb @@ -0,0 +1,15 @@ +require mesa.inc + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +# At least one DRI rendering engine is required to build mesa. +# When no X11 is available, use osmesa for the rendering engine. +PACKAGECONFIG ??= "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" +PACKAGECONFIG_class-target = "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" + +# When NOT using X11, we need to make sure we have swrast available. +DRIDRIVERS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', ',swrast', d)}" diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index 7956d95fc..883c24447 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/meta/recipes-graphics/mesa/mesa.inc @@ -17,15 +17,12 @@ PE = "2" SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ file://0002-meson.build-make-TLS-ELF-optional.patch \ - file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \ - file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \ - file://0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch \ " -SRC_URI[sha256sum] = "0572dc6015d2e1c50f67823edd16855ae9b6feded0a1470598404e75e64aa092" +SRC_URI[sha256sum] = "af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" @@ -53,9 +50,7 @@ BBCLASSEXTEND = "native nativesdk" ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" -PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)} \ - surfaceless" +PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config" export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}" @@ -78,7 +73,7 @@ def check_buildtype(d): MESON_BUILDTYPE = "${@check_buildtype(d)}" EXTRA_OEMESON = " \ - -Dshared-glapi=true \ + -Dshared-glapi=enabled \ -Dgallium-opencl=disabled \ -Dglx-read-only-text=true \ -Dplatforms='${@",".join("${PLATFORMS}".split())}' \ @@ -99,13 +94,13 @@ PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl elf-tls x11" PACKAGECONFIG_remove_libc-musl = "elf-tls" # "gbm" requires "dri", "opengl" -PACKAGECONFIG[gbm] = "-Dgbm=true,-Dgbm=false" +PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled" X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr" # "x11" requires "opengl" PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}" PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false" -PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=true,-Dgallium-xvmc=false,libxvmc" +PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc" PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" DRIDRIVERS_class-native = "swrast" @@ -114,7 +109,7 @@ DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" # "dri" requires "opengl" PACKAGECONFIG[dri] = "-Ddri-drivers=${@strip_comma('${DRIDRIVERS}')}, -Ddri-drivers='', xorgproto libdrm" -PACKAGECONFIG[dri3] = "-Ddri3=true, -Ddri3=false, xorgproto libxshmfence" +PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto libxshmfence" # Vulkan drivers need dri3 enabled # amd could be enabled as well but requires gallium-llvm with llvm >= 3.9 @@ -127,10 +122,10 @@ PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')}, PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false" # "gles" requires "opengl" -PACKAGECONFIG[gles] = "-Dgles1=true -Dgles2=true, -Dgles1=false -Dgles2=false" +PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2=disabled" # "egl" requires "dri", "opengl" -PACKAGECONFIG[egl] = "-Degl=true, -Degl=false" +PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" PACKAGECONFIG[etnaviv] = "" PACKAGECONFIG[freedreno] = "" @@ -160,12 +155,12 @@ GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}" PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers=''" -PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llvm${MESA_LLVM_RELEASE} llvm-native \ +PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled, -Dllvm=disabled, llvm${MESA_LLVM_RELEASE} llvm-native \ elfutils" -PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false" -PACKAGECONFIG[va] = "-Dgallium-va=true,-Dgallium-va=false,libva-initial" +PACKAGECONFIG[xa] = "-Dgallium-xa=enabled, -Dgallium-xa=disabled" +PACKAGECONFIG[va] = "-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial" -PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=true,-Dgallium-vdpau=false,libvdpau" +PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=enabled,-Dgallium-vdpau=disabled,libvdpau" PACKAGECONFIG[lima] = "" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" @@ -176,10 +171,7 @@ GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panf OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium', 'classic', d)}" PACKAGECONFIG[osmesa] = "-Dosmesa=${OSMESA},-Dosmesa=none" -PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" - -# mesa tries to run cross-built gen_matypes on build machine to get struct size information -EXTRA_OEMESON_append = " -Dasm=false" +PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" diff --git a/poky/meta/recipes-graphics/mesa/mesa_20.2.4.bb b/poky/meta/recipes-graphics/mesa/mesa_20.2.4.bb deleted file mode 100644 index 96e8aa38d..000000000 --- a/poky/meta/recipes-graphics/mesa/mesa_20.2.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -require ${BPN}.inc - diff --git a/poky/meta/recipes-graphics/mesa/mesa_20.3.1.bb b/poky/meta/recipes-graphics/mesa/mesa_20.3.1.bb new file mode 100644 index 000000000..96e8aa38d --- /dev/null +++ b/poky/meta/recipes-graphics/mesa/mesa_20.3.1.bb @@ -0,0 +1,2 @@ +require ${BPN}.inc + diff --git a/poky/meta/recipes-graphics/piglit/piglit/0001-render-ops.c-add-missing-format-string.patch b/poky/meta/recipes-graphics/piglit/piglit/0001-render-ops.c-add-missing-format-string.patch new file mode 100644 index 000000000..261d98d8f --- /dev/null +++ b/poky/meta/recipes-graphics/piglit/piglit/0001-render-ops.c-add-missing-format-string.patch @@ -0,0 +1,24 @@ +From e21e68f6aa0f5249fce613e8fd4ac0edbd5cb7b0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 22 Dec 2020 13:35:11 +0100 +Subject: [PATCH] render-ops.c: add missing format string + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + tests/spec/ati_fragment_shader/render-ops.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/spec/ati_fragment_shader/render-ops.c b/tests/spec/ati_fragment_shader/render-ops.c +index 131334ba2..19a353d67 100644 +--- a/tests/spec/ati_fragment_shader/render-ops.c ++++ b/tests/spec/ati_fragment_shader/render-ops.c +@@ -393,7 +393,7 @@ piglit_display(void) + bool ok = piglit_probe_rect_halves_equal_rgba(get_test_x(i), get_test_y(i), + w * 2, h); + enum piglit_result sub_result = ok ? PIGLIT_PASS : PIGLIT_FAIL; +- piglit_report_subtest_result(sub_result, test->name); ++ piglit_report_subtest_result(sub_result, "%s", test->name); + piglit_merge_result(&result, sub_result); + } + diff --git a/poky/meta/recipes-graphics/piglit/piglit_git.bb b/poky/meta/recipes-graphics/piglit/piglit_git.bb index 31954aa8b..442c1a3c6 100644 --- a/poky/meta/recipes-graphics/piglit/piglit_git.bb +++ b/poky/meta/recipes-graphics/piglit/piglit_git.bb @@ -13,10 +13,11 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ file://0001-serializer.py-make-.gz-files-reproducible.patch \ file://0001-framework-profile.py-make-test-lists-reproducible.patch \ file://0001-tests-shader.py-sort-the-file-list-before-working-on.patch \ + file://0001-render-ops.c-add-missing-format-string.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "0fda9f67a782edec640998286e7b6058e8933d17" +SRCREV = "603deba4ab66e2a8948693a14d715e536caddcc5" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" diff --git a/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch b/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch index 0d58925ad..e4e3f0be1 100644 --- a/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch +++ b/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch @@ -1,11 +1,12 @@ -From e092619a9ef7910ad56acfb8728c66f0125d176a Mon Sep 17 00:00:00 2001 +From 180250f098e0ab899eff0db3708d9693f3486ff4 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 17 Oct 2020 12:51:50 +0100 -Subject: [PATCH 3/3] cmake: de-vendor libs and disable git versioning +Subject: [PATCH] cmake: de-vendor libs and disable git versioning Upstream-Status: Inappropriate [configuration] Signed-off-by: Jose Quaresma + --- CMakeLists.txt | 2 -- glslc/CMakeLists.txt | 1 - @@ -14,18 +15,15 @@ Signed-off-by: Jose Quaresma create mode 100644 glslc/src/build-version.inc diff --git a/CMakeLists.txt b/CMakeLists.txt -index a4e779b..cfa7bd8 100644 +index 5c74cd8..9451fbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -70,7 +70,6 @@ endif(MSVC) +@@ -102,12 +102,10 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. -add_subdirectory(third_party) - if(SHADERC_ENABLE_SPVC) - add_subdirectory(libshaderc_spvc) -@@ -79,7 +78,6 @@ endif() add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) add_subdirectory(glslc) @@ -34,10 +32,10 @@ index a4e779b..cfa7bd8 100644 add_custom_target(build-version ${PYTHON_EXECUTABLE} diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index 0f5d888..08686e0 100644 +index 35b3f19..52006b8 100644 --- a/glslc/CMakeLists.txt +++ b/glslc/CMakeLists.txt -@@ -26,7 +26,6 @@ shaderc_default_compile_options(glslc_exe) +@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe) target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include) set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc) target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc) @@ -48,6 +46,3 @@ index 0f5d888..08686e0 100644 diff --git a/glslc/src/build-version.inc b/glslc/src/build-version.inc new file mode 100644 index 0000000..e69de29 --- -2.28.0 - diff --git a/poky/meta/recipes-graphics/shaderc/shaderc_2020.3.bb b/poky/meta/recipes-graphics/shaderc/shaderc_2020.3.bb deleted file mode 100644 index f5edf53ca..000000000 --- a/poky/meta/recipes-graphics/shaderc/shaderc_2020.3.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "A collection of tools, libraries and tests for shader compilation" -DESCRIPTION = "The Shaderc library provides an API for compiling GLSL/HLSL \ -source code to SPIRV modules. It has been shipping in the Android NDK since version r12b." -SECTION = "graphics" -HOMEPAGE = "https://github.com/google/shaderc" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRCREV = "1fce59794079f90ceb091190adbbb5499acd4e95" -SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ - file://0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch \ - file://0003-cmake-de-vendor-libs-and-disable-git-versioning.patch \ - " -S = "${WORKDIR}/git" - -inherit cmake python3native - -DEPENDS = "spirv-tools glslang" - -EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DSHADERC_SKIP_TESTS=ON" - -do_configure_prepend() { - # TODO: probably there is better solution for this. - # I dont know any method for get the version of a receipe in DEPENDS - # so do this ugly hack - cat <<- EOF > ${S}/glslc/src/build-version.inc -"${PV}\\n" -"$(pkg-config --modversion SPIRV-Tools)\\n" -"$(glslangValidator --version | head -1 | cut -d' ' -f3)\\n" -EOF -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb b/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb new file mode 100644 index 000000000..ee9b11837 --- /dev/null +++ b/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb @@ -0,0 +1,33 @@ +SUMMARY = "A collection of tools, libraries and tests for shader compilation" +DESCRIPTION = "The Shaderc library provides an API for compiling GLSL/HLSL \ +source code to SPIRV modules. It has been shipping in the Android NDK since version r12b." +SECTION = "graphics" +HOMEPAGE = "https://github.com/google/shaderc" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRCREV = "0dbd899941a43ffd55df527d65128b3b66e75c9c" +SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ + file://0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch \ + file://0003-cmake-de-vendor-libs-and-disable-git-versioning.patch \ + " +S = "${WORKDIR}/git" + +inherit cmake python3native + +DEPENDS = "spirv-tools glslang" + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DSHADERC_SKIP_TESTS=ON" + +do_configure_prepend() { + # TODO: probably there is better solution for this. + # I dont know any method for get the version of a receipe in DEPENDS + # so do this ugly hack + cat <<- EOF > ${S}/glslc/src/build-version.inc +"${PV}\\n" +"$(pkg-config --modversion SPIRV-Tools)\\n" +"$(glslangValidator --version | head -1 | cut -d' ' -f3)\\n" +EOF +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/spir/spirv-tools_2020.5.bb b/poky/meta/recipes-graphics/spir/spirv-tools_2020.5.bb deleted file mode 100644 index 5e4298724..000000000 --- a/poky/meta/recipes-graphics/spir/spirv-tools_2020.5.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "The SPIR-V Tools project provides an API and commands for \ -processing SPIR-V modules" -DESCRIPTION = "The project includes an assembler, binary module parser, \ -disassembler, validator, and optimizer for SPIR-V." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SECTION = "graphics" - -S = "${WORKDIR}/git" -DEST_DIR = "${S}/external" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \ - git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ - git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ - git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ - git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ - file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch;destsuffix=${DEST_DIR}/effcee \ -" -SRCREV_spirv-tools = "b27e039c68dd9eb959bb9249fcb2c9a54841474b" -SRCREV_spirv-headers = "3fdabd0da2932c276b25b9b4a988ba134eba1aa6" -SRCREV_effcee = "cd25ec17e9382f99a895b9ef53ff3c277464d07d" -SRCREV_re2 = "5bd613749fd530b576b890283bfb6bc6ea6246cb" -SRCREV_googletest = "f2fb48c3b3d79a75a88a99fba6576b25d42ec528" - -inherit cmake python3native - -EXTRA_OECMAKE += "-DSPIRV_WERROR=OFF" - -do_install_append() { - install -d ${D}/${includedir}/spirv - install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}${includedir}/spirv - install -d ${D}/${includedir}/spirv/unified1 - install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/unified1/* ${D}${includedir}/spirv/unified1 -} - -FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/*.so" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb b/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb new file mode 100644 index 000000000..eb07833f2 --- /dev/null +++ b/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb @@ -0,0 +1,38 @@ +SUMMARY = "The SPIR-V Tools project provides an API and commands for \ +processing SPIR-V modules" +DESCRIPTION = "The project includes an assembler, binary module parser, \ +disassembler, validator, and optimizer for SPIR-V." +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +SECTION = "graphics" + +S = "${WORKDIR}/git" +DEST_DIR = "${S}/external" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \ + git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ + git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ + git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ + git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ + file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch;destsuffix=${DEST_DIR}/effcee \ +" +SRCREV_spirv-tools = "b27b1afd12d05bf238ac7368bb49de73cd620a8e" +SRCREV_spirv-headers = "f027d53ded7e230e008d37c8b47ede7cd308e19d" +SRCREV_effcee = "cd25ec17e9382f99a895b9ef53ff3c277464d07d" +SRCREV_re2 = "5bd613749fd530b576b890283bfb6bc6ea6246cb" +SRCREV_googletest = "f2fb48c3b3d79a75a88a99fba6576b25d42ec528" + +inherit cmake python3native + +EXTRA_OECMAKE += "-DSPIRV_WERROR=OFF" + +do_install_append() { + install -d ${D}/${includedir}/spirv + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}${includedir}/spirv + install -d ${D}/${includedir}/spirv/unified1 + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/unified1/* ${D}${includedir}/spirv/unified1 +} + +FILES_SOLIBSDEV = "" +FILES_${PN} += "${libdir}/*.so" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.154.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.154.0.bb deleted file mode 100644 index 0e4d26096..000000000 --- a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.154.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Vulkan Header files and API registry" -HOMEPAGE = "https://www.khronos.org/vulkan/" -BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master" - -SRCREV = "7f9879b1b1fab53f719a9ed5e6e29533b10972b2" - -S = "${WORKDIR}/git" - -inherit cmake - -FILES_${PN} += "${datadir}/vulkan" - -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.162.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.162.0.bb new file mode 100644 index 000000000..a28954ad7 --- /dev/null +++ b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.162.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "Vulkan Header files and API registry" +HOMEPAGE = "https://www.khronos.org/vulkan/" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master" + +SRCREV = "87aaa16d4c8e1ac70f8f04acdcd46eed4bd77209" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES_${PN} += "${datadir}/vulkan" + +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch b/poky/meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch new file mode 100644 index 000000000..26b1a40f2 --- /dev/null +++ b/poky/meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch @@ -0,0 +1,40 @@ +From 5ae24ece75f2caa69216da7075334711642f5588 Mon Sep 17 00:00:00 2001 +From: Michel Zou +Date: Wed, 16 Dec 2020 15:03:23 +0100 +Subject: [PATCH] Rename LIB_SUFFIX to VULKAN_LIB_SUFFIX + +Closes #527 + +Upstream-Status: Backport [https://github.com/KhronosGroup/Vulkan-Loader/commit/66a23ac8c566299343668f094de50798a5f4a0e4] +Signed-off-by: Alexander Kanavin +--- + loader/CMakeLists.txt | 2 +- + loader/vulkan.pc.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt +index 659511855..ba9f460f1 100644 +--- a/loader/CMakeLists.txt ++++ b/loader/CMakeLists.txt +@@ -327,7 +327,7 @@ if(PKG_CONFIG_FOUND) + set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}") + endforeach() + if(WIN32) +- set(LIB_SUFFIX "-1") ++ set(VULKAN_LIB_SUFFIX "-1") + endif () + configure_file("vulkan.pc.in" "vulkan.pc" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in +index fc17cb1f3..44049ee34 100644 +--- a/loader/vulkan.pc.in ++++ b/loader/vulkan.pc.in +@@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + Name: @CMAKE_PROJECT_NAME@ + Description: Vulkan Loader + Version: @VK_API_VERSION@ +-Libs: -L${libdir} -lvulkan@LIB_SUFFIX@ ++Libs: -L${libdir} -lvulkan@VULKAN_LIB_SUFFIX@ + Libs.private: @PRIVATE_LIBS@ + Cflags: -I${includedir} + diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.154.1.bb b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.154.1.bb deleted file mode 100644 index 23bf59f8a..000000000 --- a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.154.1.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "3D graphics and compute API common loader" -DESCRIPTION = "Vulkan is a new generation graphics and compute API \ -that provides efficient access to modern GPUs. These packages \ -provide only the common vendor-agnostic library loader, headers and \ -the vulkaninfo utility." -HOMEPAGE = "https://www.khronos.org/vulkan/" -BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.2.154" -SRCREV = "2aa801755eab3fab610d9676c4dd94054e30c854" - -S = "${WORKDIR}/git" - -REQUIRED_DISTRO_FEATURES = "vulkan" - -inherit cmake features_check -ANY_OF_DISTRO_FEATURES = "x11 wayland" - -DEPENDS += "vulkan-headers" - -EXTRA_OECMAKE = "\ - -DBUILD_TESTS=OFF \ - -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ - -DASSEMBLER_WORKS=FALSE \ - " - -# must choose x11 or wayland or both -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" - -PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" -PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" - -RRECOMMENDS_${PN} = "mesa-vulkan-drivers" - -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb new file mode 100644 index 000000000..d39e7af97 --- /dev/null +++ b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb @@ -0,0 +1,40 @@ +SUMMARY = "3D graphics and compute API common loader" +DESCRIPTION = "Vulkan is a new generation graphics and compute API \ +that provides efficient access to modern GPUs. These packages \ +provide only the common vendor-agnostic library loader, headers and \ +the vulkaninfo utility." +HOMEPAGE = "https://www.khronos.org/vulkan/" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git \ + file://0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch \ + " +SRCREV = "7a313093b5c4af964d50a5a64e73d7df6152ea3f" + +S = "${WORKDIR}/git" + +REQUIRED_DISTRO_FEATURES = "vulkan" + +inherit cmake features_check +ANY_OF_DISTRO_FEATURES = "x11 wayland" + +DEPENDS += "vulkan-headers" + +EXTRA_OECMAKE = "\ + -DBUILD_TESTS=OFF \ + -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ + -DASSEMBLER_WORKS=FALSE \ + " + +# must choose x11 or wayland or both +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" + +PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" +PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" + +RRECOMMENDS_${PN} = "mesa-vulkan-drivers" + +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 378572323..896b24832 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -9,7 +9,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "b4fe3addff337f3c264a6f7dd62be60c726fcc03" +SRCREV = "fdc8fab1a520df5566de3eda7b526b24f04e6379" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.154.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.154.0.bb deleted file mode 100644 index 0fc3494ee..000000000 --- a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.154.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Vulkan Utilities and Tools" -HOMEPAGE = "https://www.khronos.org/vulkan/" -BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Tools" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.154" -SRCREV = "10d757bb1072416ddfbe4c24b43d4cd2f808a5c7" - -S = "${WORKDIR}/git" - -inherit cmake features_check -ANY_OF_DISTRO_FEATURES = "x11 wayland" -REQUIRED_DISTRO_FEATURES = "vulkan" - -DEPENDS += "vulkan-headers vulkan-loader" - -EXTRA_OECMAKE = "\ - -DBUILD_TESTS=OFF \ - -DBUILD_CUBE=OFF \ - -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ - " - -# must choose x11 or wayland or both -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" - -PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" -PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" - -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.162.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.162.0.bb new file mode 100644 index 000000000..972859c93 --- /dev/null +++ b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.162.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "Vulkan Utilities and Tools" +HOMEPAGE = "https://www.khronos.org/vulkan/" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Tools" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.162" +SRCREV = "9e9d7c24ed8b321815f77f31c100bbf9462193b4" + +S = "${WORKDIR}/git" + +inherit cmake features_check +ANY_OF_DISTRO_FEATURES = "x11 wayland" +REQUIRED_DISTRO_FEATURES = "vulkan" + +DEPENDS += "vulkan-headers vulkan-loader" + +EXTRA_OECMAKE = "\ + -DBUILD_TESTS=OFF \ + -DBUILD_CUBE=OFF \ + -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ + " + +# must choose x11 or wayland or both +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" + +PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" +PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" + +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb deleted file mode 100644 index 3280813ef..000000000 --- a/poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Utility to display window and font properties of an X server" - -DESCRIPTION = "The xprop utility is for displaying window and font \ -properties in an X server. One window or font is selected using the \ -command line arguments or possibly in the case of a window, by clicking \ -on the desired window. A list of properties is then given, possibly with \ -formatting information." - -LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91" - -DEPENDS += "libxmu" - -PE = "1" - -SRC_URI[md5sum] = "cc369c28383a5d7144e7197ee7d30bfa" -SRC_URI[sha256sum] = "8c77fb096e46c60032b7e2bde9492c3ffcc18734f50b395085a5f10bfd3cf753" diff --git a/poky/meta/recipes-graphics/xorg-app/xprop_1.2.5.bb b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.5.bb new file mode 100644 index 000000000..b1589a8d7 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.5.bb @@ -0,0 +1,17 @@ +require xorg-app-common.inc + +SUMMARY = "Utility to display window and font properties of an X server" + +DESCRIPTION = "The xprop utility is for displaying window and font \ +properties in an X server. One window or font is selected using the \ +command line arguments or possibly in the case of a window, by clicking \ +on the desired window. A list of properties is then given, possibly with \ +formatting information." + +LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91" + +DEPENDS += "libxmu" + +PE = "1" + +SRC_URI[sha256sum] = "9b92ed0316bf2486121d8bac88bd1878f16b43bd335f18009b1f941f1eca93a1" diff --git a/poky/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch b/poky/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch deleted file mode 100644 index 3f9714308..000000000 --- a/poky/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch +++ /dev/null @@ -1,56 +0,0 @@ -Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/lib/libx11/merge_requests/33] -Signed-off-by: Ross Burton - -From b41469c5f08b1f3365667ff3c430b104c9b8e25f Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Wed, 22 Jan 2020 17:11:23 +0000 -Subject: [PATCH libX11] cpprules.in: squash whitespace in generated files - -CPP is used to generate files, but as cpp reads files from the build host the -output has a number of blank lines at the beginning which varies depending on -what GCC and friends is used. - -Pathalogical example: - - $ cpp -undef -traditional /dev/null - # 1 "/dev/null" - # 1 "" - # 1 "" - # 31 "" - # 1 "/usr/include/stdc-predef.h" 1 3 4 - - # 17 "/usr/include/stdc-predef.h" 3 4 - - [ 40 blank line ] - - # 32 "" 2 - # 1 "/dev/null" - -So depending on the content of stdc-predef.h and what other headers CPP will -load, the amount of whitespace in the generates files varies. This can result in -differences in reproducible environments, and file conflicts in multilib -environments. - -As whitespace is irrelevant to these machine-readable files, extend the sed to -just delete blank lines. ---- - cpprules.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/cpprules.in b/cpprules.in -index 03d6701e..ce6b3c98 100644 ---- a/cpprules.in -+++ b/cpprules.in -@@ -23,7 +23,8 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ - -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ - -e '/^[ ]*XHASH/s/XHASH/\#/' \ - -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \ -- -e '/\@\@$$/s/\@\@$$/\\/' -+ -e '/\@\@$$/s/\@\@$$/\\/' \ -+ -e '/^$$/d' - - .pre: - @$(MKDIR_P) $(@D) --- -2.20.1 - diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb b/poky/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb index 3d97ad78d..0f4be3577 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb @@ -15,7 +15,7 @@ SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f" SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5" SRC_URI += "file://0001-Drop-x11-dependencies.patch \ - file://libx11-whitespace.patch" + " XORG_PN = "libX11" diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.12.bb b/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.12.bb deleted file mode 100644 index de7f1c366..000000000 --- a/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.12.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Xlib: C Language X Interface library" - -DESCRIPTION = "This package provides a client interface to the X Window \ -System, otherwise known as 'Xlib'. It provides a complete API for the \ -basic functions of the window system." - -require xorg-lib-common.inc - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" - -PE = "1" - -SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ - file://disable_tests.patch \ - file://libx11-whitespace.patch" - -SRC_URI[sha256sum] = "f108227469419ac04d196df0f3b80ce1f7f65059bb54c0de811f4d8e03fd6ec7" - -PROVIDES = "virtual/libx11" - -XORG_PN = "libX11" -LICENSE = "MIT & MIT-style & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" - -DEPENDS += "xorgproto xtrans libxcb" -DEPENDS += "xorgproto-native" - -EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont" -EXTRA_OEMAKE += 'CWARNFLAGS=""' - -PACKAGECONFIG ??= "xcms" -PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" - -# src/util/makekeys is built natively but needs -D_GNU_SOURCE defined. -CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE" - -PACKAGES =+ "${PN}-xcb" - -inherit gettext - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" -FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb b/poky/meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb new file mode 100644 index 000000000..3faee6e49 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb @@ -0,0 +1,45 @@ +SUMMARY = "Xlib: C Language X Interface library" + +DESCRIPTION = "This package provides a client interface to the X Window \ +System, otherwise known as 'Xlib'. It provides a complete API for the \ +basic functions of the window system." + +require xorg-lib-common.inc + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" + +PE = "1" + +SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ + file://disable_tests.patch \ + " + +SRC_URI[sha256sum] = "36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54" + +PROVIDES = "virtual/libx11" + +XORG_PN = "libX11" +LICENSE = "MIT & MIT-style & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" + +DEPENDS += "xorgproto xtrans libxcb" +DEPENDS += "xorgproto-native" + +EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont" +EXTRA_OEMAKE += 'CWARNFLAGS=""' + +PACKAGECONFIG ??= "xcms" +PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" + +# src/util/makekeys is built natively but needs -D_GNU_SOURCE defined. +CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE" + +PACKAGES =+ "${PN}-xcb" + +inherit gettext + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" +FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb new file mode 100644 index 000000000..5c6dbac4d --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb @@ -0,0 +1,33 @@ +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 \ + file://0001-drmmode_display.c-add-missing-mi.h-include.patch \ + file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ + file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ + " +SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" + +# These extensions are now integrated into the server, so declare the migration +# path for in-place upgrades. + +RREPLACES_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RPROVIDES_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RCONFLICTS_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb deleted file mode 100644 index c83e43ed9..000000000 --- a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb +++ /dev/null @@ -1,33 +0,0 @@ -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 \ - file://0001-drmmode_display.c-add-missing-mi.h-include.patch \ - file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ - file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ - " -SRC_URI[sha256sum] = "e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571" - -# These extensions are now integrated into the server, so declare the migration -# path for in-place upgrades. - -RREPLACES_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RPROVIDES_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RCONFLICTS_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " diff --git a/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index ea33732a3..27eef7fb6 100644 --- a/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/poky/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 = "df4390b18a500a1a7d4695e1856971f8e36ce517" +SRCREV = "73f813024d33432116a122524fd2ae48afc910c7" PR = "r12" PV = "0.2+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch deleted file mode 100644 index 31f4d00b5..000000000 --- a/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch +++ /dev/null @@ -1,78 +0,0 @@ -From c5fec6d6368b4103557deb710150119dca438544 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 5 Aug 2020 10:46:39 -0700 -Subject: [PATCH] kexec: Fix build with -fno-common - -Ensure that my_debug is not doubly defined - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - kexec/arch/ppc64/kexec-elf-ppc64.c | 2 -- - kexec/fs2dt.h | 2 +- - 2 files changed, 1 insertion(+), 3 deletions(-) - ---- a/kexec/arch/ppc64/kexec-elf-ppc64.c -+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c -@@ -44,8 +44,6 @@ - uint64_t initrd_base, initrd_size; - unsigned char reuse_initrd = 0; - const char *ramdisk; --/* Used for enabling printing message from purgatory code */ --int my_debug = 0; - - int elf_ppc64_probe(const char *buf, off_t len) - { ---- a/kexec/fs2dt.h -+++ b/kexec/fs2dt.h -@@ -30,7 +30,7 @@ extern struct bootblock bb[1]; - - /* Used for enabling printing message from purgatory code - * Only has implemented for PPC64 */ --int my_debug; -+extern int my_debug; - extern int dt_no_old_root; - - void reserve(unsigned long long where, unsigned long long length); ---- a/kexec/arch/arm64/kexec-arm64.h -+++ b/kexec/arch/arm64/kexec-arm64.h -@@ -50,8 +50,8 @@ int zImage_arm64_load(int argc, char **a - void zImage_arm64_usage(void); - - --off_t initrd_base; --off_t initrd_size; -+extern off_t initrd_base; -+extern off_t initrd_size; - - /** - * struct arm64_mem - Memory layout info. -@@ -65,7 +65,7 @@ struct arm64_mem { - }; - - #define arm64_mem_ngv UINT64_MAX --struct arm64_mem arm64_mem; -+extern struct arm64_mem arm64_mem; - - uint64_t get_phys_offset(void); - uint64_t get_vp_offset(void); ---- a/kexec/arch/x86_64/kexec-bzImage64.c -+++ b/kexec/arch/x86_64/kexec-bzImage64.c -@@ -42,7 +42,6 @@ - #include - - static const int probe_debug = 0; --int bzImage_support_efi_boot; - - int bzImage64_probe(const char *buf, off_t len) - { ---- a/kexec/arch/ppc/kexec-elf-ppc.c -+++ b/kexec/arch/ppc/kexec-elf-ppc.c -@@ -33,7 +33,6 @@ - static const int probe_debug = 0; - - unsigned char reuse_initrd; --const char *ramdisk; - int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, - char *); - diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch new file mode 100644 index 000000000..6aeebc393 --- /dev/null +++ b/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch @@ -0,0 +1,23 @@ +From ba2fb5baf6b0a8c882ac32301dd7a8d16de0dcf6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 27 Dec 2020 23:39:29 +0100 +Subject: [PATCH] kexec/arch/ppc/kexec-ppc.c: correct double definition error + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + kexec/arch/ppc/kexec-ppc.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/kexec/arch/ppc/kexec-ppc.c b/kexec/arch/ppc/kexec-ppc.c +index 03bec36..5b3e244 100644 +--- a/kexec/arch/ppc/kexec-ppc.c ++++ b/kexec/arch/ppc/kexec-ppc.c +@@ -35,7 +35,6 @@ unsigned long long initrd_base = 0, initrd_size = 0; + unsigned long long ramdisk_base = 0, ramdisk_size = 0; + unsigned int rtas_base, rtas_size; + int max_memory_ranges; +-const char *ramdisk; + + /* + * Reads the #address-cells and #size-cells on this platform. diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools/0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch deleted file mode 100644 index a809d5ba8..000000000 --- a/poky/meta/recipes-kernel/kexec/kexec-tools/0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 8c9a5076543eb3d497e016b3d7707e93d6311883 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= -Date: Mon, 15 Jul 2013 23:32:36 -0700 -Subject: [PATCH] x86_64: Add support to build kexec-tools with x32 ABI -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Summary of changes, - -configure.ac: Add test for detect x32 ABI. -purgatory/arch/x86_64/Makefile: Not use mcmodel large when - x32 ABI is set. -kexec/arch/x86_64/kexec-elf-rel-x86_64.c: When x32 ABI is set - use ELFCLASS32 instead of ELFCLASS64. -kexec/kexec-syscall.h: Add correct syscall number for x32 ABI. - -Upstream-Status: Submitted - -Signed-off-by: Aníbal Limón -Signed-off-by: Mariano Lopez ---- - configure.ac | 9 +++++++++ - kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 4 ++++ - kexec/kexec-syscall.h | 4 ++++ - purgatory/arch/x86_64/Makefile | 4 +++- - 4 files changed, 20 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c2b0c68..60882b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,15 @@ case $target_cpu in - ;; - ia64|x86_64|alpha|m68k ) - ARCH="$target_cpu" -+ -+ dnl ---Test for x32 ABI in x86_64 -+ if test "x$ARCH" = "xx86_64" ; then -+ AC_EGREP_CPP(x32_test, -+ [#if defined(__x86_64__) && defined (__ILP32__) -+ x32_test -+ #endif -+ ], SUBARCH='x32', SUBARCH='64') -+ fi - ;; - * ) - AC_MSG_ERROR([unsupported architecture $target_cpu]) -diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -index db85b44..0ce1172 100644 ---- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -+++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -@@ -8,7 +8,11 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) - if (ehdr->ei_data != ELFDATA2LSB) { - return 0; - } -+#ifdef __ILP32__ -+ if (ehdr->ei_class != ELFCLASS32) { -+#else - if (ehdr->ei_class != ELFCLASS64) { -+#endif - return 0; - } - if (ehdr->e_machine != EM_X86_64) { -diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h -index dac1c1f..e9479b7 100644 ---- a/kexec/kexec-syscall.h -+++ b/kexec/kexec-syscall.h -@@ -31,8 +31,12 @@ - #define __NR_kexec_load 268 - #endif - #ifdef __x86_64__ -+#ifdef __ILP32__ -+#define __NR_kexec_load 528 -+#else - #define __NR_kexec_load 246 - #endif -+#endif - #ifdef __s390x__ - #define __NR_kexec_load 277 - #endif -diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile -index 7300937..4af11e4 100644 ---- a/purgatory/arch/x86_64/Makefile -+++ b/purgatory/arch/x86_64/Makefile -@@ -23,4 +23,6 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c - x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c - x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c - --x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large -+ifeq ($(SUBARCH),64) -+ x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large -+endif diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools/0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch deleted file mode 100644 index 6811dfa59..000000000 --- a/poky/meta/recipes-kernel/kexec/kexec-tools/0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b54816eff272324320c490d62dc36b27d2838732 Mon Sep 17 00:00:00 2001 -From: Quanyang Wang -Date: Mon, 16 Sep 2019 10:49:05 +0800 -Subject: [PATCH] kexec/arm: undefine __NR_kexec_file_load for arm - -In the kernel upstream commit 4ab65ba7a5cb -("ARM: add kexec_file_load system call number"), -__NR_kexec_file_load for arm has been defined to be 401. -This results that even if kexec_file_load isn't implemented -for arm but the function is_kexec_file_load_implemented() -will still return true. So undef __NR_kexec_file_load for -arm architecture. - -Upstream-Status: Backport -[https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/kexec/kexec-syscall.h?id=b54816eff272324320c490d62dc36b27d2838732] - -Signed-off-by: Quanyang Wang -Signed-off-by: Simon Horman ---- - kexec/kexec-syscall.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h -index dac1c1f..92d51d3 100644 ---- a/kexec/kexec-syscall.h -+++ b/kexec/kexec-syscall.h -@@ -56,6 +56,10 @@ - #endif - #endif /*ifndef __NR_kexec_load*/ - -+#ifdef __arm__ -+#undef __NR_kexec_file_load -+#endif -+ - #ifndef __NR_kexec_file_load - - #ifdef __x86_64__ --- -2.17.1 - diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch index b91608e52..36b0845f4 100644 --- a/poky/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch +++ b/poky/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch @@ -1,20 +1,21 @@ -From d294c5039753a36506949ba5dc782a4c0b307b74 Mon Sep 17 00:00:00 2001 +From bb6a26371d15473b380459ac4404bf330634b585 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 20 Dec 2019 17:21:08 +0100 Subject: [PATCH] kexec: un-break the build on 32 bit x86 Upstream-Status: Pending Signed-off-by: Alexander Kanavin + --- kexec/arch/i386/Makefile | 1 + kexec/arch/i386/kexec-x86.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile -index 105cefd..25df57a 100644 +index f486103..5d560be 100644 --- a/kexec/arch/i386/Makefile +++ b/kexec/arch/i386/Makefile -@@ -11,6 +11,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c +@@ -12,6 +12,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c @@ -23,7 +24,7 @@ index 105cefd..25df57a 100644 dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \ kexec/arch/i386/crashdump-x86.h \ diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h -index 1b58c3b..d6b10c0 100644 +index 0f941df..c423171 100644 --- a/kexec/arch/i386/kexec-x86.h +++ b/kexec/arch/i386/kexec-x86.h @@ -56,9 +56,13 @@ struct arch_options_t { @@ -38,5 +39,5 @@ index 1b58c3b..d6b10c0 100644 void multiboot_x86_usage(void); +void multiboot2_x86_usage(void); - int elf_x86_probe(const char *buf, off_t len); - int elf_x86_load(int argc, char **argv, const char *buf, off_t len, + int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len, + struct kexec_info *info); diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb b/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb deleted file mode 100644 index 69d2e9bfb..000000000 --- a/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb +++ /dev/null @@ -1,91 +0,0 @@ - -SUMMARY = "Kexec fast reboot tools" -DESCRIPTION = "Kexec is a fast reboot feature that lets you reboot to a new Linux kernel" -AUTHOR = "Eric Biederman" -HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/" -SECTION = "kernel/userland" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \ - file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09" -DEPENDS = "zlib xz" - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \ - file://kdump \ - file://kdump.conf \ - file://kdump.service \ - file://0001-powerpc-change-the-memory-size-limit.patch \ - file://0002-purgatory-Pass-r-directly-to-linker.patch \ - file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \ - file://0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch \ - file://0005-Disable-PIE-during-link.patch \ - file://0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch \ - file://0007-kexec-un-break-the-build-on-32-bit-x86.patch \ - file://0001-kexec-Fix-build-with-fno-common.patch \ - file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \ - " - -SRC_URI[md5sum] = "46724b67f32501c5d3e778161347cad9" -SRC_URI[sha256sum] = "cb16d79818e0c9de3bb3e33ede5677c34a1d28c646379c7ab44e0faa3eb57a16" - -inherit autotools update-rc.d systemd - -export LDFLAGS = "-L${STAGING_LIBDIR}" -EXTRA_OECONF = " --with-zlib=yes" - -do_compile_prepend() { - # Remove the prepackaged config.h from the source tree as it overrides - # the same file generated by configure and placed in the build tree - rm -f ${S}/include/config.h - - # Remove the '*.d' file to make sure the recompile is OK - for dep in `find ${B} -type f -name '*.d'`; do - dep_no_d="`echo $dep | sed 's#.d$##'`" - # Remove file.d when there is a file.o - if [ -f "$dep_no_d.o" ]; then - rm -f $dep - fi - done -} - -do_install_append () { - install -d ${D}${sysconfdir}/sysconfig - install -m 0644 ${WORKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig - - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -D -m 0755 ${WORKDIR}/kdump ${D}${sysconfdir}/init.d/kdump - fi - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper - install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_unitdir}/system/kdump.service - sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_unitdir}/system/kdump.service - fi -} - -PACKAGES =+ "kexec kdump vmcore-dmesg" - -ALLOW_EMPTY_${PN} = "1" -RRECOMMENDS_${PN} = "kexec kdump vmcore-dmesg" - -FILES_kexec = "${sbindir}/kexec" -FILES_kdump = "${sbindir}/kdump \ - ${sysconfdir}/sysconfig/kdump.conf \ - ${sysconfdir}/init.d/kdump \ - ${libexecdir}/kdump-helper \ - ${systemd_unitdir}/system/kdump.service \ -" - -FILES_vmcore-dmesg = "${sbindir}/vmcore-dmesg" - -INITSCRIPT_PACKAGES = "kdump" -INITSCRIPT_NAME_kdump = "kdump" -INITSCRIPT_PARAMS_kdump = "start 56 2 3 4 5 . stop 56 0 1 6 ." - -SYSTEMD_PACKAGES = "kdump" -SYSTEMD_SERVICE_kdump = "kdump.service" - -SECURITY_PIE_CFLAGS_remove = "-fPIE -pie" - -COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)' - -INSANE_SKIP_${PN} = "arch" diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.21.bb b/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.21.bb new file mode 100644 index 000000000..069e8f4d0 --- /dev/null +++ b/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.21.bb @@ -0,0 +1,88 @@ + +SUMMARY = "Kexec fast reboot tools" +DESCRIPTION = "Kexec is a fast reboot feature that lets you reboot to a new Linux kernel" +AUTHOR = "Eric Biederman" +HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/" +SECTION = "kernel/userland" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \ + file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09" +DEPENDS = "zlib xz" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \ + file://kdump \ + file://kdump.conf \ + file://kdump.service \ + file://0001-powerpc-change-the-memory-size-limit.patch \ + file://0002-purgatory-Pass-r-directly-to-linker.patch \ + file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \ + file://0005-Disable-PIE-during-link.patch \ + file://0007-kexec-un-break-the-build-on-32-bit-x86.patch \ + file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \ + file://0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch \ + " + +SRC_URI[sha256sum] = "b3d4cfd2ba10d68ce341ea3b8ca414d00a0b6183b95686172154f94bce834f94" + +inherit autotools update-rc.d systemd + +export LDFLAGS = "-L${STAGING_LIBDIR}" +EXTRA_OECONF = " --with-zlib=yes" + +do_compile_prepend() { + # Remove the prepackaged config.h from the source tree as it overrides + # the same file generated by configure and placed in the build tree + rm -f ${S}/include/config.h + + # Remove the '*.d' file to make sure the recompile is OK + for dep in `find ${B} -type f -name '*.d'`; do + dep_no_d="`echo $dep | sed 's#.d$##'`" + # Remove file.d when there is a file.o + if [ -f "$dep_no_d.o" ]; then + rm -f $dep + fi + done +} + +do_install_append () { + install -d ${D}${sysconfdir}/sysconfig + install -m 0644 ${WORKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -D -m 0755 ${WORKDIR}/kdump ${D}${sysconfdir}/init.d/kdump + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper + install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_unitdir}/system/kdump.service + sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_unitdir}/system/kdump.service + fi +} + +PACKAGES =+ "kexec kdump vmcore-dmesg" + +ALLOW_EMPTY_${PN} = "1" +RRECOMMENDS_${PN} = "kexec kdump vmcore-dmesg" + +FILES_kexec = "${sbindir}/kexec" +FILES_kdump = "${sbindir}/kdump \ + ${sysconfdir}/sysconfig/kdump.conf \ + ${sysconfdir}/init.d/kdump \ + ${libexecdir}/kdump-helper \ + ${systemd_unitdir}/system/kdump.service \ +" + +FILES_vmcore-dmesg = "${sbindir}/vmcore-dmesg" + +INITSCRIPT_PACKAGES = "kdump" +INITSCRIPT_NAME_kdump = "kdump" +INITSCRIPT_PARAMS_kdump = "start 56 2 3 4 5 . stop 56 0 1 6 ." + +SYSTEMD_PACKAGES = "kdump" +SYSTEMD_SERVICE_kdump = "kdump.service" + +SECURITY_PIE_CFLAGS_remove = "-fPIE -pie" + +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)' + +INSANE_SKIP_${PN} = "arch" diff --git a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201118.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201118.bb deleted file mode 100644 index baac26c51..000000000 --- a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201118.bb +++ /dev/null @@ -1,1004 +0,0 @@ -SUMMARY = "Firmware files for use with Linux kernel" -SECTION = "kernel" - -LICENSE = "\ - Firmware-Abilis \ - & Firmware-adsp_sst \ - & Firmware-agere \ - & Firmware-amdgpu \ - & Firmware-amd-ucode \ - & Firmware-amlogic_vdec \ - & Firmware-atheros_firmware \ - & Firmware-atmel \ - & Firmware-broadcom_bcm43xx \ - & Firmware-ca0132 \ - & Firmware-cavium \ - & Firmware-chelsio_firmware \ - & Firmware-cw1200 \ - & Firmware-cypress \ - & Firmware-dib0700 \ - & Firmware-e100 \ - & Firmware-ene_firmware \ - & Firmware-fw_sst_0f28 \ - & Firmware-go7007 \ - & Firmware-GPLv2 \ - & Firmware-hfi1_firmware \ - & Firmware-i2400m \ - & Firmware-i915 \ - & Firmware-ibt_firmware \ - & Firmware-ice \ - & Firmware-it913x \ - & Firmware-iwlwifi_firmware \ - & Firmware-IntcSST2 \ - & Firmware-kaweth \ - & Firmware-Marvell \ - & Firmware-moxa \ - & Firmware-myri10ge_firmware \ - & Firmware-netronome \ - & Firmware-nvidia \ - & Firmware-OLPC \ - & Firmware-ath9k-htc \ - & Firmware-phanfw \ - & Firmware-qat \ - & Firmware-qcom \ - & Firmware-qla1280 \ - & Firmware-qla2xxx \ - & Firmware-qualcommAthos_ar3k \ - & Firmware-qualcommAthos_ath10k \ - & Firmware-r8a779x_usb3 \ - & Firmware-radeon \ - & Firmware-ralink_a_mediatek_company_firmware \ - & Firmware-ralink-firmware \ - & Firmware-rtlwifi_firmware \ - & Firmware-imx-sdma_firmware \ - & Firmware-siano \ - & Firmware-tda7706-firmware \ - & Firmware-ti-connectivity \ - & Firmware-ti-keystone \ - & Firmware-ueagle-atm4-firmware \ - & Firmware-via_vt6656 \ - & Firmware-wl1251 \ - & Firmware-xc4000 \ - & Firmware-xc5000 \ - & Firmware-xc5000c \ - & WHENCE \ -" - -LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ - file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ - file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ - file://LICENSE.amdgpu;md5=d357524f5099e2a3db3c1838921c593f \ - file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \ - file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ - file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ - file://LICENSE.atmel;md5=aa74ac0c60595dee4d4e239107ea77a3 \ - file://LICENCE.broadcom_bcm43xx;md5=3160c14df7228891b868060e1951dfbc \ - file://LICENCE.ca0132;md5=209b33e66ee5be0461f13d31da392198 \ - file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0 \ - file://LICENCE.cavium;md5=c37aaffb1ebe5939b2580d073a95daea \ - file://LICENCE.chelsio_firmware;md5=819aa8c3fa453f1b258ed8d168a9d903 \ - file://LICENCE.cw1200;md5=f0f770864e7a8444a5c5aa9d12a3a7ed \ - file://LICENCE.cypress;md5=48cd9436c763bf873961f9ed7b5c147b \ - file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \ - file://LICENCE.e100;md5=ec0f84136766df159a3ae6d02acdf5a8 \ - file://LICENCE.ene_firmware;md5=ed67f0f62f8f798130c296720b7d3921 \ - file://LICENCE.fw_sst_0f28;md5=6353931c988ad52818ae733ac61cd293 \ - file://LICENCE.go7007;md5=c0bb9f6aaaba55b0529ee9b30aa66beb \ - file://GPL-2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.hfi1_firmware;md5=5e7b6e586ce7339d12689e49931ad444 \ - file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ - file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ - file://LICENCE.ibt_firmware;md5=fdbee1ddfe0fb7ab0b2fcd6b454a366b \ - file://LICENSE.ice;md5=742ab4850f2670792940e6d15c974b2f \ - file://LICENCE.IntcSST2;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ - file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ - file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \ - file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \ - file://LICENCE.Marvell;md5=28b6ed8bd04ba105af6e4dcd6e997772 \ - file://LICENCE.mediatek;md5=7c1976b63217d76ce47d0a11d8a79cf2 \ - file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ - file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ - file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \ - file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ - file://LICENCE.NXP;md5=58bb8ba632cd729b9ba6183bc6aed36f \ - file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ - file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ - file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ - file://LICENCE.qat_firmware;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ - file://LICENSE.qcom;md5=164e3362a538eb11d3ac51e8e134294b \ - file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \ - file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \ - file://LICENSE.QualcommAtheros_ar3k;md5=b5fe244fb2b532311de1472a3bc06da5 \ - file://LICENSE.QualcommAtheros_ath10k;md5=cb42b686ee5f5cb890275e4321db60a8 \ - file://LICENCE.r8a779x_usb3;md5=4c1671656153025d7076105a5da7e498 \ - file://LICENSE.radeon;md5=68ec28bacb3613200bca44f404c69b16 \ - file://LICENCE.ralink_a_mediatek_company_firmware;md5=728f1a85fd53fd67fa8d7afb080bc435 \ - file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \ - file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ - file://LICENSE.sdma_firmware;md5=51e8c19ecc2270f4b8ea30341ad63ce9 \ - file://LICENCE.siano;md5=4556c1bf830067f12ca151ad953ec2a5 \ - file://LICENCE.tda7706-firmware.txt;md5=835997cf5e3c131d0dddd695c7d9103e \ - file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \ - file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \ - file://LICENCE.ueagle-atm4-firmware;md5=4ed7ea6b507ccc583b9d594417714118 \ - file://LICENCE.via_vt6656;md5=e4159694cba42d4377a912e78a6e850f \ - file://LICENCE.wl1251;md5=ad3f81922bb9e197014bb187289d3b5b \ - file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ - file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ - file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=ef221e03fc58f4d34a132b801dfa1d68 \ - " - -# These are not common licenses, set NO_GENERIC_LICENSE for them -# so that the license files will be copied from fetched source -NO_GENERIC_LICENSE[Firmware-Abilis] = "LICENCE.Abilis" -NO_GENERIC_LICENSE[Firmware-adsp_sst] = "LICENCE.adsp_sst" -NO_GENERIC_LICENSE[Firmware-agere] = "LICENCE.agere" -NO_GENERIC_LICENSE[Firmware-amdgpu] = "LICENSE.amdgpu" -NO_GENERIC_LICENSE[Firmware-amd-ucode] = "LICENSE.amd-ucode" -NO_GENERIC_LICENSE[Firmware-amlogic_vdec] = "LICENSE.amlogic_vdec" -NO_GENERIC_LICENSE[Firmware-atheros_firmware] = "LICENCE.atheros_firmware" -NO_GENERIC_LICENSE[Firmware-atmel] = "LICENSE.atmel" -NO_GENERIC_LICENSE[Firmware-broadcom_bcm43xx] = "LICENCE.broadcom_bcm43xx" -NO_GENERIC_LICENSE[Firmware-ca0132] = "LICENCE.ca0132" -NO_GENERIC_LICENSE[Firmware-cadence] = "LICENCE.cadence" -NO_GENERIC_LICENSE[Firmware-cavium] = "LICENCE.cavium" -NO_GENERIC_LICENSE[Firmware-chelsio_firmware] = "LICENCE.chelsio_firmware" -NO_GENERIC_LICENSE[Firmware-cw1200] = "LICENCE.cw1200" -NO_GENERIC_LICENSE[Firmware-cypress] = "LICENCE.cypress" -NO_GENERIC_LICENSE[Firmware-dib0700] = "LICENSE.dib0700" -NO_GENERIC_LICENSE[Firmware-e100] = "LICENCE.e100" -NO_GENERIC_LICENSE[Firmware-ene_firmware] = "LICENCE.ene_firmware" -NO_GENERIC_LICENSE[Firmware-fw_sst_0f28] = "LICENCE.fw_sst_0f28" -NO_GENERIC_LICENSE[Firmware-go7007] = "LICENCE.go7007" -NO_GENERIC_LICENSE[Firmware-GPLv2] = "GPL-2" -NO_GENERIC_LICENSE[Firmware-hfi1_firmware] = "LICENSE.hfi1_firmware" -NO_GENERIC_LICENSE[Firmware-i2400m] = "LICENCE.i2400m" -NO_GENERIC_LICENSE[Firmware-i915] = "LICENSE.i915" -NO_GENERIC_LICENSE[Firmware-ibt_firmware] = "LICENCE.ibt_firmware" -NO_GENERIC_LICENSE[Firmware-ice] = "LICENSE.ice" -NO_GENERIC_LICENSE[Firmware-IntcSST2] = "LICENCE.IntcSST2" -NO_GENERIC_LICENSE[Firmware-it913x] = "LICENCE.it913x" -NO_GENERIC_LICENSE[Firmware-iwlwifi_firmware] = "LICENCE.iwlwifi_firmware" -NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth" -NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell" -NO_GENERIC_LICENSE[Firmware-mediatek] = "LICENCE.mediatek" -NO_GENERIC_LICENSE[Firmware-moxa] = "LICENCE.moxa" -NO_GENERIC_LICENSE[Firmware-myri10ge_firmware] = "LICENCE.myri10ge_firmware" -NO_GENERIC_LICENSE[Firmware-netronome] = "LICENCE.Netronome" -NO_GENERIC_LICENSE[Firmware-nvidia] = "LICENCE.nvidia" -NO_GENERIC_LICENSE[Firmware-OLPC] = "LICENCE.OLPC" -NO_GENERIC_LICENSE[Firmware-ath9k-htc] = "LICENCE.open-ath9k-htc-firmware" -NO_GENERIC_LICENSE[Firmware-phanfw] = "LICENCE.phanfw" -NO_GENERIC_LICENSE[Firmware-qat] = "LICENCE.qat_firmware" -NO_GENERIC_LICENSE[Firmware-qcom] = "LICENSE.qcom" -NO_GENERIC_LICENSE[Firmware-qla1280] = "LICENCE.qla1280" -NO_GENERIC_LICENSE[Firmware-qla2xxx] = "LICENCE.qla2xxx" -NO_GENERIC_LICENSE[Firmware-qualcommAthos_ar3k] = "LICENSE.QualcommAtheros_ar3k" -NO_GENERIC_LICENSE[Firmware-qualcommAthos_ath10k] = "LICENSE.QualcommAtheros_ath10k" -NO_GENERIC_LICENSE[Firmware-r8a779x_usb3] = "LICENCE.r8a779x_usb3" -NO_GENERIC_LICENSE[Firmware-radeon] = "LICENSE.radeon" -NO_GENERIC_LICENSE[Firmware-ralink_a_mediatek_company_firmware] = "LICENCE.ralink_a_mediatek_company_firmware" -NO_GENERIC_LICENSE[Firmware-ralink-firmware] = "LICENCE.ralink-firmware.txt" -NO_GENERIC_LICENSE[Firmware-rtlwifi_firmware] = "LICENCE.rtlwifi_firmware.txt" -NO_GENERIC_LICENSE[Firmware-siano] = "LICENCE.siano" -NO_GENERIC_LICENSE[Firmware-imx-sdma_firmware] = "LICENSE.sdma_firmware" -NO_GENERIC_LICENSE[Firmware-tda7706-firmware] = "LICENCE.tda7706-firmware.txt" -NO_GENERIC_LICENSE[Firmware-ti-connectivity] = "LICENCE.ti-connectivity" -NO_GENERIC_LICENSE[Firmware-ti-keystone] = "LICENCE.ti-keystone" -NO_GENERIC_LICENSE[Firmware-ueagle-atm4-firmware] = "LICENCE.ueagle-atm4-firmware" -NO_GENERIC_LICENSE[Firmware-via_vt6656] = "LICENCE.via_vt6656" -NO_GENERIC_LICENSE[Firmware-wl1251] = "LICENCE.wl1251" -NO_GENERIC_LICENSE[Firmware-xc4000] = "LICENCE.xc4000" -NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" -NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" -NO_GENERIC_LICENSE[WHENCE] = "WHENCE" - -PE = "1" - -SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" - -SRC_URI[sha256sum] = "863d5a31da725b856a917280d1e3014929b3bc3d4e6e5faecf530c13afb7e2b9" - -inherit allarch - -CLEANBROKEN = "1" - -do_compile() { - : -} - -do_install() { - oe_runmake 'DESTDIR=${D}' 'FIRMWAREDIR=${nonarch_base_libdir}/firmware' install - cp GPL-2 LICEN[CS]E.* WHENCE ${D}${nonarch_base_libdir}/firmware/ -} - - -PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ - ${PN}-mt7601u-license ${PN}-mt7601u \ - ${PN}-radeon-license ${PN}-radeon \ - ${PN}-marvell-license ${PN}-pcie8897 ${PN}-pcie8997 \ - ${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 \ - ${PN}-sd8887 ${PN}-sd8897 ${PN}-sd8997 ${PN}-usb8997 \ - ${PN}-ti-connectivity-license ${PN}-wlcommon ${PN}-wl12xx ${PN}-wl18xx \ - ${PN}-vt6656-license ${PN}-vt6656 \ - ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \ - ${PN}-rtl8168 \ - ${PN}-cypress-license \ - ${PN}-broadcom-license \ - ${PN}-bcm-0bb4-0306 \ - ${PN}-bcm43143 \ - ${PN}-bcm43236b \ - ${PN}-bcm43241b0 \ - ${PN}-bcm43241b4 \ - ${PN}-bcm43241b5 \ - ${PN}-bcm43242a \ - ${PN}-bcm4329 \ - ${PN}-bcm4329-fullmac \ - ${PN}-bcm4330 \ - ${PN}-bcm4334 \ - ${PN}-bcm43340 \ - ${PN}-bcm4335 \ - ${PN}-bcm43362 \ - ${PN}-bcm4339 \ - ${PN}-bcm43430 \ - ${PN}-bcm43430a0 \ - ${PN}-bcm43455 \ - ${PN}-bcm4350 \ - ${PN}-bcm4350c2 \ - ${PN}-bcm4354 \ - ${PN}-bcm4356 \ - ${PN}-bcm4356-pcie \ - ${PN}-bcm43569 \ - ${PN}-bcm43570 \ - ${PN}-bcm4358 \ - ${PN}-bcm43602 \ - ${PN}-bcm4366b \ - ${PN}-bcm4366c \ - ${PN}-bcm4371 \ - ${PN}-bcm4373 \ - ${PN}-bcm43xx \ - ${PN}-bcm43xx-hdr \ - ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \ - ${PN}-gplv2-license ${PN}-carl9170 \ - ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-qca \ - \ - ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ - \ - ${PN}-iwlwifi-license ${PN}-iwlwifi \ - ${PN}-iwlwifi-135-6 \ - ${PN}-iwlwifi-3160-7 ${PN}-iwlwifi-3160-8 ${PN}-iwlwifi-3160-9 \ - ${PN}-iwlwifi-3160-10 ${PN}-iwlwifi-3160-12 ${PN}-iwlwifi-3160-13 \ - ${PN}-iwlwifi-3160-16 ${PN}-iwlwifi-3160-17 \ - ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2a-6 \ - ${PN}-iwlwifi-6000g2b-5 ${PN}-iwlwifi-6000g2b-6 \ - ${PN}-iwlwifi-6050-4 ${PN}-iwlwifi-6050-5 \ - ${PN}-iwlwifi-7260 \ - ${PN}-iwlwifi-7265 \ - ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \ - ${PN}-iwlwifi-9000 \ - ${PN}-iwlwifi-misc \ - ${PN}-ibt-license ${PN}-ibt \ - ${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7 ${PN}-ibt-hw-37-8 \ - ${PN}-ibt-17 \ - ${PN}-ibt-20 \ - ${PN}-ibt-misc \ - ${PN}-i915-license ${PN}-i915 \ - ${PN}-ice-license ${PN}-ice \ - ${PN}-adsp-sst-license ${PN}-adsp-sst \ - ${PN}-bnx2-mips \ - ${PN}-liquidio \ - ${PN}-nvidia-license \ - ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \ - ${PN}-nvidia-gpu \ - ${PN}-netronome-license ${PN}-netronome \ - ${PN}-qat ${PN}-qat-license \ - ${PN}-qcom-license \ - ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 ${PN}-qcom-venus-5.2 ${PN}-qcom-venus-5.4 \ - ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 ${PN}-qcom-adreno-a630 \ - ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ - ${PN}-amlogic-vdec-license ${PN}-amlogic-vdec \ - ${PN}-whence-license \ - ${PN}-license \ - " - -# For atheros -LICENSE_${PN}-ar9170 = "Firmware-atheros_firmware" -LICENSE_${PN}-ath6k = "Firmware-atheros_firmware" -LICENSE_${PN}-ath9k = "Firmware-atheros_firmware" -LICENSE_${PN}-atheros-license = "Firmware-atheros_firmware" - -FILES_${PN}-atheros-license = "${nonarch_base_libdir}/firmware/LICENCE.atheros_firmware" -FILES_${PN}-ar9170 = " \ - ${nonarch_base_libdir}/firmware/ar9170*.fw \ -" -FILES_${PN}-ath6k = " \ - ${nonarch_base_libdir}/firmware/ath6k \ -" -FILES_${PN}-ath9k = " \ - ${nonarch_base_libdir}/firmware/ar9271.fw \ - ${nonarch_base_libdir}/firmware/ar7010*.fw \ - ${nonarch_base_libdir}/firmware/htc_9271.fw \ - ${nonarch_base_libdir}/firmware/htc_7010.fw \ - ${nonarch_base_libdir}/firmware/ath9k_htc/htc_7010-1.4.0.fw \ - ${nonarch_base_libdir}/firmware/ath9k_htc/htc_9271-1.4.0.fw \ -" - -RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license" -RDEPENDS_${PN}-ath6k += "${PN}-atheros-license" -RDEPENDS_${PN}-ath9k += "${PN}-atheros-license" - -# For carl9170 -LICENSE_${PN}-carl9170 = "Firmware-GPLv2" -LICENSE_${PN}-gplv2-license = "Firmware-GPLv2" - -FILES_${PN}-gplv2-license = "${nonarch_base_libdir}/firmware/GPL-2" -FILES_${PN}-carl9170 = " \ - ${nonarch_base_libdir}/firmware/carl9170*.fw \ -" - -RDEPENDS_${PN}-carl9170 += "${PN}-gplv2-license" - -# For QualCommAthos -LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k" -LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" -LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k" -LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k" -LICENSE_${PN}-qca = "Firmware-qualcommAthos_ath10k" - -FILES_${PN}-ar3k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ar3k" -FILES_${PN}-ar3k = " \ - ${nonarch_base_libdir}/firmware/ar3k \ -" - -FILES_${PN}-ath10k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k" -FILES_${PN}-ath10k = " \ - ${nonarch_base_libdir}/firmware/ath10k \ -" - -FILES_${PN}-ath11k = " \ - ${nonarch_base_libdir}/firmware/ath11k \ -" - -FILES_${PN}-qca = " \ - ${nonarch_base_libdir}/firmware/qca \ -" - -RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license" -RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license" -RDEPENDS_${PN}-ath11k += "${PN}-ath10k-license" -RDEPENDS_${PN}-qca += "${PN}-ath10k-license" - -# For ralink -LICENSE_${PN}-ralink = "Firmware-ralink-firmware" -LICENSE_${PN}-ralink-license = "Firmware-ralink-firmware" - -FILES_${PN}-ralink-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink-firmware.txt" -FILES_${PN}-ralink = " \ - ${nonarch_base_libdir}/firmware/rt*.bin \ -" - -RDEPENDS_${PN}-ralink += "${PN}-ralink-license" - -# For mediatek MT7601U -LICENSE_${PN}-mt7601u = "Firmware-ralink_a_mediatek_company_firmware" -LICENSE_${PN}-mt7601u-license = "Firmware-ralink_a_mediatek_company_firmware" - -FILES_${PN}-mt7601u-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware" -FILES_${PN}-mt7601u = " \ - ${nonarch_base_libdir}/firmware/mt7601u.bin \ -" - -RDEPENDS_${PN}-mt7601u += "${PN}-mt7601u-license" - -# For radeon -LICENSE_${PN}-radeon = "Firmware-radeon" -LICENSE_${PN}-radeon-license = "Firmware-radeon" - -FILES_${PN}-radeon-license = "${nonarch_base_libdir}/firmware/LICENSE.radeon" -FILES_${PN}-radeon = " \ - ${nonarch_base_libdir}/firmware/radeon \ -" - -RDEPENDS_${PN}-radeon += "${PN}-radeon-license" - -# For marvell -LICENSE_${PN}-pcie8897 = "Firmware-Marvell" -LICENSE_${PN}-pcie8997 = "Firmware-Marvell" -LICENSE_${PN}-sd8686 = "Firmware-Marvell" -LICENSE_${PN}-sd8688 = "Firmware-Marvell" -LICENSE_${PN}-sd8787 = "Firmware-Marvell" -LICENSE_${PN}-sd8797 = "Firmware-Marvell" -LICENSE_${PN}-sd8801 = "Firmware-Marvell" -LICENSE_${PN}-sd8887 = "Firmware-Marvell" -LICENSE_${PN}-sd8897 = "Firmware-Marvell" -LICENSE_${PN}-sd8997 = "Firmware-Marvell" -LICENSE_${PN}-usb8997 = "Firmware-Marvell" -LICENSE_${PN}-marvell-license = "Firmware-Marvell" - -FILES_${PN}-marvell-license = "${nonarch_base_libdir}/firmware/LICENCE.Marvell" -FILES_${PN}-pcie8897 = " \ - ${nonarch_base_libdir}/firmware/mrvl/pcie8897_uapsta.bin \ -" -FILES_${PN}-pcie8997 = " \ - ${nonarch_base_libdir}/firmware/mrvl/pcie8997_wlan_v4.bin \ - ${nonarch_base_libdir}/firmware/mrvl/pcieuart8997_combo_v4.bin \ - ${nonarch_base_libdir}/firmware/mrvl/pcieusb8997_combo_v4.bin \ -" -FILES_${PN}-sd8686 = " \ - ${nonarch_base_libdir}/firmware/libertas/sd8686_v9* \ - ${nonarch_base_libdir}/firmware/sd8686* \ -" -FILES_${PN}-sd8688 = " \ - ${nonarch_base_libdir}/firmware/libertas/sd8688* \ - ${nonarch_base_libdir}/firmware/mrvl/sd8688* \ -" -FILES_${PN}-sd8787 = " \ - ${nonarch_base_libdir}/firmware/mrvl/sd8787_uapsta.bin \ -" -FILES_${PN}-sd8797 = " \ - ${nonarch_base_libdir}/firmware/mrvl/sd8797_uapsta.bin \ -" -FILES_${PN}-sd8801 = " \ - ${nonarch_base_libdir}/firmware/mrvl/sd8801_uapsta.bin \ -" -FILES_${PN}-sd8887 = " \ - ${nonarch_base_libdir}/firmware/mrvl/sd8887_uapsta.bin \ -" -FILES_${PN}-sd8897 = " \ - ${nonarch_base_libdir}/firmware/mrvl/sd8897_uapsta.bin \ -" -do_install_append() { - # The kernel 5.6.x driver still uses the old name, provide a symlink for - # older kernels - ln -fs sdsd8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin -} -FILES_${PN}-sd8997 = " \ - ${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin \ - ${nonarch_base_libdir}/firmware/mrvl/sdsd8997_combo_v4.bin \ -" -FILES_${PN}-usb8997 = " \ - ${nonarch_base_libdir}/firmware/mrvl/usbusb8997_combo_v4.bin \ -" - -RDEPENDS_${PN}-sd8686 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8688 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8787 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8797 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8801 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8887 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8897 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8997 += "${PN}-marvell-license" -RDEPENDS_${PN}-usb8997 += "${PN}-marvell-license" - -# For netronome -LICENSE_${PN}-netronome = "Firmware-netronome" - -FILES_${PN}-netronome-license = " \ - ${nonarch_base_libdir}/firmware/LICENCE.Netronome \ -" -FILES_${PN}-netronome = " \ - ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0081*.nffw \ - ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0096*.nffw \ - ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0097*.nffw \ - ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0099*.nffw \ -" - -RDEPENDS_${PN}-netronome += "${PN}-netronome-license" - -# For Nvidia -LICENSE_${PN}-nvidia-gpu = "Firmware-nvidia" -LICENSE_${PN}-nvidia-tegra = "Firmware-nvidia" -LICENSE_${PN}-nvidia-tegra-k1 = "Firmware-nvidia" -LICENSE_${PN}-nvidia-license = "Firmware-nvidia" - -FILES_${PN}-nvidia-gpu = "${nonarch_base_libdir}/firmware/nvidia" -FILES_${PN}-nvidia-tegra = " \ - ${nonarch_base_libdir}/firmware/nvidia/tegra* \ - ${nonarch_base_libdir}/firmware/nvidia/gm20b \ - ${nonarch_base_libdir}/firmware/nvidia/gp10b \ -" -FILES_${PN}-nvidia-tegra-k1 = " \ - ${nonarch_base_libdir}/firmware/nvidia/tegra124 \ - ${nonarch_base_libdir}/firmware/nvidia/gk20a \ -" -FILES_${PN}-nvidia-license = "${nonarch_base_libdir}/firmware/LICENCE.nvidia" - -RDEPENDS_${PN}-nvidia-gpu += "${PN}-nvidia-license" -RDEPENDS_${PN}-nvidia-tegra += "${PN}-nvidia-license" -RDEPENDS_${PN}-nvidia-tegra-k1 += "${PN}-nvidia-license" - -# For rtl -LICENSE_${PN}-rtl8188 = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl8192cu = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl8192ce = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl8192su = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl8723 = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl8821 = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl-license = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl8168 = "WHENCE" - -FILES_${PN}-rtl-license = " \ - ${nonarch_base_libdir}/firmware/LICENCE.rtlwifi_firmware.txt \ -" -FILES_${PN}-rtl8188 = " \ - ${nonarch_base_libdir}/firmware/rtlwifi/rtl8188*.bin \ -" -FILES_${PN}-rtl8192cu = " \ - ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192cufw*.bin \ -" -FILES_${PN}-rtl8192ce = " \ - ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192cfw*.bin \ -" -FILES_${PN}-rtl8192su = " \ - ${nonarch_base_libdir}/firmware/rtlwifi/rtl8712u.bin \ -" -FILES_${PN}-rtl8723 = " \ - ${nonarch_base_libdir}/firmware/rtlwifi/rtl8723*.bin \ -" -FILES_${PN}-rtl8821 = " \ - ${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.bin \ -" -FILES_${PN}-rtl8168 = " \ - ${nonarch_base_libdir}/firmware/rtl_nic/rtl8168*.fw \ -" - -RDEPENDS_${PN}-rtl8188 += "${PN}-rtl-license" -RDEPENDS_${PN}-rtl8192ce += "${PN}-rtl-license" -RDEPENDS_${PN}-rtl8192cu += "${PN}-rtl-license" -RDEPENDS_${PN}-rtl8192su = "${PN}-rtl-license" -RDEPENDS_${PN}-rtl8723 += "${PN}-rtl-license" -RDEPENDS_${PN}-rtl8821 += "${PN}-rtl-license" -RDEPENDS_${PN}-rtl8168 += "${PN}-whence-license" - -# For ti-connectivity -LICENSE_${PN}-wlcommon = "Firmware-ti-connectivity" -LICENSE_${PN}-wl12xx = "Firmware-ti-connectivity" -LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity" -LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity" - -FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity" -# wl18xx optionally needs wl1271-nvs.bin (which itself is a symlink to -# wl127x-nvs.bin) - see linux/drivers/net/wireless/ti/wlcore/sdio.c -# and drivers/net/wireless/ti/wlcore/spi.c. -# While they're optional and actually only used to override the MAC -# address on wl18xx, driver loading will delay (by udev timout - 60s) -# if not there. So let's make it available always. Because it's a -# symlink, both need to go to wlcommon. -FILES_${PN}-wlcommon = " \ - ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \ - ${nonarch_base_libdir}/firmware/ti-connectivity/wl127x-nvs.bin \ - ${nonarch_base_libdir}/firmware/ti-connectivity/wl1271-nvs.bin \ -" -FILES_${PN}-wl12xx = " \ - ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \ -" -FILES_${PN}-wl18xx = " \ - ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \ -" - -RDEPENDS_${PN}-wl12xx = "${PN}-ti-connectivity-license ${PN}-wlcommon" -RDEPENDS_${PN}-wl18xx = "${PN}-ti-connectivity-license ${PN}-wlcommon" - -# For vt6656 -LICENSE_${PN}-vt6656 = "Firmware-via_vt6656" -LICENSE_${PN}-vt6656-license = "Firmware-via_vt6656" - -FILES_${PN}-vt6656-license = "${nonarch_base_libdir}/firmware/LICENCE.via_vt6656" -FILES_${PN}-vt6656 = " \ - ${nonarch_base_libdir}/firmware/vntwusb.fw \ -" - -RDEPENDS_${PN}-vt6656 = "${PN}-vt6656-license" - -# For broadcom - -# 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 " \${PN}-$pkg \\"; done | sort -u - -LICENSE_${PN}-broadcom-license = "Firmware-broadcom_bcm43xx" -FILES_${PN}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx" - -# 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 "$i - $pkg"; echo -e "FILES_\${PN}-$pkg = \"\${nonarch_base_libdir}/firmware/brcm/$i\""; done | grep ^FILES - -FILES_${PN}-bcm43xx = "${nonarch_base_libdir}/firmware/brcm/bcm43xx-0.fw" -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.*" -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" -FILES_${PN}-bcm43241b0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b0-sdio.bin" -FILES_${PN}-bcm43241b4 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b4-sdio.bin" -FILES_${PN}-bcm43241b5 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b5-sdio.bin" -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.*" -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" -FILES_${PN}-bcm43569 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43569.bin" -FILES_${PN}-bcm43570 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43570-pcie.bin" -FILES_${PN}-bcm4358 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4358-pcie.bin" -FILES_${PN}-bcm43602 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.bin \ - ${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 -# Currently 1st one and last 6 have cypress LICENSE - -LICENSE_${PN}-bcm43xx = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43xx += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43xx-hdr = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43xx-hdr += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4329-fullmac = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4329-fullmac += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43236b = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43236b += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4329 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4329 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4330 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4330 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4334 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4334 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4335 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4335 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4339 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4339 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43241b0 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43241b0 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43241b4 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43241b4 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43241b5 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43241b5 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43242a = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43242a += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43143 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43143 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43430a0 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43430a0 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43455 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43455 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4350c2 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4350c2 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4350 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4350 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4356 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4356 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43569 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43569 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43570 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43570 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4358 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4358 += "${PN}-broadcom-license" -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" - -# For broadcom cypress - -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.*" -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.*" -FILES_${PN}-bcm4373 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bin \ - ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373.bin \ -" - -LICENSE_${PN}-bcm-0bb4-0306 = "Firmware-cypress" -RDEPENDS_${PN}-bcm-0bb4-0306 += "${PN}-cypress-license" -LICENSE_${PN}-bcm43340 = "Firmware-cypress" -RDEPENDS_${PN}-bcm43340 += "${PN}-cypress-license" -LICENSE_${PN}-bcm43362 = "Firmware-cypress" -RDEPENDS_${PN}-bcm43362 += "${PN}-cypress-license" -LICENSE_${PN}-bcm43430 = "Firmware-cypress" -RDEPENDS_${PN}-bcm43430 += "${PN}-cypress-license" -LICENSE_${PN}-bcm4354 = "Firmware-cypress" -RDEPENDS_${PN}-bcm4354 += "${PN}-cypress-license" -LICENSE_${PN}-bcm4356-pcie = "Firmware-cypress" -RDEPENDS_${PN}-bcm4356-pcie += "${PN}-cypress-license" -LICENSE_${PN}-bcm4373 = "Firmware-cypress" -RDEPENDS_${PN}-bcm4373 += "${PN}-cypress-license" - -# For Broadcom bnx2-mips -# -# which is a separate case to the other Broadcom firmwares since its -# license is contained in the shared WHENCE file. - -LICENSE_${PN}-bnx2-mips = "WHENCE" -LICENSE_${PN}-whence-license = "WHENCE" - -FILES_${PN}-bnx2-mips = "${nonarch_base_libdir}/firmware/bnx2/bnx2-mips-09-6.2.1b.fw" -FILES_${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE" - -RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license" - -# For imx-sdma -LICENSE_${PN}-imx-sdma-imx6q = "Firmware-imx-sdma_firmware" -LICENSE_${PN}-imx-sdma-imx7d = "Firmware-imx-sdma_firmware" -LICENSE_${PN}-imx-sdma-license = "Firmware-imx-sdma_firmware" - -FILES_${PN}-imx-sdma-imx6q = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin" - -RPROVIDES_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q" -RREPLACES_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q" -RCONFLICTS_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q" - -FILES_${PN}-imx-sdma-imx7d = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin" - -FILES_${PN}-imx-sdma-license = "${nonarch_base_libdir}/firmware/LICENSE.sdma_firmware" - -RDEPENDS_${PN}-imx-sdma-imx6q += "${PN}-imx-sdma-license" -RDEPENDS_${PN}-imx-sdma-imx7d += "${PN}-imx-sdma-license" - -# For iwlwifi -LICENSE_${PN}-iwlwifi = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-7 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-8 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-9 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-10 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-12 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-13 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-16 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-17 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6000-4 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6000g2a-5 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6000g2a-6 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6000g2b-5 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6000g2b-6 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6050-4 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6050-5 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-7260 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-7265 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-7265d = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-8000c = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-8265 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-9000 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-misc = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware" - - -FILES_${PN}-iwlwifi-license = "${nonarch_base_libdir}/firmware/LICENCE.iwlwifi_firmware" -FILES_${PN}-iwlwifi-135-6 = "${nonarch_base_libdir}/firmware/iwlwifi-135-6.ucode" -FILES_${PN}-iwlwifi-3160-7 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-7.ucode" -FILES_${PN}-iwlwifi-3160-8 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-8.ucode" -FILES_${PN}-iwlwifi-3160-9 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-9.ucode" -FILES_${PN}-iwlwifi-3160-10 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-10.ucode" -FILES_${PN}-iwlwifi-3160-12 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-12.ucode" -FILES_${PN}-iwlwifi-3160-13 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-13.ucode" -FILES_${PN}-iwlwifi-3160-16 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-16.ucode" -FILES_${PN}-iwlwifi-3160-17 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-17.ucode" -FILES_${PN}-iwlwifi-6000-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6000-4.ucode" -FILES_${PN}-iwlwifi-6000g2a-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-5.ucode" -FILES_${PN}-iwlwifi-6000g2a-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-6.ucode" -FILES_${PN}-iwlwifi-6000g2b-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-5.ucode" -FILES_${PN}-iwlwifi-6000g2b-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-6.ucode" -FILES_${PN}-iwlwifi-6050-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-4.ucode" -FILES_${PN}-iwlwifi-6050-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-5.ucode" -FILES_${PN}-iwlwifi-7260 = "${nonarch_base_libdir}/firmware/iwlwifi-7260-*.ucode" -FILES_${PN}-iwlwifi-7265 = "${nonarch_base_libdir}/firmware/iwlwifi-7265-*.ucode" -FILES_${PN}-iwlwifi-7265d = "${nonarch_base_libdir}/firmware/iwlwifi-7265D-*.ucode" -FILES_${PN}-iwlwifi-8000c = "${nonarch_base_libdir}/firmware/iwlwifi-8000C-*.ucode" -FILES_${PN}-iwlwifi-8265 = "${nonarch_base_libdir}/firmware/iwlwifi-8265-*.ucode" -FILES_${PN}-iwlwifi-9000 = "${nonarch_base_libdir}/firmware/iwlwifi-9000-*.ucode" -FILES_${PN}-iwlwifi-misc = "${nonarch_base_libdir}/firmware/iwlwifi-*.ucode" - -RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-8 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-9 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-10 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-12 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-13 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-16 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-17 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6000-4 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6000g2a-6 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6000g2b-5 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6050-4 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6050-5 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-7265d = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-8000c = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-9000 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-misc = "${PN}-iwlwifi-license" - -# -iwlwifi-misc is a "catch all" package that includes all the iwlwifi -# firmwares that are not already included in other -iwlwifi- packages. -# -iwlwifi is a virtual package that depends upon all iwlwifi packages. -# These are distinct in order to allow the -misc firmwares to be installed -# without pulling in every other iwlwifi package. -ALLOW_EMPTY_${PN}-iwlwifi = "1" -ALLOW_EMPTY_${PN}-iwlwifi-misc = "1" - -# Handle package updating for the newly merged iwlwifi groupings -RPROVIDES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" -RREPLACES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" -RCONFLICTS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" - -RPROVIDES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" -RREPLACES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" -RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" - -# For ibt -LICENSE_${PN}-ibt-license = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-hw-37-7 = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-hw-37-8 = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-11-5 = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-12-16 = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-17 = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-20 = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-misc = "Firmware-ibt_firmware" - -FILES_${PN}-ibt-license = "${nonarch_base_libdir}/firmware/LICENCE.ibt_firmware" -FILES_${PN}-ibt-hw-37-7 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.7*.bseq" -FILES_${PN}-ibt-hw-37-8 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bseq" -FILES_${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi ${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc" -FILES_${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi ${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc" -FILES_${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc" -FILES_${PN}-ibt-20 = "${nonarch_base_libdir}/firmware/intel/ibt-20-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-20-*.ddc" -FILES_${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/intel/ibt-*" - -RDEPENDS_${PN}-ibt-hw-37-7 = "${PN}-ibt-license" -RDEPENDS_${PN}-ibt-hw-37.8 = "${PN}-ibt-license" -RDEPENDS_${PN}-ibt-11-5 = "${PN}-ibt-license" -RDEPENDS_${PN}-ibt-12-16 = "${PN}-ibt-license" -RDEPENDS_${PN}-ibt-17 = "${PN}-ibt-license" -RDEPENDS_${PN}-ibt-20 = "${PN}-ibt-license" -RDEPENDS_${PN}-ibt-misc = "${PN}-ibt-license" - -ALLOW_EMPTY_${PN}-ibt= "1" -ALLOW_EMPTY_${PN}-ibt-misc = "1" - -LICENSE_${PN}-i915 = "Firmware-i915" -LICENSE_${PN}-i915-license = "Firmware-i915" -FILES_${PN}-i915-license = "${nonarch_base_libdir}/firmware/LICENSE.i915" -FILES_${PN}-i915 = "${nonarch_base_libdir}/firmware/i915" -RDEPENDS_${PN}-i915 = "${PN}-i915-license" - -LICENSE_${PN}-ice = "Firmware-ice" -LICENSE_${PN}-ice-license = "Firmware-ice" -FILES_${PN}-ice-license = "${nonarch_base_libdir}/firmware/LICENSE.ice" -FILES_${PN}-ice = "${nonarch_base_libdir}/firmware/intel/ice" -RDEPENDS_${PN}-ice = "${PN}-ice-license" - -FILES_${PN}-adsp-sst-license = "${nonarch_base_libdir}/firmware/LICENCE.adsp_sst" -LICENSE_${PN}-adsp-sst = "Firmware-adsp_sst" -LICENSE_${PN}-adsp-sst-license = "Firmware-adsp_sst" -FILES_${PN}-adsp-sst = "${nonarch_base_libdir}/firmware/intel/dsp_fw*" -RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license" - -# For QAT -LICENSE_${PN}-qat = "Firmware-qat" -LICENSE_${PN}-qat-license = "Firmware-qat" -FILES_${PN}-qat-license = "${nonarch_base_libdir}/firmware/LICENCE.qat_firmware" -FILES_${PN}-qat = "${nonarch_base_libdir}/firmware/qat*.bin" -RDEPENDS_${PN}-qat = "${PN}-qat-license" - -# For QCOM VPU/GPU and SDM845 -LICENSE_${PN}-qcom-license = "Firmware-qcom" -FILES_${PN}-qcom-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt" -FILES_${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" -FILES_${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" -FILES_${PN}-qcom-venus-5.2 = "${nonarch_base_libdir}/firmware/qcom/venus-5.2/*" -FILES_${PN}-qcom-venus-5.4 = "${nonarch_base_libdir}/firmware/qcom/venus-5.4/*" -FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" -FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" -FILES_${PN}-qcom-adreno-a630 = "${nonarch_base_libdir}/firmware/qcom/a630*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*" -FILES_${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" -FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" -FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" -RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" -RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" -RDEPENDS_${PN}-qcom-venus-5.2 = "${PN}-qcom-license" -RDEPENDS_${PN}-qcom-venus-5.4 = "${PN}-qcom-license" -RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" -RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license" -RDEPENDS_${PN}-qcom-adreno-a630 = "${PN}-qcom-license" -RDEPENDS_${PN}-qcom-sdm845-audio = "${PN}-qcom-license" -RDEPENDS_${PN}-qcom-sdm845-compute = "${PN}-qcom-license" -RDEPENDS_${PN}-qcom-sdm845-modem = "${PN}-qcom-license" - -FILES_${PN}-liquidio = "${nonarch_base_libdir}/firmware/liquidio" - -# For Amlogic VDEC -LICENSE_${PN}-amlogic-vdec = "Firmware-amlogic_vdec" -FILES_${PN}-amlogic-vdec-license = "${nonarch_base_libdir}/firmware/LICENSE.amlogic_vdec" -FILES_${PN}-amlogic-vdec = "${nonarch_base_libdir}/firmware/meson/vdec/*" -RDEPENDS_${PN}-amlogic-vdec = "${PN}-amlogic-vdec-license" - -# For other firmwares -# Maybe split out to separate packages when needed. -LICENSE_${PN} = "\ - Firmware-Abilis \ - & Firmware-agere \ - & Firmware-amdgpu \ - & Firmware-amd-ucode \ - & Firmware-amlogic_vdec \ - & Firmware-atmel \ - & Firmware-ca0132 \ - & Firmware-cavium \ - & Firmware-chelsio_firmware \ - & Firmware-cw1200 \ - & Firmware-dib0700 \ - & Firmware-e100 \ - & Firmware-ene_firmware \ - & Firmware-fw_sst_0f28 \ - & Firmware-go7007 \ - & Firmware-hfi1_firmware \ - & Firmware-i2400m \ - & Firmware-ibt_firmware \ - & Firmware-it913x \ - & Firmware-IntcSST2 \ - & Firmware-kaweth \ - & Firmware-moxa \ - & Firmware-myri10ge_firmware \ - & Firmware-nvidia \ - & Firmware-OLPC \ - & Firmware-ath9k-htc \ - & Firmware-phanfw \ - & Firmware-qat \ - & Firmware-qcom \ - & Firmware-qla1280 \ - & Firmware-qla2xxx \ - & Firmware-r8a779x_usb3 \ - & Firmware-radeon \ - & Firmware-ralink_a_mediatek_company_firmware \ - & Firmware-ralink-firmware \ - & Firmware-imx-sdma_firmware \ - & Firmware-siano \ - & Firmware-tda7706-firmware \ - & Firmware-ti-connectivity \ - & Firmware-ti-keystone \ - & Firmware-ueagle-atm4-firmware \ - & Firmware-wl1251 \ - & Firmware-xc4000 \ - & Firmware-xc5000 \ - & Firmware-xc5000c \ - & WHENCE \ -" - -FILES_${PN}-license += "${nonarch_base_libdir}/firmware/LICEN*" -FILES_${PN} += "${nonarch_base_libdir}/firmware/*" -RDEPENDS_${PN} += "${PN}-license" -RDEPENDS_${PN} += "${PN}-whence-license" - -# Make linux-firmware depend on all of the split-out packages. -# Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages. -# Make linux-firmware-ibt depend on all of the split-out ibt packages. -python populate_packages_prepend () { - firmware_pkgs = oe.utils.packages_filter_out_system(d) - d.appendVar('RRECOMMENDS_linux-firmware', ' ' + ' '.join(firmware_pkgs)) - - iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs) - d.appendVar('RRECOMMENDS_linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs)) - - ibt_pkgs = filter(lambda x: x.find('-ibt-') != -1, firmware_pkgs) - d.appendVar('RRECOMMENDS_linux-firmware-ibt', ' ' + ' '.join(ibt_pkgs)) -} - -# Firmware files are generally not ran on the CPU, so they can be -# allarch despite being architecture specific -INSANE_SKIP = "arch" diff --git a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201218.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201218.bb new file mode 100644 index 000000000..700a79b11 --- /dev/null +++ b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201218.bb @@ -0,0 +1,1014 @@ +SUMMARY = "Firmware files for use with Linux kernel" +SECTION = "kernel" + +LICENSE = "\ + Firmware-Abilis \ + & Firmware-adsp_sst \ + & Firmware-agere \ + & Firmware-amdgpu \ + & Firmware-amd-ucode \ + & Firmware-amlogic_vdec \ + & Firmware-atheros_firmware \ + & Firmware-atmel \ + & Firmware-broadcom_bcm43xx \ + & Firmware-ca0132 \ + & Firmware-cavium \ + & Firmware-chelsio_firmware \ + & Firmware-cw1200 \ + & Firmware-cypress \ + & Firmware-dib0700 \ + & Firmware-e100 \ + & Firmware-ene_firmware \ + & Firmware-fw_sst_0f28 \ + & Firmware-go7007 \ + & Firmware-GPLv2 \ + & Firmware-hfi1_firmware \ + & Firmware-i2400m \ + & Firmware-i915 \ + & Firmware-ibt_firmware \ + & Firmware-ice \ + & Firmware-it913x \ + & Firmware-iwlwifi_firmware \ + & Firmware-IntcSST2 \ + & Firmware-kaweth \ + & Firmware-Lontium \ + & Firmware-Marvell \ + & Firmware-moxa \ + & Firmware-myri10ge_firmware \ + & Firmware-netronome \ + & Firmware-nvidia \ + & Firmware-OLPC \ + & Firmware-ath9k-htc \ + & Firmware-phanfw \ + & Firmware-qat \ + & Firmware-qcom \ + & Firmware-qla1280 \ + & Firmware-qla2xxx \ + & Firmware-qualcommAthos_ar3k \ + & Firmware-qualcommAthos_ath10k \ + & Firmware-r8a779x_usb3 \ + & Firmware-radeon \ + & Firmware-ralink_a_mediatek_company_firmware \ + & Firmware-ralink-firmware \ + & Firmware-rtlwifi_firmware \ + & Firmware-imx-sdma_firmware \ + & Firmware-siano \ + & Firmware-tda7706-firmware \ + & Firmware-ti-connectivity \ + & Firmware-ti-keystone \ + & Firmware-ueagle-atm4-firmware \ + & Firmware-via_vt6656 \ + & Firmware-wl1251 \ + & Firmware-xc4000 \ + & Firmware-xc5000 \ + & Firmware-xc5000c \ + & WHENCE \ +" + +LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ + file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ + file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ + file://LICENSE.amdgpu;md5=d357524f5099e2a3db3c1838921c593f \ + file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \ + file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ + file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ + file://LICENSE.atmel;md5=aa74ac0c60595dee4d4e239107ea77a3 \ + file://LICENCE.broadcom_bcm43xx;md5=3160c14df7228891b868060e1951dfbc \ + file://LICENCE.ca0132;md5=209b33e66ee5be0461f13d31da392198 \ + file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0 \ + file://LICENCE.cavium;md5=c37aaffb1ebe5939b2580d073a95daea \ + file://LICENCE.chelsio_firmware;md5=819aa8c3fa453f1b258ed8d168a9d903 \ + file://LICENCE.cw1200;md5=f0f770864e7a8444a5c5aa9d12a3a7ed \ + file://LICENCE.cypress;md5=48cd9436c763bf873961f9ed7b5c147b \ + file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \ + file://LICENCE.e100;md5=ec0f84136766df159a3ae6d02acdf5a8 \ + file://LICENCE.ene_firmware;md5=ed67f0f62f8f798130c296720b7d3921 \ + file://LICENCE.fw_sst_0f28;md5=6353931c988ad52818ae733ac61cd293 \ + file://LICENCE.go7007;md5=c0bb9f6aaaba55b0529ee9b30aa66beb \ + file://GPL-2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.hfi1_firmware;md5=5e7b6e586ce7339d12689e49931ad444 \ + file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ + file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ + file://LICENCE.ibt_firmware;md5=fdbee1ddfe0fb7ab0b2fcd6b454a366b \ + file://LICENSE.ice;md5=742ab4850f2670792940e6d15c974b2f \ + file://LICENCE.IntcSST2;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ + file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ + file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \ + file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \ + file://LICENSE.Lontium;md5=4ec8dc582ff7295f39e2ca6a7b0be2b6 \ + file://LICENCE.Marvell;md5=28b6ed8bd04ba105af6e4dcd6e997772 \ + file://LICENCE.mediatek;md5=7c1976b63217d76ce47d0a11d8a79cf2 \ + file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ + file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ + file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \ + file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ + file://LICENCE.NXP;md5=58bb8ba632cd729b9ba6183bc6aed36f \ + file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ + file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ + file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ + file://LICENCE.qat_firmware;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ + file://LICENSE.qcom;md5=164e3362a538eb11d3ac51e8e134294b \ + file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \ + file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \ + file://LICENSE.QualcommAtheros_ar3k;md5=b5fe244fb2b532311de1472a3bc06da5 \ + file://LICENSE.QualcommAtheros_ath10k;md5=cb42b686ee5f5cb890275e4321db60a8 \ + file://LICENCE.r8a779x_usb3;md5=4c1671656153025d7076105a5da7e498 \ + file://LICENSE.radeon;md5=68ec28bacb3613200bca44f404c69b16 \ + file://LICENCE.ralink_a_mediatek_company_firmware;md5=728f1a85fd53fd67fa8d7afb080bc435 \ + file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \ + file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ + file://LICENSE.sdma_firmware;md5=51e8c19ecc2270f4b8ea30341ad63ce9 \ + file://LICENCE.siano;md5=4556c1bf830067f12ca151ad953ec2a5 \ + file://LICENCE.tda7706-firmware.txt;md5=835997cf5e3c131d0dddd695c7d9103e \ + file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \ + file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \ + file://LICENCE.ueagle-atm4-firmware;md5=4ed7ea6b507ccc583b9d594417714118 \ + file://LICENCE.via_vt6656;md5=e4159694cba42d4377a912e78a6e850f \ + file://LICENCE.wl1251;md5=ad3f81922bb9e197014bb187289d3b5b \ + file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ + file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ + file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ + file://WHENCE;md5=03f0fad70b8b557b56084e3090198021 \ + " + +# These are not common licenses, set NO_GENERIC_LICENSE for them +# so that the license files will be copied from fetched source +NO_GENERIC_LICENSE[Firmware-Abilis] = "LICENCE.Abilis" +NO_GENERIC_LICENSE[Firmware-adsp_sst] = "LICENCE.adsp_sst" +NO_GENERIC_LICENSE[Firmware-agere] = "LICENCE.agere" +NO_GENERIC_LICENSE[Firmware-amdgpu] = "LICENSE.amdgpu" +NO_GENERIC_LICENSE[Firmware-amd-ucode] = "LICENSE.amd-ucode" +NO_GENERIC_LICENSE[Firmware-amlogic_vdec] = "LICENSE.amlogic_vdec" +NO_GENERIC_LICENSE[Firmware-atheros_firmware] = "LICENCE.atheros_firmware" +NO_GENERIC_LICENSE[Firmware-atmel] = "LICENSE.atmel" +NO_GENERIC_LICENSE[Firmware-broadcom_bcm43xx] = "LICENCE.broadcom_bcm43xx" +NO_GENERIC_LICENSE[Firmware-ca0132] = "LICENCE.ca0132" +NO_GENERIC_LICENSE[Firmware-cadence] = "LICENCE.cadence" +NO_GENERIC_LICENSE[Firmware-cavium] = "LICENCE.cavium" +NO_GENERIC_LICENSE[Firmware-chelsio_firmware] = "LICENCE.chelsio_firmware" +NO_GENERIC_LICENSE[Firmware-cw1200] = "LICENCE.cw1200" +NO_GENERIC_LICENSE[Firmware-cypress] = "LICENCE.cypress" +NO_GENERIC_LICENSE[Firmware-dib0700] = "LICENSE.dib0700" +NO_GENERIC_LICENSE[Firmware-e100] = "LICENCE.e100" +NO_GENERIC_LICENSE[Firmware-ene_firmware] = "LICENCE.ene_firmware" +NO_GENERIC_LICENSE[Firmware-fw_sst_0f28] = "LICENCE.fw_sst_0f28" +NO_GENERIC_LICENSE[Firmware-go7007] = "LICENCE.go7007" +NO_GENERIC_LICENSE[Firmware-GPLv2] = "GPL-2" +NO_GENERIC_LICENSE[Firmware-hfi1_firmware] = "LICENSE.hfi1_firmware" +NO_GENERIC_LICENSE[Firmware-i2400m] = "LICENCE.i2400m" +NO_GENERIC_LICENSE[Firmware-i915] = "LICENSE.i915" +NO_GENERIC_LICENSE[Firmware-ibt_firmware] = "LICENCE.ibt_firmware" +NO_GENERIC_LICENSE[Firmware-ice] = "LICENSE.ice" +NO_GENERIC_LICENSE[Firmware-IntcSST2] = "LICENCE.IntcSST2" +NO_GENERIC_LICENSE[Firmware-it913x] = "LICENCE.it913x" +NO_GENERIC_LICENSE[Firmware-iwlwifi_firmware] = "LICENCE.iwlwifi_firmware" +NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth" +NO_GENERIC_LICENSE[Firmware-Lontium] = "LICENSE.Lontium" +NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell" +NO_GENERIC_LICENSE[Firmware-mediatek] = "LICENCE.mediatek" +NO_GENERIC_LICENSE[Firmware-moxa] = "LICENCE.moxa" +NO_GENERIC_LICENSE[Firmware-myri10ge_firmware] = "LICENCE.myri10ge_firmware" +NO_GENERIC_LICENSE[Firmware-netronome] = "LICENCE.Netronome" +NO_GENERIC_LICENSE[Firmware-nvidia] = "LICENCE.nvidia" +NO_GENERIC_LICENSE[Firmware-OLPC] = "LICENCE.OLPC" +NO_GENERIC_LICENSE[Firmware-ath9k-htc] = "LICENCE.open-ath9k-htc-firmware" +NO_GENERIC_LICENSE[Firmware-phanfw] = "LICENCE.phanfw" +NO_GENERIC_LICENSE[Firmware-qat] = "LICENCE.qat_firmware" +NO_GENERIC_LICENSE[Firmware-qcom] = "LICENSE.qcom" +NO_GENERIC_LICENSE[Firmware-qla1280] = "LICENCE.qla1280" +NO_GENERIC_LICENSE[Firmware-qla2xxx] = "LICENCE.qla2xxx" +NO_GENERIC_LICENSE[Firmware-qualcommAthos_ar3k] = "LICENSE.QualcommAtheros_ar3k" +NO_GENERIC_LICENSE[Firmware-qualcommAthos_ath10k] = "LICENSE.QualcommAtheros_ath10k" +NO_GENERIC_LICENSE[Firmware-r8a779x_usb3] = "LICENCE.r8a779x_usb3" +NO_GENERIC_LICENSE[Firmware-radeon] = "LICENSE.radeon" +NO_GENERIC_LICENSE[Firmware-ralink_a_mediatek_company_firmware] = "LICENCE.ralink_a_mediatek_company_firmware" +NO_GENERIC_LICENSE[Firmware-ralink-firmware] = "LICENCE.ralink-firmware.txt" +NO_GENERIC_LICENSE[Firmware-rtlwifi_firmware] = "LICENCE.rtlwifi_firmware.txt" +NO_GENERIC_LICENSE[Firmware-siano] = "LICENCE.siano" +NO_GENERIC_LICENSE[Firmware-imx-sdma_firmware] = "LICENSE.sdma_firmware" +NO_GENERIC_LICENSE[Firmware-tda7706-firmware] = "LICENCE.tda7706-firmware.txt" +NO_GENERIC_LICENSE[Firmware-ti-connectivity] = "LICENCE.ti-connectivity" +NO_GENERIC_LICENSE[Firmware-ti-keystone] = "LICENCE.ti-keystone" +NO_GENERIC_LICENSE[Firmware-ueagle-atm4-firmware] = "LICENCE.ueagle-atm4-firmware" +NO_GENERIC_LICENSE[Firmware-via_vt6656] = "LICENCE.via_vt6656" +NO_GENERIC_LICENSE[Firmware-wl1251] = "LICENCE.wl1251" +NO_GENERIC_LICENSE[Firmware-xc4000] = "LICENCE.xc4000" +NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" +NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" +NO_GENERIC_LICENSE[WHENCE] = "WHENCE" + +PE = "1" + +SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" + +SRC_URI[sha256sum] = "a1cc1ff72c739f312b095df589e9fd639fc81c3f8f7966377ea35222dc94c04b" + +inherit allarch + +CLEANBROKEN = "1" + +do_compile() { + : +} + +do_install() { + oe_runmake 'DESTDIR=${D}' 'FIRMWAREDIR=${nonarch_base_libdir}/firmware' install + cp GPL-2 LICEN[CS]E.* WHENCE ${D}${nonarch_base_libdir}/firmware/ +} + + +PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ + ${PN}-mt7601u-license ${PN}-mt7601u \ + ${PN}-radeon-license ${PN}-radeon \ + ${PN}-marvell-license ${PN}-pcie8897 ${PN}-pcie8997 \ + ${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 \ + ${PN}-sd8887 ${PN}-sd8897 ${PN}-sd8997 ${PN}-usb8997 \ + ${PN}-ti-connectivity-license ${PN}-wlcommon ${PN}-wl12xx ${PN}-wl18xx \ + ${PN}-vt6656-license ${PN}-vt6656 \ + ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \ + ${PN}-rtl8168 \ + ${PN}-cypress-license \ + ${PN}-broadcom-license \ + ${PN}-bcm-0bb4-0306 \ + ${PN}-bcm43143 \ + ${PN}-bcm43236b \ + ${PN}-bcm43241b0 \ + ${PN}-bcm43241b4 \ + ${PN}-bcm43241b5 \ + ${PN}-bcm43242a \ + ${PN}-bcm4329 \ + ${PN}-bcm4329-fullmac \ + ${PN}-bcm4330 \ + ${PN}-bcm4334 \ + ${PN}-bcm43340 \ + ${PN}-bcm4335 \ + ${PN}-bcm43362 \ + ${PN}-bcm4339 \ + ${PN}-bcm43430 \ + ${PN}-bcm43430a0 \ + ${PN}-bcm43455 \ + ${PN}-bcm4350 \ + ${PN}-bcm4350c2 \ + ${PN}-bcm4354 \ + ${PN}-bcm4356 \ + ${PN}-bcm4356-pcie \ + ${PN}-bcm43569 \ + ${PN}-bcm43570 \ + ${PN}-bcm4358 \ + ${PN}-bcm43602 \ + ${PN}-bcm4366b \ + ${PN}-bcm4366c \ + ${PN}-bcm4371 \ + ${PN}-bcm4373 \ + ${PN}-bcm43xx \ + ${PN}-bcm43xx-hdr \ + ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \ + ${PN}-gplv2-license ${PN}-carl9170 \ + ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-qca \ + \ + ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ + \ + ${PN}-iwlwifi-license ${PN}-iwlwifi \ + ${PN}-iwlwifi-135-6 \ + ${PN}-iwlwifi-3160-7 ${PN}-iwlwifi-3160-8 ${PN}-iwlwifi-3160-9 \ + ${PN}-iwlwifi-3160-10 ${PN}-iwlwifi-3160-12 ${PN}-iwlwifi-3160-13 \ + ${PN}-iwlwifi-3160-16 ${PN}-iwlwifi-3160-17 \ + ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2a-6 \ + ${PN}-iwlwifi-6000g2b-5 ${PN}-iwlwifi-6000g2b-6 \ + ${PN}-iwlwifi-6050-4 ${PN}-iwlwifi-6050-5 \ + ${PN}-iwlwifi-7260 \ + ${PN}-iwlwifi-7265 \ + ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \ + ${PN}-iwlwifi-9000 \ + ${PN}-iwlwifi-misc \ + ${PN}-ibt-license ${PN}-ibt \ + ${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7 ${PN}-ibt-hw-37-8 \ + ${PN}-ibt-17 \ + ${PN}-ibt-20 \ + ${PN}-ibt-misc \ + ${PN}-i915-license ${PN}-i915 \ + ${PN}-ice-license ${PN}-ice \ + ${PN}-adsp-sst-license ${PN}-adsp-sst \ + ${PN}-bnx2-mips \ + ${PN}-liquidio \ + ${PN}-nvidia-license \ + ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \ + ${PN}-nvidia-gpu \ + ${PN}-netronome-license ${PN}-netronome \ + ${PN}-qat ${PN}-qat-license \ + ${PN}-qcom-license \ + ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 ${PN}-qcom-venus-5.2 ${PN}-qcom-venus-5.4 \ + ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 ${PN}-qcom-adreno-a630 \ + ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ + ${PN}-amlogic-vdec-license ${PN}-amlogic-vdec \ + ${PN}-lt9611uxc ${PN}-lontium-license \ + ${PN}-whence-license \ + ${PN}-license \ + " + +# For atheros +LICENSE_${PN}-ar9170 = "Firmware-atheros_firmware" +LICENSE_${PN}-ath6k = "Firmware-atheros_firmware" +LICENSE_${PN}-ath9k = "Firmware-atheros_firmware" +LICENSE_${PN}-atheros-license = "Firmware-atheros_firmware" + +FILES_${PN}-atheros-license = "${nonarch_base_libdir}/firmware/LICENCE.atheros_firmware" +FILES_${PN}-ar9170 = " \ + ${nonarch_base_libdir}/firmware/ar9170*.fw \ +" +FILES_${PN}-ath6k = " \ + ${nonarch_base_libdir}/firmware/ath6k \ +" +FILES_${PN}-ath9k = " \ + ${nonarch_base_libdir}/firmware/ar9271.fw \ + ${nonarch_base_libdir}/firmware/ar7010*.fw \ + ${nonarch_base_libdir}/firmware/htc_9271.fw \ + ${nonarch_base_libdir}/firmware/htc_7010.fw \ + ${nonarch_base_libdir}/firmware/ath9k_htc/htc_7010-1.4.0.fw \ + ${nonarch_base_libdir}/firmware/ath9k_htc/htc_9271-1.4.0.fw \ +" + +RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license" +RDEPENDS_${PN}-ath6k += "${PN}-atheros-license" +RDEPENDS_${PN}-ath9k += "${PN}-atheros-license" + +# For carl9170 +LICENSE_${PN}-carl9170 = "Firmware-GPLv2" +LICENSE_${PN}-gplv2-license = "Firmware-GPLv2" + +FILES_${PN}-gplv2-license = "${nonarch_base_libdir}/firmware/GPL-2" +FILES_${PN}-carl9170 = " \ + ${nonarch_base_libdir}/firmware/carl9170*.fw \ +" + +RDEPENDS_${PN}-carl9170 += "${PN}-gplv2-license" + +# For QualCommAthos +LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k" +LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" +LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k" +LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k" +LICENSE_${PN}-qca = "Firmware-qualcommAthos_ath10k" + +FILES_${PN}-ar3k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ar3k" +FILES_${PN}-ar3k = " \ + ${nonarch_base_libdir}/firmware/ar3k \ +" + +FILES_${PN}-ath10k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k" +FILES_${PN}-ath10k = " \ + ${nonarch_base_libdir}/firmware/ath10k \ +" + +FILES_${PN}-ath11k = " \ + ${nonarch_base_libdir}/firmware/ath11k \ +" + +FILES_${PN}-qca = " \ + ${nonarch_base_libdir}/firmware/qca \ +" + +RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license" +RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license" +RDEPENDS_${PN}-ath11k += "${PN}-ath10k-license" +RDEPENDS_${PN}-qca += "${PN}-ath10k-license" + +# For ralink +LICENSE_${PN}-ralink = "Firmware-ralink-firmware" +LICENSE_${PN}-ralink-license = "Firmware-ralink-firmware" + +FILES_${PN}-ralink-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink-firmware.txt" +FILES_${PN}-ralink = " \ + ${nonarch_base_libdir}/firmware/rt*.bin \ +" + +RDEPENDS_${PN}-ralink += "${PN}-ralink-license" + +# For mediatek MT7601U +LICENSE_${PN}-mt7601u = "Firmware-ralink_a_mediatek_company_firmware" +LICENSE_${PN}-mt7601u-license = "Firmware-ralink_a_mediatek_company_firmware" + +FILES_${PN}-mt7601u-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware" +FILES_${PN}-mt7601u = " \ + ${nonarch_base_libdir}/firmware/mt7601u.bin \ +" + +RDEPENDS_${PN}-mt7601u += "${PN}-mt7601u-license" + +# For radeon +LICENSE_${PN}-radeon = "Firmware-radeon" +LICENSE_${PN}-radeon-license = "Firmware-radeon" + +FILES_${PN}-radeon-license = "${nonarch_base_libdir}/firmware/LICENSE.radeon" +FILES_${PN}-radeon = " \ + ${nonarch_base_libdir}/firmware/radeon \ +" + +RDEPENDS_${PN}-radeon += "${PN}-radeon-license" + +# For lontium +LICENSE_${PN}-lt9611uxc = "Firmware-Lontium" + +FILES_${PN}-lontium-license = "${nonarch_base_libdir}/firmware/LICENSE.Lontium" +FILES_${PN}-lt9611uxc = "${nonarch_base_libdir}/firmware/lt9611uxc_fw.bin" + +# For marvell +LICENSE_${PN}-pcie8897 = "Firmware-Marvell" +LICENSE_${PN}-pcie8997 = "Firmware-Marvell" +LICENSE_${PN}-sd8686 = "Firmware-Marvell" +LICENSE_${PN}-sd8688 = "Firmware-Marvell" +LICENSE_${PN}-sd8787 = "Firmware-Marvell" +LICENSE_${PN}-sd8797 = "Firmware-Marvell" +LICENSE_${PN}-sd8801 = "Firmware-Marvell" +LICENSE_${PN}-sd8887 = "Firmware-Marvell" +LICENSE_${PN}-sd8897 = "Firmware-Marvell" +LICENSE_${PN}-sd8997 = "Firmware-Marvell" +LICENSE_${PN}-usb8997 = "Firmware-Marvell" +LICENSE_${PN}-marvell-license = "Firmware-Marvell" + +FILES_${PN}-marvell-license = "${nonarch_base_libdir}/firmware/LICENCE.Marvell" +FILES_${PN}-pcie8897 = " \ + ${nonarch_base_libdir}/firmware/mrvl/pcie8897_uapsta.bin \ +" +FILES_${PN}-pcie8997 = " \ + ${nonarch_base_libdir}/firmware/mrvl/pcie8997_wlan_v4.bin \ + ${nonarch_base_libdir}/firmware/mrvl/pcieuart8997_combo_v4.bin \ + ${nonarch_base_libdir}/firmware/mrvl/pcieusb8997_combo_v4.bin \ +" +FILES_${PN}-sd8686 = " \ + ${nonarch_base_libdir}/firmware/libertas/sd8686_v9* \ + ${nonarch_base_libdir}/firmware/sd8686* \ +" +FILES_${PN}-sd8688 = " \ + ${nonarch_base_libdir}/firmware/libertas/sd8688* \ + ${nonarch_base_libdir}/firmware/mrvl/sd8688* \ +" +FILES_${PN}-sd8787 = " \ + ${nonarch_base_libdir}/firmware/mrvl/sd8787_uapsta.bin \ +" +FILES_${PN}-sd8797 = " \ + ${nonarch_base_libdir}/firmware/mrvl/sd8797_uapsta.bin \ +" +FILES_${PN}-sd8801 = " \ + ${nonarch_base_libdir}/firmware/mrvl/sd8801_uapsta.bin \ +" +FILES_${PN}-sd8887 = " \ + ${nonarch_base_libdir}/firmware/mrvl/sd8887_uapsta.bin \ +" +FILES_${PN}-sd8897 = " \ + ${nonarch_base_libdir}/firmware/mrvl/sd8897_uapsta.bin \ +" +do_install_append() { + # The kernel 5.6.x driver still uses the old name, provide a symlink for + # older kernels + ln -fs sdsd8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin +} +FILES_${PN}-sd8997 = " \ + ${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin \ + ${nonarch_base_libdir}/firmware/mrvl/sdsd8997_combo_v4.bin \ +" +FILES_${PN}-usb8997 = " \ + ${nonarch_base_libdir}/firmware/mrvl/usbusb8997_combo_v4.bin \ +" + +RDEPENDS_${PN}-sd8686 += "${PN}-marvell-license" +RDEPENDS_${PN}-sd8688 += "${PN}-marvell-license" +RDEPENDS_${PN}-sd8787 += "${PN}-marvell-license" +RDEPENDS_${PN}-sd8797 += "${PN}-marvell-license" +RDEPENDS_${PN}-sd8801 += "${PN}-marvell-license" +RDEPENDS_${PN}-sd8887 += "${PN}-marvell-license" +RDEPENDS_${PN}-sd8897 += "${PN}-marvell-license" +RDEPENDS_${PN}-sd8997 += "${PN}-marvell-license" +RDEPENDS_${PN}-usb8997 += "${PN}-marvell-license" + +# For netronome +LICENSE_${PN}-netronome = "Firmware-netronome" + +FILES_${PN}-netronome-license = " \ + ${nonarch_base_libdir}/firmware/LICENCE.Netronome \ +" +FILES_${PN}-netronome = " \ + ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0081*.nffw \ + ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0096*.nffw \ + ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0097*.nffw \ + ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0099*.nffw \ +" + +RDEPENDS_${PN}-netronome += "${PN}-netronome-license" + +# For Nvidia +LICENSE_${PN}-nvidia-gpu = "Firmware-nvidia" +LICENSE_${PN}-nvidia-tegra = "Firmware-nvidia" +LICENSE_${PN}-nvidia-tegra-k1 = "Firmware-nvidia" +LICENSE_${PN}-nvidia-license = "Firmware-nvidia" + +FILES_${PN}-nvidia-gpu = "${nonarch_base_libdir}/firmware/nvidia" +FILES_${PN}-nvidia-tegra = " \ + ${nonarch_base_libdir}/firmware/nvidia/tegra* \ + ${nonarch_base_libdir}/firmware/nvidia/gm20b \ + ${nonarch_base_libdir}/firmware/nvidia/gp10b \ +" +FILES_${PN}-nvidia-tegra-k1 = " \ + ${nonarch_base_libdir}/firmware/nvidia/tegra124 \ + ${nonarch_base_libdir}/firmware/nvidia/gk20a \ +" +FILES_${PN}-nvidia-license = "${nonarch_base_libdir}/firmware/LICENCE.nvidia" + +RDEPENDS_${PN}-nvidia-gpu += "${PN}-nvidia-license" +RDEPENDS_${PN}-nvidia-tegra += "${PN}-nvidia-license" +RDEPENDS_${PN}-nvidia-tegra-k1 += "${PN}-nvidia-license" + +# For rtl +LICENSE_${PN}-rtl8188 = "Firmware-rtlwifi_firmware" +LICENSE_${PN}-rtl8192cu = "Firmware-rtlwifi_firmware" +LICENSE_${PN}-rtl8192ce = "Firmware-rtlwifi_firmware" +LICENSE_${PN}-rtl8192su = "Firmware-rtlwifi_firmware" +LICENSE_${PN}-rtl8723 = "Firmware-rtlwifi_firmware" +LICENSE_${PN}-rtl8821 = "Firmware-rtlwifi_firmware" +LICENSE_${PN}-rtl-license = "Firmware-rtlwifi_firmware" +LICENSE_${PN}-rtl8168 = "WHENCE" + +FILES_${PN}-rtl-license = " \ + ${nonarch_base_libdir}/firmware/LICENCE.rtlwifi_firmware.txt \ +" +FILES_${PN}-rtl8188 = " \ + ${nonarch_base_libdir}/firmware/rtlwifi/rtl8188*.bin \ +" +FILES_${PN}-rtl8192cu = " \ + ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192cufw*.bin \ +" +FILES_${PN}-rtl8192ce = " \ + ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192cfw*.bin \ +" +FILES_${PN}-rtl8192su = " \ + ${nonarch_base_libdir}/firmware/rtlwifi/rtl8712u.bin \ +" +FILES_${PN}-rtl8723 = " \ + ${nonarch_base_libdir}/firmware/rtlwifi/rtl8723*.bin \ +" +FILES_${PN}-rtl8821 = " \ + ${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.bin \ +" +FILES_${PN}-rtl8168 = " \ + ${nonarch_base_libdir}/firmware/rtl_nic/rtl8168*.fw \ +" + +RDEPENDS_${PN}-rtl8188 += "${PN}-rtl-license" +RDEPENDS_${PN}-rtl8192ce += "${PN}-rtl-license" +RDEPENDS_${PN}-rtl8192cu += "${PN}-rtl-license" +RDEPENDS_${PN}-rtl8192su = "${PN}-rtl-license" +RDEPENDS_${PN}-rtl8723 += "${PN}-rtl-license" +RDEPENDS_${PN}-rtl8821 += "${PN}-rtl-license" +RDEPENDS_${PN}-rtl8168 += "${PN}-whence-license" + +# For ti-connectivity +LICENSE_${PN}-wlcommon = "Firmware-ti-connectivity" +LICENSE_${PN}-wl12xx = "Firmware-ti-connectivity" +LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity" +LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity" + +FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity" +# wl18xx optionally needs wl1271-nvs.bin (which itself is a symlink to +# wl127x-nvs.bin) - see linux/drivers/net/wireless/ti/wlcore/sdio.c +# and drivers/net/wireless/ti/wlcore/spi.c. +# While they're optional and actually only used to override the MAC +# address on wl18xx, driver loading will delay (by udev timout - 60s) +# if not there. So let's make it available always. Because it's a +# symlink, both need to go to wlcommon. +FILES_${PN}-wlcommon = " \ + ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl127x-nvs.bin \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl1271-nvs.bin \ +" +FILES_${PN}-wl12xx = " \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \ +" +FILES_${PN}-wl18xx = " \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \ +" + +RDEPENDS_${PN}-wl12xx = "${PN}-ti-connectivity-license ${PN}-wlcommon" +RDEPENDS_${PN}-wl18xx = "${PN}-ti-connectivity-license ${PN}-wlcommon" + +# For vt6656 +LICENSE_${PN}-vt6656 = "Firmware-via_vt6656" +LICENSE_${PN}-vt6656-license = "Firmware-via_vt6656" + +FILES_${PN}-vt6656-license = "${nonarch_base_libdir}/firmware/LICENCE.via_vt6656" +FILES_${PN}-vt6656 = " \ + ${nonarch_base_libdir}/firmware/vntwusb.fw \ +" + +RDEPENDS_${PN}-vt6656 = "${PN}-vt6656-license" + +# For broadcom + +# 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 " \${PN}-$pkg \\"; done | sort -u + +LICENSE_${PN}-broadcom-license = "Firmware-broadcom_bcm43xx" +FILES_${PN}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx" + +# 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 "$i - $pkg"; echo -e "FILES_\${PN}-$pkg = \"\${nonarch_base_libdir}/firmware/brcm/$i\""; done | grep ^FILES + +FILES_${PN}-bcm43xx = "${nonarch_base_libdir}/firmware/brcm/bcm43xx-0.fw" +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.*" +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" +FILES_${PN}-bcm43241b0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b0-sdio.bin" +FILES_${PN}-bcm43241b4 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b4-sdio.bin" +FILES_${PN}-bcm43241b5 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b5-sdio.bin" +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.*" +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" +FILES_${PN}-bcm43569 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43569.bin" +FILES_${PN}-bcm43570 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43570-pcie.bin" +FILES_${PN}-bcm4358 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4358-pcie.bin" +FILES_${PN}-bcm43602 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.bin \ + ${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 +# Currently 1st one and last 6 have cypress LICENSE + +LICENSE_${PN}-bcm43xx = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm43xx += "${PN}-broadcom-license" +LICENSE_${PN}-bcm43xx-hdr = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm43xx-hdr += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4329-fullmac = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4329-fullmac += "${PN}-broadcom-license" +LICENSE_${PN}-bcm43236b = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm43236b += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4329 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4329 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4330 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4330 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4334 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4334 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4335 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4335 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4339 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4339 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm43241b0 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm43241b0 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm43241b4 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm43241b4 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm43241b5 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm43241b5 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm43242a = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm43242a += "${PN}-broadcom-license" +LICENSE_${PN}-bcm43143 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm43143 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm43430a0 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm43430a0 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm43455 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm43455 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4350c2 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4350c2 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4350 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4350 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4356 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4356 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm43569 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm43569 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm43570 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm43570 += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4358 = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4358 += "${PN}-broadcom-license" +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" + +# For broadcom cypress + +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.*" +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.*" +FILES_${PN}-bcm4373 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bin \ + ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373.bin \ +" + +LICENSE_${PN}-bcm-0bb4-0306 = "Firmware-cypress" +RDEPENDS_${PN}-bcm-0bb4-0306 += "${PN}-cypress-license" +LICENSE_${PN}-bcm43340 = "Firmware-cypress" +RDEPENDS_${PN}-bcm43340 += "${PN}-cypress-license" +LICENSE_${PN}-bcm43362 = "Firmware-cypress" +RDEPENDS_${PN}-bcm43362 += "${PN}-cypress-license" +LICENSE_${PN}-bcm43430 = "Firmware-cypress" +RDEPENDS_${PN}-bcm43430 += "${PN}-cypress-license" +LICENSE_${PN}-bcm4354 = "Firmware-cypress" +RDEPENDS_${PN}-bcm4354 += "${PN}-cypress-license" +LICENSE_${PN}-bcm4356-pcie = "Firmware-cypress" +RDEPENDS_${PN}-bcm4356-pcie += "${PN}-cypress-license" +LICENSE_${PN}-bcm4373 = "Firmware-cypress" +RDEPENDS_${PN}-bcm4373 += "${PN}-cypress-license" + +# For Broadcom bnx2-mips +# +# which is a separate case to the other Broadcom firmwares since its +# license is contained in the shared WHENCE file. + +LICENSE_${PN}-bnx2-mips = "WHENCE" +LICENSE_${PN}-whence-license = "WHENCE" + +FILES_${PN}-bnx2-mips = "${nonarch_base_libdir}/firmware/bnx2/bnx2-mips-09-6.2.1b.fw" +FILES_${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE" + +RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license" + +# For imx-sdma +LICENSE_${PN}-imx-sdma-imx6q = "Firmware-imx-sdma_firmware" +LICENSE_${PN}-imx-sdma-imx7d = "Firmware-imx-sdma_firmware" +LICENSE_${PN}-imx-sdma-license = "Firmware-imx-sdma_firmware" + +FILES_${PN}-imx-sdma-imx6q = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin" + +RPROVIDES_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q" +RREPLACES_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q" +RCONFLICTS_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q" + +FILES_${PN}-imx-sdma-imx7d = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin" + +FILES_${PN}-imx-sdma-license = "${nonarch_base_libdir}/firmware/LICENSE.sdma_firmware" + +RDEPENDS_${PN}-imx-sdma-imx6q += "${PN}-imx-sdma-license" +RDEPENDS_${PN}-imx-sdma-imx7d += "${PN}-imx-sdma-license" + +# For iwlwifi +LICENSE_${PN}-iwlwifi = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-3160-7 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-3160-8 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-3160-9 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-3160-10 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-3160-12 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-3160-13 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-3160-16 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-3160-17 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-6000-4 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-6000g2a-5 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-6000g2a-6 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-6000g2b-5 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-6000g2b-6 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-6050-4 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-6050-5 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-7260 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-7265 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-7265d = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-8000c = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-8265 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-9000 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-misc = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware" + + +FILES_${PN}-iwlwifi-license = "${nonarch_base_libdir}/firmware/LICENCE.iwlwifi_firmware" +FILES_${PN}-iwlwifi-135-6 = "${nonarch_base_libdir}/firmware/iwlwifi-135-6.ucode" +FILES_${PN}-iwlwifi-3160-7 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-7.ucode" +FILES_${PN}-iwlwifi-3160-8 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-8.ucode" +FILES_${PN}-iwlwifi-3160-9 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-9.ucode" +FILES_${PN}-iwlwifi-3160-10 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-10.ucode" +FILES_${PN}-iwlwifi-3160-12 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-12.ucode" +FILES_${PN}-iwlwifi-3160-13 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-13.ucode" +FILES_${PN}-iwlwifi-3160-16 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-16.ucode" +FILES_${PN}-iwlwifi-3160-17 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-17.ucode" +FILES_${PN}-iwlwifi-6000-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6000-4.ucode" +FILES_${PN}-iwlwifi-6000g2a-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-5.ucode" +FILES_${PN}-iwlwifi-6000g2a-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-6.ucode" +FILES_${PN}-iwlwifi-6000g2b-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-5.ucode" +FILES_${PN}-iwlwifi-6000g2b-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-6.ucode" +FILES_${PN}-iwlwifi-6050-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-4.ucode" +FILES_${PN}-iwlwifi-6050-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-5.ucode" +FILES_${PN}-iwlwifi-7260 = "${nonarch_base_libdir}/firmware/iwlwifi-7260-*.ucode" +FILES_${PN}-iwlwifi-7265 = "${nonarch_base_libdir}/firmware/iwlwifi-7265-*.ucode" +FILES_${PN}-iwlwifi-7265d = "${nonarch_base_libdir}/firmware/iwlwifi-7265D-*.ucode" +FILES_${PN}-iwlwifi-8000c = "${nonarch_base_libdir}/firmware/iwlwifi-8000C-*.ucode" +FILES_${PN}-iwlwifi-8265 = "${nonarch_base_libdir}/firmware/iwlwifi-8265-*.ucode" +FILES_${PN}-iwlwifi-9000 = "${nonarch_base_libdir}/firmware/iwlwifi-9000-*.ucode" +FILES_${PN}-iwlwifi-misc = "${nonarch_base_libdir}/firmware/iwlwifi-*.ucode" + +RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-3160-8 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-3160-9 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-3160-10 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-3160-12 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-3160-13 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-3160-16 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-3160-17 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-6000-4 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-6000g2a-6 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-6000g2b-5 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-6050-4 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-6050-5 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-7265d = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-8000c = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-9000 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-misc = "${PN}-iwlwifi-license" + +# -iwlwifi-misc is a "catch all" package that includes all the iwlwifi +# firmwares that are not already included in other -iwlwifi- packages. +# -iwlwifi is a virtual package that depends upon all iwlwifi packages. +# These are distinct in order to allow the -misc firmwares to be installed +# without pulling in every other iwlwifi package. +ALLOW_EMPTY_${PN}-iwlwifi = "1" +ALLOW_EMPTY_${PN}-iwlwifi-misc = "1" + +# Handle package updating for the newly merged iwlwifi groupings +RPROVIDES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" +RREPLACES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" +RCONFLICTS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" + +RPROVIDES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" +RREPLACES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" +RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" + +# For ibt +LICENSE_${PN}-ibt-license = "Firmware-ibt_firmware" +LICENSE_${PN}-ibt-hw-37-7 = "Firmware-ibt_firmware" +LICENSE_${PN}-ibt-hw-37-8 = "Firmware-ibt_firmware" +LICENSE_${PN}-ibt-11-5 = "Firmware-ibt_firmware" +LICENSE_${PN}-ibt-12-16 = "Firmware-ibt_firmware" +LICENSE_${PN}-ibt-17 = "Firmware-ibt_firmware" +LICENSE_${PN}-ibt-20 = "Firmware-ibt_firmware" +LICENSE_${PN}-ibt-misc = "Firmware-ibt_firmware" + +FILES_${PN}-ibt-license = "${nonarch_base_libdir}/firmware/LICENCE.ibt_firmware" +FILES_${PN}-ibt-hw-37-7 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.7*.bseq" +FILES_${PN}-ibt-hw-37-8 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bseq" +FILES_${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi ${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc" +FILES_${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi ${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc" +FILES_${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc" +FILES_${PN}-ibt-20 = "${nonarch_base_libdir}/firmware/intel/ibt-20-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-20-*.ddc" +FILES_${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/intel/ibt-*" + +RDEPENDS_${PN}-ibt-hw-37-7 = "${PN}-ibt-license" +RDEPENDS_${PN}-ibt-hw-37.8 = "${PN}-ibt-license" +RDEPENDS_${PN}-ibt-11-5 = "${PN}-ibt-license" +RDEPENDS_${PN}-ibt-12-16 = "${PN}-ibt-license" +RDEPENDS_${PN}-ibt-17 = "${PN}-ibt-license" +RDEPENDS_${PN}-ibt-20 = "${PN}-ibt-license" +RDEPENDS_${PN}-ibt-misc = "${PN}-ibt-license" + +ALLOW_EMPTY_${PN}-ibt= "1" +ALLOW_EMPTY_${PN}-ibt-misc = "1" + +LICENSE_${PN}-i915 = "Firmware-i915" +LICENSE_${PN}-i915-license = "Firmware-i915" +FILES_${PN}-i915-license = "${nonarch_base_libdir}/firmware/LICENSE.i915" +FILES_${PN}-i915 = "${nonarch_base_libdir}/firmware/i915" +RDEPENDS_${PN}-i915 = "${PN}-i915-license" + +LICENSE_${PN}-ice = "Firmware-ice" +LICENSE_${PN}-ice-license = "Firmware-ice" +FILES_${PN}-ice-license = "${nonarch_base_libdir}/firmware/LICENSE.ice" +FILES_${PN}-ice = "${nonarch_base_libdir}/firmware/intel/ice" +RDEPENDS_${PN}-ice = "${PN}-ice-license" + +FILES_${PN}-adsp-sst-license = "${nonarch_base_libdir}/firmware/LICENCE.adsp_sst" +LICENSE_${PN}-adsp-sst = "Firmware-adsp_sst" +LICENSE_${PN}-adsp-sst-license = "Firmware-adsp_sst" +FILES_${PN}-adsp-sst = "${nonarch_base_libdir}/firmware/intel/dsp_fw*" +RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license" + +# For QAT +LICENSE_${PN}-qat = "Firmware-qat" +LICENSE_${PN}-qat-license = "Firmware-qat" +FILES_${PN}-qat-license = "${nonarch_base_libdir}/firmware/LICENCE.qat_firmware" +FILES_${PN}-qat = "${nonarch_base_libdir}/firmware/qat*.bin" +RDEPENDS_${PN}-qat = "${PN}-qat-license" + +# For QCOM VPU/GPU and SDM845 +LICENSE_${PN}-qcom-license = "Firmware-qcom" +FILES_${PN}-qcom-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt" +FILES_${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" +FILES_${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" +FILES_${PN}-qcom-venus-5.2 = "${nonarch_base_libdir}/firmware/qcom/venus-5.2/*" +FILES_${PN}-qcom-venus-5.4 = "${nonarch_base_libdir}/firmware/qcom/venus-5.4/*" +FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" +FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" +FILES_${PN}-qcom-adreno-a630 = "${nonarch_base_libdir}/firmware/qcom/a630*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*" +FILES_${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" +FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" +FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" +RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-venus-5.2 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-venus-5.4 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-adreno-a630 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-sdm845-audio = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-sdm845-compute = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-sdm845-modem = "${PN}-qcom-license" + +FILES_${PN}-liquidio = "${nonarch_base_libdir}/firmware/liquidio" + +# For Amlogic VDEC +LICENSE_${PN}-amlogic-vdec = "Firmware-amlogic_vdec" +FILES_${PN}-amlogic-vdec-license = "${nonarch_base_libdir}/firmware/LICENSE.amlogic_vdec" +FILES_${PN}-amlogic-vdec = "${nonarch_base_libdir}/firmware/meson/vdec/*" +RDEPENDS_${PN}-amlogic-vdec = "${PN}-amlogic-vdec-license" + +# For other firmwares +# Maybe split out to separate packages when needed. +LICENSE_${PN} = "\ + Firmware-Abilis \ + & Firmware-agere \ + & Firmware-amdgpu \ + & Firmware-amd-ucode \ + & Firmware-amlogic_vdec \ + & Firmware-atmel \ + & Firmware-ca0132 \ + & Firmware-cavium \ + & Firmware-chelsio_firmware \ + & Firmware-cw1200 \ + & Firmware-dib0700 \ + & Firmware-e100 \ + & Firmware-ene_firmware \ + & Firmware-fw_sst_0f28 \ + & Firmware-go7007 \ + & Firmware-hfi1_firmware \ + & Firmware-i2400m \ + & Firmware-ibt_firmware \ + & Firmware-it913x \ + & Firmware-IntcSST2 \ + & Firmware-kaweth \ + & Firmware-moxa \ + & Firmware-myri10ge_firmware \ + & Firmware-nvidia \ + & Firmware-OLPC \ + & Firmware-ath9k-htc \ + & Firmware-phanfw \ + & Firmware-qat \ + & Firmware-qcom \ + & Firmware-qla1280 \ + & Firmware-qla2xxx \ + & Firmware-r8a779x_usb3 \ + & Firmware-radeon \ + & Firmware-ralink_a_mediatek_company_firmware \ + & Firmware-ralink-firmware \ + & Firmware-imx-sdma_firmware \ + & Firmware-siano \ + & Firmware-tda7706-firmware \ + & Firmware-ti-connectivity \ + & Firmware-ti-keystone \ + & Firmware-ueagle-atm4-firmware \ + & Firmware-wl1251 \ + & Firmware-xc4000 \ + & Firmware-xc5000 \ + & Firmware-xc5000c \ + & WHENCE \ +" + +FILES_${PN}-license += "${nonarch_base_libdir}/firmware/LICEN*" +FILES_${PN} += "${nonarch_base_libdir}/firmware/*" +RDEPENDS_${PN} += "${PN}-license" +RDEPENDS_${PN} += "${PN}-whence-license" + +# Make linux-firmware depend on all of the split-out packages. +# Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages. +# Make linux-firmware-ibt depend on all of the split-out ibt packages. +python populate_packages_prepend () { + firmware_pkgs = oe.utils.packages_filter_out_system(d) + d.appendVar('RRECOMMENDS_linux-firmware', ' ' + ' '.join(firmware_pkgs)) + + iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs) + d.appendVar('RRECOMMENDS_linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs)) + + ibt_pkgs = filter(lambda x: x.find('-ibt-') != -1, firmware_pkgs) + d.appendVar('RRECOMMENDS_linux-firmware-ibt', ' ' + ' '.join(ibt_pkgs)) +} + +# Firmware files are generally not ran on the CPU, so they can be +# allarch despite being architecture specific +INSANE_SKIP = "arch" diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb new file mode 100644 index 000000000..d6a4d5aa6 --- /dev/null +++ b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb @@ -0,0 +1,19 @@ +require linux-libc-headers.inc + +SRC_URI_append_libc-musl = "\ + file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.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-include-linux-stddef.h-in-swab.h-uapi-header.patch \ + " + +SRC_URI_append = "\ + file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ + file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ +" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +SRC_URI[md5sum] = "753adc474bf799d569dec4f165ed92c3" +SRC_URI[sha256sum] = "dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43" + diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.8.bb b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.8.bb deleted file mode 100644 index d76a8a36f..000000000 --- a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.8.bb +++ /dev/null @@ -1,18 +0,0 @@ -require linux-libc-headers.inc - -SRC_URI_append_libc-musl = "\ - file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.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-include-linux-stddef.h-in-swab.h-uapi-header.patch \ - " - -SRC_URI_append = "\ - file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ - file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ -" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -SRC_URI[md5sum] = "0e5c4c15266218ef26c50fac0016095b" -SRC_URI[sha256sum] = "e7f75186aa0642114af8f19d99559937300ca27acaf7451b36d4f9b0f85cf1f5" diff --git a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb index 8a900ed18..dadeade3a 100644 --- a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -186,7 +186,7 @@ do_install() { cp -a --parents $SYSCALL_TOOLS $kerneldir/build/ fi - cp -a --parents arch/arm/kernel/module.lds $kerneldir/build/ + cp -a --parents arch/arm/kernel/module.lds $kerneldir/build/ 2>/dev/null || : fi if [ -d arch/${ARCH}/include ]; then diff --git a/poky/meta/recipes-kernel/linux/linux-dummy.bb b/poky/meta/recipes-kernel/linux/linux-dummy.bb index 649fc04dd..95dc85ff2 100644 --- a/poky/meta/recipes-kernel/linux/linux-dummy.bb +++ b/poky/meta/recipes-kernel/linux/linux-dummy.bb @@ -26,7 +26,7 @@ DESCRIPTION_kernel-vmlinux = "Kernel vmlinux meta package" INHIBIT_DEFAULT_DEPS = "1" -#COMPATIBLE_MACHINE = "your_machine" +COMPATIBLE_HOST = ".*-linux" PR = "r1" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index 6272af625..95ac6e0a4 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' -LINUX_VERSION ?= "5.10-rc+" +LINUX_VERSION ?= "5.11-rc+" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb new file mode 100644 index 000000000..1c54ec171 --- /dev/null +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -0,0 +1,44 @@ +KBRANCH ?= "v5.10/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 ?= "dca023723e0dbfba1c7e8933ca6d70b17af0eab6" +SRCREV_meta ?= "6b12385f7d89ccac211c3981420a84394530ce83" + +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.10;destsuffix=${KMETA}" + +LINUX_VERSION ?= "5.10.2" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +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 = "1" + +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/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 104ada2db..d505949eb 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/poky/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 ?= "97576fb7447efba82eb025bde3ae9ceb29939d5e" -SRCREV_meta ?= "d626f9108d590d41e82b97cbffc380aa699e86e1" +SRCREV_machine ?= "baf3ccf7c7cfaf9515d8c8b3b639d7bbb0564594" +SRCREV_meta ?= "1c358e19696827b594de26a221f110fc2647dfa8" 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.78" +LINUX_VERSION ?= "5.4.85" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb index 033dfc76a..d20b8b10a 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" +SRCREV_meta ?= "b976de4f41df1a50dc84839b64fb0ce2c6f9fb21" 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.8;destsuffix=${KMETA}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb new file mode 100644 index 000000000..1a1845f47 --- /dev/null +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -0,0 +1,32 @@ +KBRANCH ?= "v5.10/standard/tiny/base" +KBRANCH_qemuarm ?= "v5.10/standard/tiny/arm-versatile-926ejs" + +LINUX_KERNEL_TYPE = "tiny" +KCONFIG_MODE = "--allnoconfig" + +require recipes-kernel/linux/linux-yocto.inc + +LINUX_VERSION ?= "5.10.2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +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 ?= "d02c60a7622d7f06805925ae1742dad2b36eaab9" +SRCREV_machine ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_meta ?= "6b12385f7d89ccac211c3981420a84394530ce83" + +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.10;destsuffix=${KMETA}" + +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" + +# Functionality flags +KERNEL_FEATURES = "" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index d8784c49a..fea9ae26c 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/poky/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.78" +LINUX_VERSION ?= "5.4.85" 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 ?= "6cf3b1d30bc7ac9bd86190129b3cbbdd04b8b236" -SRCREV_machine ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_meta ?= "d626f9108d590d41e82b97cbffc380aa699e86e1" +SRCREV_machine_qemuarm ?= "f7f4bcebdd599197cde6f1d1985cb1ef1f3e8a54" +SRCREV_machine ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_meta ?= "1c358e19696827b594de26a221f110fc2647dfa8" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb index 50cee0762..a5135155d 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "9509db6e3ed6a23b1f7495b53248d1cbfe22710b" SRCREV_machine ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" +SRCREV_meta ?= "b976de4f41df1a50dc84839b64fb0ce2c6f9fb21" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb new file mode 100644 index 000000000..fdfc32123 --- /dev/null +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -0,0 +1,55 @@ +KBRANCH ?= "v5.10/standard/base" + +require recipes-kernel/linux/linux-yocto.inc + +# board specific branches +KBRANCH_qemuarm ?= "v5.10/standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "v5.10/standard/qemuarm64" +KBRANCH_qemumips ?= "v5.10/standard/mti-malta32" +KBRANCH_qemuppc ?= "v5.10/standard/qemuppc" +KBRANCH_qemuriscv64 ?= "v5.10/standard/base" +KBRANCH_qemux86 ?= "v5.10/standard/base" +KBRANCH_qemux86-64 ?= "v5.10/standard/base" +KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" + +SRCREV_machine_qemuarm ?= "5397e4b8744f2319707fef0b1fed890dcdbb30c8" +SRCREV_machine_qemuarm64 ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_machine_qemumips ?= "925ed2e122804bb2d3b86622c1309c04d8e13652" +SRCREV_machine_qemuppc ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_machine_qemuriscv64 ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_machine_qemux86 ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_machine_qemux86-64 ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_machine_qemumips64 ?= "2395091f9593bd8465c37f67fabdee14de1900a5" +SRCREV_machine ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_meta ?= "6b12385f7d89ccac211c3981420a84394530ce83" + +# remap qemuarm to qemuarma15 for the 5.8 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.10;destsuffix=${KMETA}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +LINUX_VERSION ?= "5.10.2" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" +DEPENDS += "gmp-native" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "1" + +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)}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb index c24e5ddc8..a3feeae96 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/poky/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 ?= "b3bafed66cf1be24caaa9c876d7d9a8298df831b" -SRCREV_machine_qemuarm64 ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemumips ?= "36c2a0b1caef0b2dd6b5777d1939c383238536a8" -SRCREV_machine_qemuppc ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemuriscv64 ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemux86 ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemux86-64 ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemumips64 ?= "971a3cedf9a2a7774fa072b9a13380fb59fd605b" -SRCREV_machine ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_meta ?= "d626f9108d590d41e82b97cbffc380aa699e86e1" +SRCREV_machine_qemuarm ?= "888fe3a6f7776f5732c3c4cf4c862447e646c25e" +SRCREV_machine_qemuarm64 ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_machine_qemumips ?= "459ad51fb16465be3d291217a10bcb9d055f5775" +SRCREV_machine_qemuppc ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_machine_qemuriscv64 ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_machine_qemux86 ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_machine_qemux86-64 ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_machine_qemumips64 ?= "7eff01977ef77715ebc3e5a126534c39fe4ac918" +SRCREV_machine ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_meta ?= "1c358e19696827b594de26a221f110fc2647dfa8" # 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.78" +LINUX_VERSION ?= "5.4.85" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb index af576891e..f6ebefbf1 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb @@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" SRCREV_machine_qemux86-64 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" SRCREV_machine_qemumips64 ?= "01a02b058f9a8941032b298b8d25c673526152f4" SRCREV_machine ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" +SRCREV_meta ?= "b976de4f41df1a50dc84839b64fb0ce2c6f9fb21" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-objtool-Rename-frame.h-objtool.h-v5.10.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-objtool-Rename-frame.h-objtool.h-v5.10.patch new file mode 100644 index 000000000..fde939839 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-objtool-Rename-frame.h-objtool.h-v5.10.patch @@ -0,0 +1,88 @@ +From 37b9cb0e6cb92181b7a25583849a9d161a558982 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Mon, 26 Oct 2020 13:41:02 -0400 +Subject: [PATCH 07/19] fix: objtool: Rename frame.h -> objtool.h (v5.10) + +See upstream commit : + + commit 00089c048eb4a8250325efb32a2724fd0da68cce + Author: Julien Thierry + Date: Fri Sep 4 16:30:25 2020 +0100 + + objtool: Rename frame.h -> objtool.h + + Header frame.h is getting more code annotations to help objtool analyze + object files. + + Rename the file to objtool.h. + +Upstream-Status: Backport + +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +Change-Id: Ic2283161bebcbf1e33b72805eb4d2628f4ae3e89 +--- + lttng-filter-interpreter.c | 2 +- + wrapper/{frame.h => objtool.h} | 19 ++++++++++++------- + 2 files changed, 13 insertions(+), 8 deletions(-) + rename wrapper/{frame.h => objtool.h} (50%) + +diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c +index 21169f01..5d572437 100644 +--- a/lttng-filter-interpreter.c ++++ b/lttng-filter-interpreter.c +@@ -8,7 +8,7 @@ + */ + + #include +-#include ++#include + #include + #include + +diff --git a/wrapper/frame.h b/wrapper/objtool.h +similarity index 50% +rename from wrapper/frame.h +rename to wrapper/objtool.h +index 6e6dc811..3b997cae 100644 +--- a/wrapper/frame.h ++++ b/wrapper/objtool.h +@@ -1,18 +1,23 @@ +-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1) ++/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) + * +- * wrapper/frame.h ++ * wrapper/objtool.h + * + * Copyright (C) 2016 Mathieu Desnoyers + */ + +-#ifndef _LTTNG_WRAPPER_FRAME_H +-#define _LTTNG_WRAPPER_FRAME_H ++#ifndef _LTTNG_WRAPPER_OBJTOOL_H ++#define _LTTNG_WRAPPER_OBJTOOL_H + + #include + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) +- ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++#include ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) + #include ++#endif ++ ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) + + #define LTTNG_STACK_FRAME_NON_STANDARD(func) \ + STACK_FRAME_NON_STANDARD(func) +@@ -23,4 +28,4 @@ + + #endif + +-#endif /* _LTTNG_WRAPPER_FRAME_H */ ++#endif /* _LTTNG_WRAPPER_OBJTOOL_H */ +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0009-fix-btrfs-make-ordered-extent-tracepoint-take-btrfs_.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0009-fix-btrfs-make-ordered-extent-tracepoint-take-btrfs_.patch new file mode 100644 index 000000000..bc87c7174 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0009-fix-btrfs-make-ordered-extent-tracepoint-take-btrfs_.patch @@ -0,0 +1,179 @@ +From ddad4e82bc2cc48c0eb56d2daf69409026e8b31a Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Tue, 27 Oct 2020 12:10:05 -0400 +Subject: [PATCH 09/19] fix: btrfs: make ordered extent tracepoint take + btrfs_inode (v5.10) + +See upstream commit : + + commit acbf1dd0fcbd10c67826a19958f55a053b32f532 + Author: Nikolay Borisov + Date: Mon Aug 31 14:42:40 2020 +0300 + + btrfs: make ordered extent tracepoint take btrfs_inode + +Upstream-Status: Backport + +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +Change-Id: I096d0801ffe0ad826cfe414cdd1c0857cbd2b624 +--- + instrumentation/events/lttng-module/btrfs.h | 120 +++++++++++++++----- + 1 file changed, 90 insertions(+), 30 deletions(-) + +diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h +index 52fcfd0d..d47f3280 100644 +--- a/instrumentation/events/lttng-module/btrfs.h ++++ b/instrumentation/events/lttng-module/btrfs.h +@@ -346,7 +346,29 @@ LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist, + ) + #endif + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent, ++ ++ TP_PROTO(const struct btrfs_inode *inode, ++ const struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered), ++ ++ TP_FIELDS( ++ ctf_array(u8, fsid, inode->root->lttng_fs_info_fsid, BTRFS_UUID_SIZE) ++ ctf_integer(ino_t, ino, btrfs_ino(inode)) ++ ctf_integer(u64, file_offset, ordered->file_offset) ++ ctf_integer(u64, start, ordered->disk_bytenr) ++ ctf_integer(u64, len, ordered->num_bytes) ++ ctf_integer(u64, disk_len, ordered->disk_num_bytes) ++ ctf_integer(u64, bytes_left, ordered->bytes_left) ++ ctf_integer(unsigned long, flags, ordered->flags) ++ ctf_integer(int, compress_type, ordered->compress_type) ++ ctf_integer(int, refs, refcount_read(&ordered->refs)) ++ ctf_integer(u64, root_objectid, inode->root->root_key.objectid) ++ ) ++) ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) + LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent, + + TP_PROTO(const struct inode *inode, +@@ -458,7 +480,39 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent, + ) + #endif + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_add, ++ ++ TP_PROTO(const struct btrfs_inode *inode, ++ const struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_remove, ++ ++ TP_PROTO(const struct btrfs_inode *inode, ++ const struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_start, ++ ++ TP_PROTO(const struct btrfs_inode *inode, ++ const struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_put, ++ ++ TP_PROTO(const struct btrfs_inode *inode, ++ const struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ +@@ -494,7 +548,41 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_put, + + TP_ARGS(inode, ordered) + ) ++#else ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_add, ++ ++ TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_remove, ++ ++ TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_start, ++ ++ TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) + ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_put, ++ ++ TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++#endif ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ ++ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ ++ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ ++ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ ++ LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) + LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__writepage, + + TP_PROTO(const struct page *page, const struct inode *inode, +@@ -563,34 +651,6 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_file, + ) + ) + #else +-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_add, +- +- TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), +- +- TP_ARGS(inode, ordered) +-) +- +-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_remove, +- +- TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), +- +- TP_ARGS(inode, ordered) +-) +- +-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_start, +- +- TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), +- +- TP_ARGS(inode, ordered) +-) +- +-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_put, +- +- TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), +- +- TP_ARGS(inode, ordered) +-) +- + LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__writepage, + + TP_PROTO(struct page *page, struct inode *inode, +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-ext4-fast-commit-recovery-path-v5.10.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-ext4-fast-commit-recovery-path-v5.10.patch new file mode 100644 index 000000000..fb00a44b3 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-ext4-fast-commit-recovery-path-v5.10.patch @@ -0,0 +1,99 @@ +From a28235f8ffa3c961640a835686dddb5ca600dfaf Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Mon, 26 Oct 2020 17:03:23 -0400 +Subject: [PATCH 10/19] fix: ext4: fast commit recovery path (v5.10) + +See upstream commit : + + commit 8016e29f4362e285f0f7e38fadc61a5b7bdfdfa2 + Author: Harshad Shirwadkar + Date: Thu Oct 15 13:37:59 2020 -0700 + + ext4: fast commit recovery path + + This patch adds fast commit recovery path support for Ext4 file + system. We add several helper functions that are similar in spirit to + e2fsprogs journal recovery path handlers. Example of such functions + include - a simple block allocator, idempotent block bitmap update + function etc. Using these routines and the fast commit log in the fast + commit area, the recovery path (ext4_fc_replay()) performs fast commit + log recovery. + +Upstream-Status: Backport + +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +Change-Id: Ia65cf44e108f2df0b458f0d335f33a8f18f50baa +--- + instrumentation/events/lttng-module/ext4.h | 41 ++++++++++++++++++++++ + 1 file changed, 41 insertions(+) + +diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h +index b172c8d9..6e74abad 100644 +--- a/instrumentation/events/lttng-module/ext4.h ++++ b/instrumentation/events/lttng-module/ext4.h +@@ -1274,6 +1274,18 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_load_extent, + ) + ) + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++LTTNG_TRACEPOINT_EVENT(ext4_load_inode, ++ TP_PROTO(struct super_block *sb, unsigned long ino), ++ ++ TP_ARGS(sb, ino), ++ ++ TP_FIELDS( ++ ctf_integer(dev_t, dev, sb->s_dev) ++ ctf_integer(ino_t, ino, ino) ++ ) ++) ++#else + LTTNG_TRACEPOINT_EVENT(ext4_load_inode, + TP_PROTO(struct inode *inode), + +@@ -1284,6 +1296,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_load_inode, + ctf_integer(ino_t, ino, inode->i_ino) + ) + ) ++#endif + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0)) + +@@ -1895,6 +1908,34 @@ LTTNG_TRACEPOINT_EVENT(ext4_es_shrink_exit, + + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++LTTNG_TRACEPOINT_EVENT(ext4_fc_replay_scan, ++ TP_PROTO(struct super_block *sb, int error, int off), ++ ++ TP_ARGS(sb, error, off), ++ ++ TP_FIELDS( ++ ctf_integer(dev_t, dev, sb->s_dev) ++ ctf_integer(int, error, error) ++ ctf_integer(int, off, off) ++ ) ++) ++ ++LTTNG_TRACEPOINT_EVENT(ext4_fc_replay, ++ TP_PROTO(struct super_block *sb, int tag, int ino, int priv1, int priv2), ++ ++ TP_ARGS(sb, tag, ino, priv1, priv2), ++ ++ TP_FIELDS( ++ ctf_integer(dev_t, dev, sb->s_dev) ++ ctf_integer(int, tag, tag) ++ ctf_integer(int, ino, ino) ++ ctf_integer(int, priv1, priv1) ++ ctf_integer(int, priv2, priv2) ++ ) ++) ++#endif ++ + #endif /* LTTNG_TRACE_EXT4_H */ + + /* This part must be outside protection */ +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0012-fix-kvm-x86-mmu-Add-TDP-MMU-PF-handler-v5.10.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0012-fix-kvm-x86-mmu-Add-TDP-MMU-PF-handler-v5.10.patch new file mode 100644 index 000000000..8651bded9 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0012-fix-kvm-x86-mmu-Add-TDP-MMU-PF-handler-v5.10.patch @@ -0,0 +1,82 @@ +From e30866f96b3ab02639f429e4bd34e59b3a336579 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Mon, 26 Oct 2020 14:28:35 -0400 +Subject: [PATCH 12/19] fix: kvm: x86/mmu: Add TDP MMU PF handler (v5.10) + +See upstream commit : + + commit bb18842e21111a979e2e0e1c5d85c09646f18d51 + Author: Ben Gardon + Date: Wed Oct 14 11:26:50 2020 -0700 + + kvm: x86/mmu: Add TDP MMU PF handler + + Add functions to handle page faults in the TDP MMU. These page faults + are currently handled in much the same way as the x86 shadow paging + based MMU, however the ordering of some operations is slightly + different. Future patches will add eager NX splitting, a fast page fault + handler, and parallel page faults. + + Tested by running kvm-unit-tests and KVM selftests on an Intel Haswell + machine. This series introduced no new failures. + +Upstream-Status: Backport + +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +Change-Id: Ie56959cb6c77913d2f1188b0ca15da9114623a4e +--- + .../lttng-module/arch/x86/kvm/mmutrace.h | 20 ++++++++++++++++++- + probes/lttng-probe-kvm-x86-mmu.c | 5 +++++ + 2 files changed, 24 insertions(+), 1 deletion(-) + +diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +index e5470400..86717835 100644 +--- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h ++++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +@@ -163,7 +163,25 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_mmu_page_class, kvm_mmu_prepare_zap_page, + TP_ARGS(sp) + ) + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++ ++LTTNG_TRACEPOINT_EVENT_MAP( ++ mark_mmio_spte, ++ ++ kvm_mmu_mark_mmio_spte, ++ ++ TP_PROTO(u64 *sptep, gfn_t gfn, u64 spte), ++ TP_ARGS(sptep, gfn, spte), ++ ++ TP_FIELDS( ++ ctf_integer_hex(void *, sptep, sptep) ++ ctf_integer(gfn_t, gfn, gfn) ++ ctf_integer(unsigned, access, spte & ACC_ALL) ++ ctf_integer(unsigned int, gen, get_mmio_spte_generation(spte)) ++ ) ++) ++ ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) + + LTTNG_TRACEPOINT_EVENT_MAP( + mark_mmio_spte, +diff --git a/probes/lttng-probe-kvm-x86-mmu.c b/probes/lttng-probe-kvm-x86-mmu.c +index 8f981865..5043c776 100644 +--- a/probes/lttng-probe-kvm-x86-mmu.c ++++ b/probes/lttng-probe-kvm-x86-mmu.c +@@ -31,6 +31,11 @@ + #include <../../arch/x86/kvm/mmutrace.h> + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++#include <../arch/x86/kvm/mmu.h> ++#include <../arch/x86/kvm/mmu/spte.h> ++#endif ++ + #undef TRACE_INCLUDE_PATH + #undef TRACE_INCLUDE_FILE + +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0014-fix-tracepoint-Optimize-using-static_call-v5.10.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0014-fix-tracepoint-Optimize-using-static_call-v5.10.patch new file mode 100644 index 000000000..5892a408b --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0014-fix-tracepoint-Optimize-using-static_call-v5.10.patch @@ -0,0 +1,196 @@ +From bb346792c2cb6995ffc08d2084121935c6384865 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Mon, 26 Oct 2020 17:09:05 -0400 +Subject: [PATCH 14/19] fix: tracepoint: Optimize using static_call() (v5.10) + +See upstream commit : + + commit d25e37d89dd2f41d7acae0429039d2f0ae8b4a07 + Author: Steven Rostedt (VMware) + Date: Tue Aug 18 15:57:52 2020 +0200 + + tracepoint: Optimize using static_call() + + Currently the tracepoint site will iterate a vector and issue indirect + calls to however many handlers are registered (ie. the vector is + long). + + Using static_call() it is possible to optimize this for the common + case of only having a single handler registered. In this case the + static_call() can directly call this handler. Otherwise, if the vector + is longer than 1, call a function that iterates the whole vector like + the current code. + +Upstream-Status: Backport + +Change-Id: I739dd84d62cc1a821b8bd8acff74fa29aa25d22f +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +--- + lttng-statedump-impl.c | 80 +++++++++++++++++++++++++++++++-------- + probes/lttng.c | 7 +++- + tests/probes/lttng-test.c | 7 +++- + wrapper/tracepoint.h | 8 ++++ + 4 files changed, 84 insertions(+), 18 deletions(-) + +diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c +index a6fa71a5..67ecd33c 100644 +--- a/lttng-statedump-impl.c ++++ b/lttng-statedump-impl.c +@@ -55,26 +55,76 @@ + #define LTTNG_INSTRUMENTATION + #include + +-DEFINE_TRACE(lttng_statedump_block_device); +-DEFINE_TRACE(lttng_statedump_end); +-DEFINE_TRACE(lttng_statedump_interrupt); +-DEFINE_TRACE(lttng_statedump_file_descriptor); +-DEFINE_TRACE(lttng_statedump_start); +-DEFINE_TRACE(lttng_statedump_process_state); +-DEFINE_TRACE(lttng_statedump_process_pid_ns); ++LTTNG_DEFINE_TRACE(lttng_statedump_block_device, ++ TP_PROTO(struct lttng_session *session, ++ dev_t dev, const char *diskname), ++ TP_ARGS(session, dev, diskname)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_end, ++ TP_PROTO(struct lttng_session *session), ++ TP_ARGS(session)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_interrupt, ++ TP_PROTO(struct lttng_session *session, ++ unsigned int irq, const char *chip_name, ++ struct irqaction *action), ++ TP_ARGS(session, irq, chip_name, action)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_file_descriptor, ++ TP_PROTO(struct lttng_session *session, ++ struct files_struct *files, ++ int fd, const char *filename, ++ unsigned int flags, fmode_t fmode), ++ TP_ARGS(session, files, fd, filename, flags, fmode)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_start, ++ TP_PROTO(struct lttng_session *session), ++ TP_ARGS(session)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_process_state, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ int type, int mode, int submode, int status, ++ struct files_struct *files), ++ TP_ARGS(session, p, type, mode, submode, status, files)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_process_pid_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct pid_namespace *pid_ns), ++ TP_ARGS(session, p, pid_ns)); ++ + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) +-DEFINE_TRACE(lttng_statedump_process_cgroup_ns); ++LTTNG_DEFINE_TRACE(lttng_statedump_process_cgroup_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct cgroup_namespace *cgroup_ns), ++ TP_ARGS(session, p, cgroup_ns)); + #endif +-DEFINE_TRACE(lttng_statedump_process_ipc_ns); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_process_ipc_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct ipc_namespace *ipc_ns), ++ TP_ARGS(session, p, ipc_ns)); ++ + #ifndef LTTNG_MNT_NS_MISSING_HEADER +-DEFINE_TRACE(lttng_statedump_process_mnt_ns); ++LTTNG_DEFINE_TRACE(lttng_statedump_process_mnt_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct mnt_namespace *mnt_ns), ++ TP_ARGS(session, p, mnt_ns)); + #endif +-DEFINE_TRACE(lttng_statedump_process_net_ns); +-DEFINE_TRACE(lttng_statedump_process_user_ns); +-DEFINE_TRACE(lttng_statedump_process_uts_ns); +-DEFINE_TRACE(lttng_statedump_network_interface); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_network_interface, ++ TP_PROTO(struct lttng_session *session, ++ struct net_device *dev, struct in_ifaddr *ifa), ++ TP_ARGS(session, dev, ifa)); ++ + #ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY +-DEFINE_TRACE(lttng_statedump_cpu_topology); ++LTTNG_DEFINE_TRACE(lttng_statedump_cpu_topology, ++ TP_PROTO(struct lttng_session *session, struct cpuinfo_x86 *c), ++ TP_ARGS(session, c)); + #endif + + struct lttng_fd_ctx { +diff --git a/probes/lttng.c b/probes/lttng.c +index 05bc1388..7ddaa69f 100644 +--- a/probes/lttng.c ++++ b/probes/lttng.c +@@ -8,7 +8,7 @@ + */ + + #include +-#include ++#include + #include + #include + #include +@@ -32,7 +32,10 @@ + #define LTTNG_LOGGER_COUNT_MAX 1024 + #define LTTNG_LOGGER_FILE "lttng-logger" + +-DEFINE_TRACE(lttng_logger); ++LTTNG_DEFINE_TRACE(lttng_logger, ++ PARAMS(const char __user *text, size_t len), ++ PARAMS(text, len) ++); + + static struct proc_dir_entry *lttng_logger_dentry; + +diff --git a/tests/probes/lttng-test.c b/tests/probes/lttng-test.c +index b450e7d7..a4fa0645 100644 +--- a/tests/probes/lttng-test.c ++++ b/tests/probes/lttng-test.c +@@ -25,7 +25,12 @@ + #define LTTNG_INSTRUMENTATION + #include + +-DEFINE_TRACE(lttng_test_filter_event); ++LTTNG_DEFINE_TRACE(lttng_test_filter_event, ++ PARAMS(int anint, int netint, long *values, ++ char *text, size_t textlen, ++ char *etext, uint32_t * net_values), ++ PARAMS(anint, netint, values, text, textlen, etext, net_values) ++); + + #define LTTNG_TEST_FILTER_EVENT_FILE "lttng-test-filter-event" + +diff --git a/wrapper/tracepoint.h b/wrapper/tracepoint.h +index c4ba0123..bc19d8c1 100644 +--- a/wrapper/tracepoint.h ++++ b/wrapper/tracepoint.h +@@ -14,6 +14,14 @@ + #include + #include + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++#define LTTNG_DEFINE_TRACE(name, proto, args) \ ++ DEFINE_TRACE(name, PARAMS(proto), PARAMS(args)) ++#else ++#define LTTNG_DEFINE_TRACE(name, proto, args) \ ++ DEFINE_TRACE(name) ++#endif ++ + #ifndef HAVE_KABI_2635_TRACEPOINT + + #define kabi_2635_tracepoint_probe_register tracepoint_probe_register +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0016-fix-statedump-undefined-symbols-caused-by-incorrect-.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0016-fix-statedump-undefined-symbols-caused-by-incorrect-.patch new file mode 100644 index 000000000..e848e16f5 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0016-fix-statedump-undefined-symbols-caused-by-incorrect-.patch @@ -0,0 +1,55 @@ +From 31f8bf794172102e9758928b481856c4a8800a7f Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Mon, 23 Nov 2020 18:14:25 +0800 +Subject: [PATCH 16/19] fix: statedump: undefined symbols caused by incorrect + patch backport + +bb346792c2cb ("fix: tracepoint: Optimize using static_call() (v5.10)") +misses three definitions and causes the following build failures. + +ERROR: "__tracepoint_lttng_statedump_process_net_ns" [lttng-statedump.ko] undefined! +ERROR: "__tracepoint_lttng_statedump_process_user_ns" [lttng-statedump.ko] undefined! +ERROR: "__tracepoint_lttng_statedump_process_uts_ns" [lttng-statedump.ko] undefined! + +Fixes: #1290 + +Upstream-Status: Backport + +Signed-off-by: He Zhe +Signed-off-by: Mathieu Desnoyers +--- + lttng-statedump-impl.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c +index 67ecd33c..cf803a73 100644 +--- a/lttng-statedump-impl.c ++++ b/lttng-statedump-impl.c +@@ -116,6 +116,24 @@ LTTNG_DEFINE_TRACE(lttng_statedump_process_mnt_ns, + TP_ARGS(session, p, mnt_ns)); + #endif + ++LTTNG_DEFINE_TRACE(lttng_statedump_process_net_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct net *net_ns), ++ TP_ARGS(session, p, net_ns)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_process_user_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct user_namespace *user_ns), ++ TP_ARGS(session, p, user_ns)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_process_uts_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct uts_namespace *uts_ns), ++ TP_ARGS(session, p, uts_ns)); ++ + LTTNG_DEFINE_TRACE(lttng_statedump_network_interface, + TP_PROTO(struct lttng_session *session, + struct net_device *dev, struct in_ifaddr *ifa), +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules_2.12.3.bb b/poky/meta/recipes-kernel/lttng/lttng-modules_2.12.3.bb index ca79e27df..3515e4f51 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-modules_2.12.3.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-modules_2.12.3.bb @@ -12,6 +12,12 @@ 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-btrfs-tracepoints-output-proper-root-owner-for-t.patch \ + file://0007-fix-objtool-Rename-frame.h-objtool.h-v5.10.patch \ + file://0009-fix-btrfs-make-ordered-extent-tracepoint-take-btrfs_.patch \ + file://0010-fix-ext4-fast-commit-recovery-path-v5.10.patch \ + file://0012-fix-kvm-x86-mmu-Add-TDP-MMU-PF-handler-v5.10.patch \ + file://0014-fix-tracepoint-Optimize-using-static_call-v5.10.patch \ + file://0016-fix-statedump-undefined-symbols-caused-by-incorrect-.patch \ " SRC_URI[sha256sum] = "673ef85c9f03e9b8fed10795e09d4e68add39404b70068d08b10f7b85754d7f0" @@ -37,7 +43,7 @@ SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.1 file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " -SRCREV_class-devupstream = "ad594e3a953db1b0c3c059fde45b5a5494f6be78" -PV_class-devupstream = "2.12.2+git${SRCPV}" +SRCREV_class-devupstream = "be71b60a327d7ad2588abc5cad2861177119972b" +PV_class-devupstream = "2.12.3+git${SRCPV}" S_class-devupstream = "${WORKDIR}/git" SRCREV_FORMAT ?= "lttng_git" diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch index f2c14ecc9..08c142331 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch +++ b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch @@ -1,4 +1,4 @@ -From c69b68e5c03f1d260025fb1dd9ab7345e31e15ef Mon Sep 17 00:00:00 2001 +From de9fc501e775cae05f1f87534b4237cd78e8d9a8 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 @@ -9,15 +9,16 @@ 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 | 4 ---- - 1 file changed, 4 deletions(-) + tests/regression/Makefile.am | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am -index 73eb9f7..b92bdbd 100644 +index cbac90d..d467886 100644 --- a/tests/regression/Makefile.am +++ b/tests/regression/Makefile.am -@@ -9,14 +9,10 @@ TESTS = tools/filtering/test_invalid_filter \ +@@ -11,16 +11,10 @@ TESTS = tools/filtering/test_invalid_filter \ tools/filtering/test_valid_filter \ tools/streaming/test_ust \ tools/health/test_thread_ok \ @@ -26,9 +27,29 @@ index 73eb9f7..b92bdbd 100644 - tools/live/test_lttng_ust \ tools/tracefile-limits/test_tracefile_count \ tools/tracefile-limits/test_tracefile_size \ - tools/exclusion/test_exclusion \ +- 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_load \ tools/save-load/test_autoload \ + tools/mi/test_mi \ + tools/wildcard/test_event_wildcard \ +@@ -38,8 +32,7 @@ TESTS = tools/filtering/test_invalid_filter \ + tools/working-directory/test_relayd_working_directory \ + tools/notification/test_notification_multi_app \ + tools/clear/test_ust \ +- tools/clear/test_kernel \ +- tools/tracker/test_event_tracker ++ tools/clear/test_kernel + + if HAVE_LIBLTTNG_UST_CTL + SUBDIRS += ust +@@ -60,7 +53,6 @@ TESTS += ust/before-after/test_before_after \ + ust/multi-lib/test_multi_lib \ + ust/rotation-destroy-flush/test_rotation_destroy_flush \ + ust/namespaces/test_ns_contexts \ +- ust/namespaces/test_ns_contexts_change \ + tools/metadata/test_ust \ + tools/relayd-grouping/test_ust + endif # HAVE_LIBLTTNG_UST_CTL diff --git a/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh b/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh index 3274c25a6..28fe6f92d 100755 --- a/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh +++ b/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh @@ -17,7 +17,7 @@ LOAD_MODULE=modprobe # Test if modules.dep exists and has a size greater than zero if [ ! -s /lib/modules/`uname -r`/modules.dep ]; then [ "$VERBOSE" != no ] && echo "Calculating module dependencies ..." - depmod -Ae + depmod -a fi [ -f /etc/modules ] || [ -d /etc/modules-load.d ] || exit 0 diff --git a/poky/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch new file mode 100644 index 000000000..efc79f6c0 --- /dev/null +++ b/poky/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch @@ -0,0 +1,44 @@ +From cbf27cd54071f788231e69d96dbaad563f1010d4 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Fri, 18 Dec 2020 13:15:08 -0500 +Subject: [PATCH] transport: protect include and callsite with same conditional + +transport.c has the following code block: + + if (!debugfs_p && security_locked_down (LOCKDOWN_DEBUGFS)) + +Which is protected by the conditional STAPCONF_LOCKDOWN_DEBUGFS. + +linux/security.h provides the definition of LOCKDOWN_DEBUGFS, and +must be included or we have a compilation issue. + +The include of security.h is protected by #ifdef CONFIG_SECURITY_LOCKDOWN_LSM, +which means that in some configurations we can get out of sync with +the include and the callsite. + +If we protect the include and the callsite with the same #ifdef, we can +be sure that they will be consistent. + +Upstream-status: Inappropriate (kernel-devsrc specific) + +Signed-off-by: Bruce Ashfield +--- + runtime/transport/transport.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c +index bb4a98bd3..88e20ea28 100644 +--- a/runtime/transport/transport.c ++++ b/runtime/transport/transport.c +@@ -21,7 +21,7 @@ + #include + #include + #include +-#ifdef CONFIG_SECURITY_LOCKDOWN_LSM ++#ifdef STAPCONF_LOCKDOWN_DEBUGFS + #include + #endif + #include "../uidgid_compatibility.h" +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/systemtap/systemtap_git.inc b/poky/meta/recipes-kernel/systemtap/systemtap_git.inc index 56fa51d61..016b42384 100644 --- a/poky/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/poky/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,12 +1,13 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "82b8e1a07a31bf37ed05d6ebc5162b054c0be9fd" -PV = "4.3" +SRCREV = "988f439af39a359b4387963ca4633649866d8275" +PV = "4.4" SRC_URI = "git://sourceware.org/git/systemtap.git \ file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ + file://0001-transport-protect-include-and-callsite-with-same-con.patch \ " COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' diff --git a/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.1.bb deleted file mode 100644 index 2e09ef9c2..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Gstreamer validation tool" -DESCRIPTION = "A Tool to test GStreamer components" -HOMEPAGE = "https://gstreamer.freedesktop.org/documentation/gst-devtools/index.html" -SECTION = "multimedia" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://validate/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -#S = "${WORKDIR}/gst-devtools-${PV}" - -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}.tar.xz \ - file://0001-connect-has-a-different-signature-on-musl.patch \ - " - -SRC_URI[sha256sum] = "712212babd2238233d55beecfc0fe1ea8db18e8807ac6ab05a64505b2c7ab0df" - -DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" -RRECOMMENDS_${PN} = "git" - -FILES_${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*" - -inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection - -# TODO: put this in a gettext.bbclass patch -def gettext_oemeson(d): - if d.getVar('USE_NLS') == 'no': - return '-Dnls=disabled' - # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set - if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'): - return '-Dnls=disabled' - return '-Dnls=enabled' - -EXTRA_OEMESON += " \ - -Ddoc=disabled \ - -Ddebug_viewer=disabled \ - -Dtests=disabled \ - -Dvalidate=enabled \ - ${@gettext_oemeson(d)} \ -" - -GIR_MESON_ENABLE_FLAG = "enabled" -GIR_MESON_DISABLE_FLAG = "disabled" diff --git a/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.2.bb new file mode 100644 index 000000000..9fd9e0be9 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.2.bb @@ -0,0 +1,42 @@ +SUMMARY = "Gstreamer validation tool" +DESCRIPTION = "A Tool to test GStreamer components" +HOMEPAGE = "https://gstreamer.freedesktop.org/documentation/gst-devtools/index.html" +SECTION = "multimedia" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://validate/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" + +#S = "${WORKDIR}/gst-devtools-${PV}" + +SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}.tar.xz \ + file://0001-connect-has-a-different-signature-on-musl.patch \ + " + +SRC_URI[sha256sum] = "6ea73d718bf1f9692218540ff88479c51d67c0b477fa56d6812fc7b739d30a56" + +DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" +RRECOMMENDS_${PN} = "git" + +FILES_${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*" + +inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection + +# TODO: put this in a gettext.bbclass patch +def gettext_oemeson(d): + if d.getVar('USE_NLS') == 'no': + return '-Dnls=disabled' + # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set + if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'): + return '-Dnls=disabled' + return '-Dnls=enabled' + +EXTRA_OEMESON += " \ + -Ddoc=disabled \ + -Ddebug_viewer=disabled \ + -Dtests=disabled \ + -Dvalidate=enabled \ + ${@gettext_oemeson(d)} \ +" + +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" diff --git a/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.1.bb deleted file mode 100644 index 048b45a08..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "GStreamer examples (including gtk-play, gst-play)" -LICENSE = "LGPL-2.0+" -LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9" - -DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 libsoup-2.4 json-glib glib-2.0-native" - -SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=https;branch=1.18 \ - file://0001-Make-player-examples-installable.patch \ - file://gst-player.desktop \ - " - -SRCREV = "998ee69af18a5928759dbe17fffbceebbc8d72d0" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig features_check - -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.(\d*[02468])+(\.\d+)+)" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -do_install_append() { - install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop -} - -RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback" -RRECOMMENDS_${PN} = "gstreamer1.0-plugins-base-meta \ - gstreamer1.0-plugins-good-meta \ - gstreamer1.0-plugins-bad-meta \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" -RPROVIDES_${PN} += "gst-player gst-player-bin" diff --git a/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.2.bb new file mode 100644 index 000000000..54a4b5df1 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.2.bb @@ -0,0 +1,32 @@ +SUMMARY = "GStreamer examples (including gtk-play, gst-play)" +LICENSE = "LGPL-2.0+" +LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9" + +DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 libsoup-2.4 json-glib glib-2.0-native" + +SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=https;branch=1.18 \ + file://0001-Make-player-examples-installable.patch \ + file://gst-player.desktop \ + " + +SRCREV = "45086d8ef2d75244d9d5c8f69c0f0e1dfd4200b3" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig features_check + +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.(\d*[02468])+(\.\d+)+)" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +do_install_append() { + install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop +} + +RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback" +RRECOMMENDS_${PN} = "gstreamer1.0-plugins-base-meta \ + gstreamer1.0-plugins-good-meta \ + gstreamer1.0-plugins-bad-meta \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" +RPROVIDES_${PN} += "gst-player gst-player-bin" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.1.bb deleted file mode 100644 index 38bbffafa..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Libav-based GStreamer 1.x plugin" -HOMEPAGE = "http://gstreamer.freedesktop.org/" -SECTION = "multimedia" - -# ffmpeg has comercial license flags so add it as we need ffmpeg as a dependency -LICENSE_FLAGS = "commercial" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ - file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ - " - -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" -SRC_URI[sha256sum] = "39a717bc2613efbbba19df3cf5cacff0987471fc8281ba2c5dcdeaded79c2ed8" - -S = "${WORKDIR}/gst-libav-${PV}" - -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg" - -inherit meson pkgconfig upstream-version-is-even - -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.2.bb new file mode 100644 index 000000000..b638814aa --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.2.bb @@ -0,0 +1,22 @@ +SUMMARY = "Libav-based GStreamer 1.x plugin" +HOMEPAGE = "http://gstreamer.freedesktop.org/" +SECTION = "multimedia" + +# ffmpeg has comercial license flags so add it as we need ffmpeg as a dependency +LICENSE_FLAGS = "commercial" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ + file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ + " + +SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" +SRC_URI[sha256sum] = "36969ad44c5f0756a8a90215410710d6c39713d58f6cee13d663be9774557f49" + +S = "${WORKDIR}/gst-libav-${PV}" + +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg" + +inherit meson pkgconfig upstream-version-is-even + +FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.1.bb deleted file mode 100644 index 513d66f9f..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.1.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "OpenMAX IL plugins for GStreamer" -HOMEPAGE = "http://gstreamer.freedesktop.org/" -SECTION = "multimedia" - -LICENSE = "LGPLv2.1" -LICENSE_FLAGS = "commercial" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f" - -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" - -SRC_URI[sha256sum] = "42a8e0f9518b94655981ede441638f9f9395f4b1b9a4b329f068ee793975a965" - -S = "${WORKDIR}/gst-omx-${PV}" - -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad virtual/libomxil" - -inherit meson pkgconfig upstream-version-is-even - -GSTREAMER_1_0_OMX_TARGET ?= "bellagio" -GSTREAMER_1_0_OMX_CORE_NAME ?= "${libdir}/libomxil-bellagio.so.0" - -EXTRA_OEMESON += "-Dtarget=${GSTREAMER_1_0_OMX_TARGET}" - -python __anonymous () { - omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET") - if omx_target in ['generic', 'bellagio']: - # Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,# - # OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros); - # appending a directory path to gst-omx' internal OpenMAX IL headers fixes this - d.appendVar("CFLAGS", " -I${S}/omx/openmax") - elif omx_target == "rpi": - # Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific - d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH")) -} - -set_omx_core_name() { - sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}${sysconfdir}/xdg/gstomx.conf" -} -do_install[postfuncs] += " set_omx_core_name " - -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" - -VIRTUAL-RUNTIME_libomxil ?= "libomxil" -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_libomxil}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.2.bb new file mode 100644 index 000000000..686fcc265 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.2.bb @@ -0,0 +1,46 @@ +SUMMARY = "OpenMAX IL plugins for GStreamer" +HOMEPAGE = "http://gstreamer.freedesktop.org/" +SECTION = "multimedia" + +LICENSE = "LGPLv2.1" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f" + +SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" + +SRC_URI[sha256sum] = "4c05d64544eecf4aaf5b337789916c67ed720317dfb2c8c8c335720fcc5c7cf4" + +S = "${WORKDIR}/gst-omx-${PV}" + +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad virtual/libomxil" + +inherit meson pkgconfig upstream-version-is-even + +GSTREAMER_1_0_OMX_TARGET ?= "bellagio" +GSTREAMER_1_0_OMX_CORE_NAME ?= "${libdir}/libomxil-bellagio.so.0" + +EXTRA_OEMESON += "-Dtarget=${GSTREAMER_1_0_OMX_TARGET}" + +python __anonymous () { + omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET") + if omx_target in ['generic', 'bellagio']: + # Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,# + # OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros); + # appending a directory path to gst-omx' internal OpenMAX IL headers fixes this + d.appendVar("CFLAGS", " -I${S}/omx/openmax") + elif omx_target == "rpi": + # Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific + d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH")) +} + +set_omx_core_name() { + sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}${sysconfdir}/xdg/gstomx.conf" +} +do_install[postfuncs] += " set_omx_core_name " + +FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" + +VIRTUAL-RUNTIME_libomxil ?= "libomxil" +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_libomxil}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.1.bb deleted file mode 100644 index ebd8c5a27..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.1.bb +++ /dev/null @@ -1,153 +0,0 @@ -require gstreamer1.0-plugins-common.inc - -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ - file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ - file://0002-avoid-including-sys-poll.h-directly.patch \ - file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \ - file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ - " -SRC_URI[sha256sum] = "c195978c85d97406c05eb9d43ac54b9ab35eda6ffdae32b3ed597b8f1743c1b2" - -S = "${WORKDIR}/gst-plugins-bad-${PV}" - -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS += "gstreamer1.0-plugins-base" - -inherit gobject-introspection - -PACKAGECONFIG ??= " \ - ${GSTREAMER_ORC} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)} \ - bz2 closedcaption curl dash dtls hls rsvg sbc smoothstreaming sndfile \ - ttml uvch264 webp \ -" - -PACKAGECONFIG[assrender] = "-Dassrender=enabled,-Dassrender=disabled,libass" -PACKAGECONFIG[bluez] = "-Dbluez=enabled,-Dbluez=disabled,bluez5" -PACKAGECONFIG[bz2] = "-Dbz2=enabled,-Dbz2=disabled,bzip2" -PACKAGECONFIG[closedcaption] = "-Dclosedcaption=enabled,-Dclosedcaption=disabled,pango cairo" -PACKAGECONFIG[curl] = "-Dcurl=enabled,-Dcurl=disabled,curl" -PACKAGECONFIG[dash] = "-Ddash=enabled,-Ddash=disabled,libxml2" -PACKAGECONFIG[dc1394] = "-Ddc1394=enabled,-Ddc1394=disabled,libdc1394" -PACKAGECONFIG[directfb] = "-Ddirectfb=enabled,-Ddirectfb=disabled,directfb" -PACKAGECONFIG[dtls] = "-Ddtls=enabled,-Ddtls=disabled,openssl" -PACKAGECONFIG[faac] = "-Dfaac=enabled,-Dfaac=disabled,faac" -PACKAGECONFIG[faad] = "-Dfaad=enabled,-Dfaad=disabled,faad2" -PACKAGECONFIG[fluidsynth] = "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth" -PACKAGECONFIG[hls] = "-Dhls=enabled -Dhls-crypto=nettle,-Dhls=disabled,nettle" -# the gl packageconfig enables OpenGL elements that haven't been ported -# to -base yet. They depend on the gstgl library in -base, so we do -# not add GL dependencies here, since these are taken care of in -base. -PACKAGECONFIG[gl] = "-Dgl=enabled,-Dgl=disabled," -PACKAGECONFIG[kms] = "-Dkms=enabled,-Dkms=disabled,libdrm" -PACKAGECONFIG[libde265] = "-Dlibde265=enabled,-Dlibde265=disabled,libde265" -PACKAGECONFIG[libmms] = "-Dlibmms=enabled,-Dlibmms=disabled,libmms" -PACKAGECONFIG[libssh2] = "-Dcurl-ssh2=enabled,-Dcurl-ssh2=disabled,libssh2" -PACKAGECONFIG[lcms2] = "-Dcolormanagement=enabled,-Dcolormanagement=disabled,lcms" -PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug" -PACKAGECONFIG[msdk] = "-Dmsdk=enabled,-Dmsdk=disabled,intel-mediasdk" -PACKAGECONFIG[neon] = "-Dneon=enabled,-Dneon=disabled,neon" -PACKAGECONFIG[openal] = "-Dopenal=enabled,-Dopenal=disabled,openal-soft" -PACKAGECONFIG[opencv] = "-Dopencv=enabled,-Dopencv=disabled,opencv" -PACKAGECONFIG[openh264] = "-Dopenh264=enabled,-Dopenh264=disabled,openh264" -PACKAGECONFIG[openjpeg] = "-Dopenjpeg=enabled,-Dopenjpeg=disabled,openjpeg" -PACKAGECONFIG[openmpt] = "-Dopenmpt=enabled,-Dopenmpt=disabled,libopenmpt" -# the opus encoder/decoder elements are now in the -base package, -# but the opus parser remains in -bad -PACKAGECONFIG[opusparse] = "-Dopus=enabled,-Dopus=disabled,libopus" -PACKAGECONFIG[resindvd] = "-Dresindvd=enabled,-Dresindvd=disabled,libdvdread libdvdnav" -PACKAGECONFIG[rsvg] = "-Drsvg=enabled,-Drsvg=disabled,librsvg" -PACKAGECONFIG[rtmp] = "-Drtmp=enabled,-Drtmp=disabled,rtmpdump" -PACKAGECONFIG[sbc] = "-Dsbc=enabled,-Dsbc=disabled,sbc" -PACKAGECONFIG[sctp] = "-Dsctp=enabled,-Dsctp=disabled,usrsctp" -PACKAGECONFIG[smoothstreaming] = "-Dsmoothstreaming=enabled,-Dsmoothstreaming=disabled,libxml2" -PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" -PACKAGECONFIG[srt] = "-Dsrt=enabled,-Dsrt=disabled,srt" -PACKAGECONFIG[srtp] = "-Dsrtp=enabled,-Dsrtp=disabled,libsrtp" -PACKAGECONFIG[tinyalsa] = "-Dtinyalsa=enabled,-Dtinyalsa=disabled,tinyalsa" -PACKAGECONFIG[ttml] = "-Dttml=enabled,-Dttml=disabled,libxml2 pango cairo" -PACKAGECONFIG[uvch264] = "-Duvch264=enabled,-Duvch264=disabled,libusb1 libgudev" -PACKAGECONFIG[va] = "-Dva=enabled,-Dva=disabled,libva" -PACKAGECONFIG[voaacenc] = "-Dvoaacenc=enabled,-Dvoaacenc=disabled,vo-aacenc" -PACKAGECONFIG[voamrwbenc] = "-Dvoamrwbenc=enabled,-Dvoamrwbenc=disabled,vo-amrwbenc" -PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader shaderc-native" -PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland wayland-protocols libdrm" -PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp" -PACKAGECONFIG[webrtc] = "-Dwebrtc=enabled,-Dwebrtc=disabled,libnice" -PACKAGECONFIG[webrtcdsp] = "-Dwebrtcdsp=enabled,-Dwebrtcdsp=disabled,webrtc-audio-processing" -PACKAGECONFIG[zbar] = "-Dzbar=enabled,-Dzbar=disabled,zbar" -PACKAGECONFIG[v4l2codecs] = "-D-Dv4l2codecs=enabled,-Dv4l2codecs=disabled,libgudev" - -# these plugins currently have no corresponding library in OE-core or meta-openembedded: -# aom androidmedia applemedia bs2b chromaprint d3dvideosink -# directsound dts fdkaac gme gsm iq kate ladspa lv2 mpeg2enc -# mplex musepack nvdec nvenc ofa openexr openni2 opensles -# soundtouch spandsp teletext wasapi wildmidi winks -# winscreencap wpe x265 - -EXTRA_OEMESON += " \ - -Ddoc=disabled \ - -Ddecklink=enabled \ - -Ddvb=enabled \ - -Dfbdev=enabled \ - -Dipcpipeline=enabled \ - -Dnetsim=enabled \ - -Dshm=enabled \ - -Daom=disabled \ - -Dandroidmedia=disabled \ - -Dapplemedia=disabled \ - -Davtp=disabled \ - -Dbs2b=disabled \ - -Dchromaprint=disabled \ - -Dd3dvideosink=disabled \ - -Dd3d11=disabled \ - -Ddirectsound=disabled \ - -Ddts=disabled \ - -Dfdkaac=disabled \ - -Dflite=disabled \ - -Dgme=disabled \ - -Dgsm=disabled \ - -Diqa=disabled \ - -Dkate=disabled \ - -Dladspa=disabled \ - -Dlv2=disabled \ - -Dmagicleap=disabled \ - -Dmediafoundation=disabled \ - -Dmicrodns=disabled \ - -Dmpeg2enc=disabled \ - -Dmplex=disabled \ - -Dmusepack=disabled \ - -Dnvcodec=disabled \ - -Dofa=disabled \ - -Dopenexr=disabled \ - -Dopenni2=disabled \ - -Dopensles=disabled \ - -Dsoundtouch=disabled \ - -Dspandsp=disabled \ - -Dsvthevcenc=disabled \ - -Dteletext=disabled \ - -Dwasapi=disabled \ - -Dwasapi2=disabled \ - -Dwildmidi=disabled \ - -Dwinks=disabled \ - -Dwinscreencap=disabled \ - -Dwpe=disabled \ - -Dx265=disabled \ - -Dzxing=disabled \ -" - -export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}" - -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -FILES_${PN}-freeverb += "${datadir}/gstreamer-1.0/presets/GstFreeverb.prs" -FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*" -FILES_${PN}-transcode += "${datadir}/gstreamer-1.0/encoding-profiles" -FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs" - diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.2.bb new file mode 100644 index 000000000..d37a22325 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.2.bb @@ -0,0 +1,146 @@ +require gstreamer1.0-plugins-common.inc + +SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ + file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ + file://0002-avoid-including-sys-poll.h-directly.patch \ + file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \ + file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ + " +SRC_URI[sha256sum] = "8ad5822f1118fe46a19af54422b74e3a16d79a6800dcb173b49e199a496b341a" + +S = "${WORKDIR}/gst-plugins-bad-${PV}" + +LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS += "gstreamer1.0-plugins-base" + +inherit gobject-introspection + +PACKAGECONFIG ??= " \ + ${GSTREAMER_ORC} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)} \ + bz2 closedcaption curl dash dtls hls rsvg sbc smoothstreaming sndfile \ + ttml uvch264 webp \ +" + +PACKAGECONFIG[aom] = "-Daom=enabled,-Daom=disabled,aom" +PACKAGECONFIG[assrender] = "-Dassrender=enabled,-Dassrender=disabled,libass" +PACKAGECONFIG[bluez] = "-Dbluez=enabled,-Dbluez=disabled,bluez5" +PACKAGECONFIG[bz2] = "-Dbz2=enabled,-Dbz2=disabled,bzip2" +PACKAGECONFIG[closedcaption] = "-Dclosedcaption=enabled,-Dclosedcaption=disabled,pango cairo" +PACKAGECONFIG[curl] = "-Dcurl=enabled,-Dcurl=disabled,curl" +PACKAGECONFIG[dash] = "-Ddash=enabled,-Ddash=disabled,libxml2" +PACKAGECONFIG[dc1394] = "-Ddc1394=enabled,-Ddc1394=disabled,libdc1394" +PACKAGECONFIG[directfb] = "-Ddirectfb=enabled,-Ddirectfb=disabled,directfb" +PACKAGECONFIG[dtls] = "-Ddtls=enabled,-Ddtls=disabled,openssl" +PACKAGECONFIG[faac] = "-Dfaac=enabled,-Dfaac=disabled,faac" +PACKAGECONFIG[faad] = "-Dfaad=enabled,-Dfaad=disabled,faad2" +PACKAGECONFIG[fluidsynth] = "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth" +PACKAGECONFIG[hls] = "-Dhls=enabled -Dhls-crypto=nettle,-Dhls=disabled,nettle" +# the gl packageconfig enables OpenGL elements that haven't been ported +# to -base yet. They depend on the gstgl library in -base, so we do +# not add GL dependencies here, since these are taken care of in -base. +PACKAGECONFIG[gl] = "-Dgl=enabled,-Dgl=disabled," +PACKAGECONFIG[kms] = "-Dkms=enabled,-Dkms=disabled,libdrm" +PACKAGECONFIG[libde265] = "-Dlibde265=enabled,-Dlibde265=disabled,libde265" +PACKAGECONFIG[libmms] = "-Dlibmms=enabled,-Dlibmms=disabled,libmms" +PACKAGECONFIG[libssh2] = "-Dcurl-ssh2=enabled,-Dcurl-ssh2=disabled,libssh2" +PACKAGECONFIG[lcms2] = "-Dcolormanagement=enabled,-Dcolormanagement=disabled,lcms" +PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug" +PACKAGECONFIG[msdk] = "-Dmsdk=enabled,-Dmsdk=disabled,intel-mediasdk" +PACKAGECONFIG[neon] = "-Dneon=enabled,-Dneon=disabled,neon" +PACKAGECONFIG[openal] = "-Dopenal=enabled,-Dopenal=disabled,openal-soft" +PACKAGECONFIG[opencv] = "-Dopencv=enabled,-Dopencv=disabled,opencv" +PACKAGECONFIG[openh264] = "-Dopenh264=enabled,-Dopenh264=disabled,openh264" +PACKAGECONFIG[openjpeg] = "-Dopenjpeg=enabled,-Dopenjpeg=disabled,openjpeg" +PACKAGECONFIG[openmpt] = "-Dopenmpt=enabled,-Dopenmpt=disabled,libopenmpt" +# the opus encoder/decoder elements are now in the -base package, +# but the opus parser remains in -bad +PACKAGECONFIG[opusparse] = "-Dopus=enabled,-Dopus=disabled,libopus" +PACKAGECONFIG[resindvd] = "-Dresindvd=enabled,-Dresindvd=disabled,libdvdread libdvdnav" +PACKAGECONFIG[rsvg] = "-Drsvg=enabled,-Drsvg=disabled,librsvg" +PACKAGECONFIG[rtmp] = "-Drtmp=enabled,-Drtmp=disabled,rtmpdump" +PACKAGECONFIG[sbc] = "-Dsbc=enabled,-Dsbc=disabled,sbc" +PACKAGECONFIG[sctp] = "-Dsctp=enabled,-Dsctp=disabled" +PACKAGECONFIG[smoothstreaming] = "-Dsmoothstreaming=enabled,-Dsmoothstreaming=disabled,libxml2" +PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" +PACKAGECONFIG[srt] = "-Dsrt=enabled,-Dsrt=disabled,srt" +PACKAGECONFIG[srtp] = "-Dsrtp=enabled,-Dsrtp=disabled,libsrtp" +PACKAGECONFIG[tinyalsa] = "-Dtinyalsa=enabled,-Dtinyalsa=disabled,tinyalsa" +PACKAGECONFIG[ttml] = "-Dttml=enabled,-Dttml=disabled,libxml2 pango cairo" +PACKAGECONFIG[uvch264] = "-Duvch264=enabled,-Duvch264=disabled,libusb1 libgudev" +PACKAGECONFIG[v4l2codecs] = "-Dv4l2codecs=enabled,-Dv4l2codecs=disabled,libgudev" +PACKAGECONFIG[va] = "-Dva=enabled,-Dva=disabled,libva" +PACKAGECONFIG[voaacenc] = "-Dvoaacenc=enabled,-Dvoaacenc=disabled,vo-aacenc" +PACKAGECONFIG[voamrwbenc] = "-Dvoamrwbenc=enabled,-Dvoamrwbenc=disabled,vo-amrwbenc" +PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader shaderc-native" +PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland wayland-protocols libdrm" +PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp" +PACKAGECONFIG[webrtc] = "-Dwebrtc=enabled,-Dwebrtc=disabled,libnice" +PACKAGECONFIG[webrtcdsp] = "-Dwebrtcdsp=enabled,-Dwebrtcdsp=disabled,webrtc-audio-processing" +PACKAGECONFIG[zbar] = "-Dzbar=enabled,-Dzbar=disabled,zbar" +PACKAGECONFIG[x265] = "-Dx265=enabled,-Dx265=disabled,x265" + +EXTRA_OEMESON += " \ + -Ddoc=disabled \ + -Ddecklink=enabled \ + -Ddvb=enabled \ + -Dfbdev=enabled \ + -Dipcpipeline=enabled \ + -Dshm=enabled \ + -Dtranscode=enabled \ + -Dandroidmedia=disabled \ + -Dapplemedia=disabled \ + -Davtp=disabled \ + -Dbs2b=disabled \ + -Dchromaprint=disabled \ + -Dd3dvideosink=disabled \ + -Dd3d11=disabled \ + -Ddirectsound=disabled \ + -Ddts=disabled \ + -Dfdkaac=disabled \ + -Dflite=disabled \ + -Dgme=disabled \ + -Dgsm=disabled \ + -Diqa=disabled \ + -Dkate=disabled \ + -Dladspa=disabled \ + -Dlv2=disabled \ + -Dmagicleap=disabled \ + -Dmediafoundation=disabled \ + -Dmicrodns=disabled \ + -Dmpeg2enc=disabled \ + -Dmplex=disabled \ + -Dmusepack=disabled \ + -Dnvcodec=disabled \ + -Dofa=disabled \ + -Dopenexr=disabled \ + -Dopenni2=disabled \ + -Dopensles=disabled \ + -Dsoundtouch=disabled \ + -Dspandsp=disabled \ + -Dsvthevcenc=disabled \ + -Dteletext=disabled \ + -Dwasapi=disabled \ + -Dwasapi2=disabled \ + -Dwildmidi=disabled \ + -Dwinks=disabled \ + -Dwinscreencap=disabled \ + -Dwpe=disabled \ + -Dzxing=disabled \ +" + +export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}" + +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + +FILES_${PN}-freeverb += "${datadir}/gstreamer-1.0/presets/GstFreeverb.prs" +FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*" +FILES_${PN}-transcode += "${datadir}/gstreamer-1.0/encoding-profiles" +FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs" + diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.1.bb deleted file mode 100644 index 1b2bd4fe1..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.1.bb +++ /dev/null @@ -1,94 +0,0 @@ -require gstreamer1.0-plugins-common.inc - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" - -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ - file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \ - file://0003-viv-fb-Make-sure-config.h-is-included.patch \ - file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ - file://0004-glimagesink-Downrank-to-marginal.patch \ - " -SRC_URI[sha256sum] = "1ba654d7de30f7284b4c7071b32f881b609733ce02ab6d9d9ea29386a036c641" - -S = "${WORKDIR}/gst-plugins-base-${PV}" - -DEPENDS += "iso-codes util-linux zlib" - -inherit gobject-introspection - -PACKAGES_DYNAMIC =+ "^libgst.*" - -# opengl packageconfig factored out to make it easy for distros -# and BSP layers to choose OpenGL APIs/platforms/window systems -PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" - -PACKAGECONFIG ??= " \ - ${GSTREAMER_ORC} \ - ${PACKAGECONFIG_GL} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ - jpeg ogg pango png theora vorbis \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ -" - -OPENGL_APIS = 'opengl gles2' -OPENGL_PLATFORMS = 'egl' - -X11DEPENDS = "virtual/libx11 libsm libxrender libxv" -X11ENABLEOPTS = "-Dx11=enabled -Dxvideo=enabled -Dxshm=enabled" -X11DISABLEOPTS = "-Dx11=disabled -Dxvideo=disabled -Dxshm=disabled" - -PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" -PACKAGECONFIG[cdparanoia] = "-Dcdparanoia=enabled,-Dcdparanoia=disabled,cdparanoia" -PACKAGECONFIG[jpeg] = "-Dgl-jpeg=enabled,-Dgl-jpeg=disabled,jpeg" -PACKAGECONFIG[ogg] = "-Dogg=enabled,-Dogg=disabled,libogg" -PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus" -PACKAGECONFIG[pango] = "-Dpango=enabled,-Dpango=disabled,pango" -PACKAGECONFIG[png] = "-Dgl-png=enabled,-Dgl-png=disabled,libpng" -PACKAGECONFIG[theora] = "-Dtheora=enabled,-Dtheora=disabled,libtheora" -PACKAGECONFIG[tremor] = "-Dtremor=enabled,-Dtremor=disabled,tremor" -PACKAGECONFIG[visual] = "-Dlibvisual=enabled,-Dlibvisual=disabled,libvisual" -PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis" -PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" - -# OpenGL API packageconfigs -PACKAGECONFIG[opengl] = ",,virtual/libgl libglu" -PACKAGECONFIG[gles2] = ",,virtual/libgles2" - -# OpenGL platform packageconfigs -PACKAGECONFIG[egl] = ",,virtual/egl" - -# OpenGL window systems (except for X11) -PACKAGECONFIG[gbm] = ",,virtual/libgbm libgudev libdrm" -PACKAGECONFIG[wayland] = ",,wayland-native wayland wayland-protocols libdrm" -PACKAGECONFIG[dispmanx] = ",,virtual/libomxil" - -OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', ' x11', '', d)}" -OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'gbm', ' gbm', '', d)}" -OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', ' wayland', '', d)}" -OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'dispmanx', ' dispmanx', '', d)}" -OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' egl', '', d)}" - -EXTRA_OEMESON += " \ - -Ddoc=disabled \ - -Dgl-graphene=disabled \ - ${@get_opengl_cmdline_list('gl_api', d.getVar('OPENGL_APIS'), d)} \ - ${@get_opengl_cmdline_list('gl_platform', d.getVar('OPENGL_PLATFORMS'), d)} \ - ${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \ -" - -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h" -FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" - -def get_opengl_cmdline_list(switch_name, options, d): - selected_options = [] - if bb.utils.contains('DISTRO_FEATURES', 'opengl', True, False, d): - for option in options.split(): - if bb.utils.contains('PACKAGECONFIG', option, True, False, d): - selected_options += [option] - if selected_options: - return '-D' + switch_name + '=' + ','.join(selected_options) - else: - return '' - -CVE_PRODUCT += "gst-plugins-base" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.2.bb new file mode 100644 index 000000000..531d577b0 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.2.bb @@ -0,0 +1,94 @@ +require gstreamer1.0-plugins-common.inc + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" + +SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ + file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \ + file://0003-viv-fb-Make-sure-config.h-is-included.patch \ + file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ + file://0004-glimagesink-Downrank-to-marginal.patch \ + " +SRC_URI[sha256sum] = "dd04fb1f7826e2f6d9b4d66fc22f19cc6a47c301e13041f0ee3d7f65c89b05ac" + +S = "${WORKDIR}/gst-plugins-base-${PV}" + +DEPENDS += "iso-codes util-linux zlib" + +inherit gobject-introspection + +PACKAGES_DYNAMIC =+ "^libgst.*" + +# opengl packageconfig factored out to make it easy for distros +# and BSP layers to choose OpenGL APIs/platforms/window systems +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" + +PACKAGECONFIG ??= " \ + ${GSTREAMER_ORC} \ + ${PACKAGECONFIG_GL} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ + jpeg ogg pango png theora vorbis \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ +" + +OPENGL_APIS = 'opengl gles2' +OPENGL_PLATFORMS = 'egl' + +X11DEPENDS = "virtual/libx11 libsm libxrender libxv" +X11ENABLEOPTS = "-Dx11=enabled -Dxvideo=enabled -Dxshm=enabled" +X11DISABLEOPTS = "-Dx11=disabled -Dxvideo=disabled -Dxshm=disabled" + +PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" +PACKAGECONFIG[cdparanoia] = "-Dcdparanoia=enabled,-Dcdparanoia=disabled,cdparanoia" +PACKAGECONFIG[jpeg] = "-Dgl-jpeg=enabled,-Dgl-jpeg=disabled,jpeg" +PACKAGECONFIG[ogg] = "-Dogg=enabled,-Dogg=disabled,libogg" +PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus" +PACKAGECONFIG[pango] = "-Dpango=enabled,-Dpango=disabled,pango" +PACKAGECONFIG[png] = "-Dgl-png=enabled,-Dgl-png=disabled,libpng" +PACKAGECONFIG[theora] = "-Dtheora=enabled,-Dtheora=disabled,libtheora" +PACKAGECONFIG[tremor] = "-Dtremor=enabled,-Dtremor=disabled,tremor" +PACKAGECONFIG[visual] = "-Dlibvisual=enabled,-Dlibvisual=disabled,libvisual" +PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis" +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" + +# OpenGL API packageconfigs +PACKAGECONFIG[opengl] = ",,virtual/libgl libglu" +PACKAGECONFIG[gles2] = ",,virtual/libgles2" + +# OpenGL platform packageconfigs +PACKAGECONFIG[egl] = ",,virtual/egl" + +# OpenGL window systems (except for X11) +PACKAGECONFIG[gbm] = ",,virtual/libgbm libgudev libdrm" +PACKAGECONFIG[wayland] = ",,wayland-native wayland wayland-protocols libdrm" +PACKAGECONFIG[dispmanx] = ",,virtual/libomxil" + +OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', ' x11', '', d)}" +OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'gbm', ' gbm', '', d)}" +OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', ' wayland', '', d)}" +OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'dispmanx', ' dispmanx', '', d)}" +OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' egl', '', d)}" + +EXTRA_OEMESON += " \ + -Ddoc=disabled \ + -Dgl-graphene=disabled \ + ${@get_opengl_cmdline_list('gl_api', d.getVar('OPENGL_APIS'), d)} \ + ${@get_opengl_cmdline_list('gl_platform', d.getVar('OPENGL_PLATFORMS'), d)} \ + ${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \ +" + +FILES_${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h" +FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" + +def get_opengl_cmdline_list(switch_name, options, d): + selected_options = [] + if bb.utils.contains('DISTRO_FEATURES', 'opengl', True, False, d): + for option in options.split(): + if bb.utils.contains('PACKAGECONFIG', option, True, False, d): + selected_options += [option] + if selected_options: + return '-D' + switch_name + '=' + ','.join(selected_options) + else: + return '' + +CVE_PRODUCT += "gst-plugins-base" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch deleted file mode 100644 index 685ee08e5..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3ec4fe5507a39383b161f1ab7687acb4a57c32f8 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma -Date: Sun, 15 Nov 2020 11:30:07 +0000 -Subject: [PATCH] rpicamsrc: add vchostif library as it is required to build - successful - -fix: undefined reference to `vc_gencmd' -/usr/src/debug/gstreamer1.0-plugins-good/1.18.1-r0/build/../gst-plugins-good-1.18.1/sys/rpicamsrc/RaspiCamControl.c:1440: undefined reference to `vc_gencmd' - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/818] - -Signed-off-by: Jose Quaresma ---- - sys/rpicamsrc/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sys/rpicamsrc/meson.build b/sys/rpicamsrc/meson.build -index dc18a8345..48b2ceb66 100644 ---- a/sys/rpicamsrc/meson.build -+++ b/sys/rpicamsrc/meson.build -@@ -34,7 +34,7 @@ if not cc.has_header('bcm_host.h', args: rpi_inc_args) - endif - - mmal_deps = [] --foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'bcm_host'] -+foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'vchostif', 'bcm_host'] - l = cc.find_library(rpi_lib, dirs: rpi_lib_path, required: false) - if not l.found() - if get_option('rpicamsrc').enabled() --- -2.29.2 - diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb deleted file mode 100644 index 77e1333dd..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb +++ /dev/null @@ -1,73 +0,0 @@ -require gstreamer1.0-plugins-common.inc - -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ - file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ - file://0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch \ - " - -SRC_URI[sha256sum] = "e210e91a5590ecb6accc9d06c949a58ca6897d8edb3b3d55828e424c624f626c" - -S = "${WORKDIR}/gst-plugins-good-${PV}" - -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" - -DEPENDS += "gstreamer1.0-plugins-base libcap zlib" -RPROVIDES_${PN}-pulseaudio += "${PN}-pulse" -RPROVIDES_${PN}-soup += "${PN}-souphttpsrc" - -PACKAGECONFIG ??= " \ - ${GSTREAMER_ORC} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \ - ${@bb.utils.contains('TUNE_FEATURES', 'm64', 'asm', '', d)} \ - bz2 cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup speex taglib v4l2 \ -" - -X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" -X11ENABLEOPTS = "-Dximagesrc=enabled -Dximagesrc-xshm=enabled -Dximagesrc-xfixes=enabled -Dximagesrc-xdamage=enabled" -X11DISABLEOPTS = "-Dximagesrc=disabled -Dximagesrc-xshm=disabled -Dximagesrc-xfixes=disabled -Dximagesrc-xdamage=disabled" - -QT5WAYLANDDEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" - -PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm-native" -PACKAGECONFIG[bz2] = "-Dbz2=enabled,-Dbz2=disabled,bzip2" -PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo" -PACKAGECONFIG[dv1394] = "-Ddv1394=enabled,-Ddv1394=disabled,libiec61883 libavc1394 libraw1394" -PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" -PACKAGECONFIG[gdk-pixbuf] = "-Dgdk-pixbuf=enabled,-Dgdk-pixbuf=disabled,gdk-pixbuf" -PACKAGECONFIG[gtk] = "-Dgtk3=enabled,-Dgtk3=disabled,gtk+3" -PACKAGECONFIG[gudev] = "-Dv4l2-gudev=enabled,-Dv4l2-gudev=disabled,libgudev" -PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" -PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" -PACKAGECONFIG[lame] = "-Dlame=enabled,-Dlame=disabled,lame" -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 ${QT5WAYLANDDEPENDS}" -PACKAGECONFIG[soup] = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4" -PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" -PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland" -PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib" -PACKAGECONFIG[v4l2] = "-Dv4l2=enabled -Dv4l2-probe=true,-Dv4l2=disabled -Dv4l2-probe=false" -PACKAGECONFIG[vpx] = "-Dvpx=enabled,-Dvpx=disabled,libvpx" -PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" -PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" - -EXTRA_OEMESON += " \ - -Ddoc=disabled \ - -Daalib=disabled \ - -Ddirectsound=disabled \ - -Ddv=disabled \ - -Dlibcaca=disabled \ - -Doss=enabled \ - -Doss4=disabled \ - -Dosxaudio=disabled \ - -Dosxvideo=disabled \ - -Dshout2=disabled \ - -Dtwolame=disabled \ - -Dwaveform=disabled \ -" - -FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.2.bb new file mode 100644 index 000000000..2e076bf88 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.2.bb @@ -0,0 +1,72 @@ +require gstreamer1.0-plugins-common.inc + +SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ + file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ + " + +SRC_URI[sha256sum] = "f71752dde434d9ec55fa5e8d2e2a3be3fc6eb5b34f397b065f84aead25b449a4" + +S = "${WORKDIR}/gst-plugins-good-${PV}" + +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" + +DEPENDS += "gstreamer1.0-plugins-base libcap zlib" +RPROVIDES_${PN}-pulseaudio += "${PN}-pulse" +RPROVIDES_${PN}-soup += "${PN}-souphttpsrc" + +PACKAGECONFIG ??= " \ + ${GSTREAMER_ORC} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \ + ${@bb.utils.contains('TUNE_FEATURES', 'm64', 'asm', '', d)} \ + bz2 cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup speex taglib v4l2 \ +" + +X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" +X11ENABLEOPTS = "-Dximagesrc=enabled -Dximagesrc-xshm=enabled -Dximagesrc-xfixes=enabled -Dximagesrc-xdamage=enabled" +X11DISABLEOPTS = "-Dximagesrc=disabled -Dximagesrc-xshm=disabled -Dximagesrc-xfixes=disabled -Dximagesrc-xdamage=disabled" + +QT5WAYLANDDEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" + +PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm-native" +PACKAGECONFIG[bz2] = "-Dbz2=enabled,-Dbz2=disabled,bzip2" +PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo" +PACKAGECONFIG[dv1394] = "-Ddv1394=enabled,-Ddv1394=disabled,libiec61883 libavc1394 libraw1394" +PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" +PACKAGECONFIG[gdk-pixbuf] = "-Dgdk-pixbuf=enabled,-Dgdk-pixbuf=disabled,gdk-pixbuf" +PACKAGECONFIG[gtk] = "-Dgtk3=enabled,-Dgtk3=disabled,gtk+3" +PACKAGECONFIG[gudev] = "-Dv4l2-gudev=enabled,-Dv4l2-gudev=disabled,libgudev" +PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" +PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" +PACKAGECONFIG[lame] = "-Dlame=enabled,-Dlame=disabled,lame" +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 ${QT5WAYLANDDEPENDS}" +PACKAGECONFIG[soup] = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4" +PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" +PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland" +PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib" +PACKAGECONFIG[v4l2] = "-Dv4l2=enabled -Dv4l2-probe=true,-Dv4l2=disabled -Dv4l2-probe=false" +PACKAGECONFIG[vpx] = "-Dvpx=enabled,-Dvpx=disabled,libvpx" +PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" + +EXTRA_OEMESON += " \ + -Ddoc=disabled \ + -Daalib=disabled \ + -Ddirectsound=disabled \ + -Ddv=disabled \ + -Dlibcaca=disabled \ + -Doss=enabled \ + -Doss4=disabled \ + -Dosxaudio=disabled \ + -Dosxvideo=disabled \ + -Dshout2=disabled \ + -Dtwolame=disabled \ + -Dwaveform=disabled \ +" + +FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.1.bb deleted file mode 100644 index 614ef8d74..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -require gstreamer1.0-plugins-common.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" - -LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+" -LICENSE_FLAGS = "commercial" - -SRC_URI = " \ - https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ - " -SRC_URI[sha256sum] = "18cd6cb829eb9611ca63cbcbf46aca0f0de1dd28b2df18caa2834326a75ff725" - -S = "${WORKDIR}/gst-plugins-ugly-${PV}" - -DEPENDS += "gstreamer1.0-plugins-base" - -GST_PLUGIN_SET_HAS_EXAMPLES = "0" - -PACKAGECONFIG ??= " \ - ${GSTREAMER_ORC} \ - a52dec mpeg2dec \ -" - -PACKAGECONFIG[a52dec] = "-Da52dec=enabled,-Da52dec=disabled,liba52" -PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr" -PACKAGECONFIG[amrwb] = "-Damrwbdec=enabled,-Damrwbdec=disabled,opencore-amr" -PACKAGECONFIG[cdio] = "-Dcdio=enabled,-Dcdio=disabled,libcdio" -PACKAGECONFIG[dvdread] = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread" -PACKAGECONFIG[mpeg2dec] = "-Dmpeg2dec=enabled,-Dmpeg2dec=disabled,mpeg2dec" -PACKAGECONFIG[x264] = "-Dx264=enabled,-Dx264=disabled,x264" - -EXTRA_OEMESON += " \ - -Ddoc=disabled \ - -Dsidplay=disabled \ -" - -FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" -FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.2.bb new file mode 100644 index 000000000..e482aa10b --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.2.bb @@ -0,0 +1,39 @@ +require gstreamer1.0-plugins-common.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" + +LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+" +LICENSE_FLAGS = "commercial" + +SRC_URI = " \ + https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ + " +SRC_URI[sha256sum] = "a337a022ed472209b38cab5918dc2f4e7a6adc1f4afacd226a6345e5cb668bdb" + +S = "${WORKDIR}/gst-plugins-ugly-${PV}" + +DEPENDS += "gstreamer1.0-plugins-base" + +GST_PLUGIN_SET_HAS_EXAMPLES = "0" + +PACKAGECONFIG ??= " \ + ${GSTREAMER_ORC} \ + a52dec mpeg2dec \ +" + +PACKAGECONFIG[a52dec] = "-Da52dec=enabled,-Da52dec=disabled,liba52" +PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr" +PACKAGECONFIG[amrwb] = "-Damrwbdec=enabled,-Damrwbdec=disabled,opencore-amr" +PACKAGECONFIG[cdio] = "-Dcdio=enabled,-Dcdio=disabled,libcdio" +PACKAGECONFIG[dvdread] = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread" +PACKAGECONFIG[mpeg2dec] = "-Dmpeg2dec=enabled,-Dmpeg2dec=disabled,mpeg2dec" +PACKAGECONFIG[x264] = "-Dx264=enabled,-Dx264=disabled,x264" + +EXTRA_OEMESON += " \ + -Ddoc=disabled \ + -Dsidplay=disabled \ +" + +FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" +FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.1.bb deleted file mode 100644 index c0c5d271d..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Python bindings for GStreamer 1.0" -HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-python/" -SECTION = "multimedia" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" - -SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "42b289422f7ab32757670848cf2245c5a8a8b08a665a9cab65ded8d69364f6f6" - -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" -RDEPENDS_${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" - -PNREAL = "gst-python" - -S = "${WORKDIR}/${PNREAL}-${PV}" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -inherit meson pkgconfig distutils3-base upstream-version-is-even gobject-introspection features_check diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.2.bb new file mode 100644 index 000000000..5711744b4 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.2.bb @@ -0,0 +1,22 @@ +SUMMARY = "Python bindings for GStreamer 1.0" +HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-python/" +SECTION = "multimedia" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" + +SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" +SRC_URI[sha256sum] = "e19d0f760b353e88161b3712193cffbd79bf1314418da792b5fec4d8ecef389c" + +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" +RDEPENDS_${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" + +PNREAL = "gst-python" + +S = "${WORKDIR}/${PNREAL}-${PV}" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +inherit meson pkgconfig distutils3-base upstream-version-is-even gobject-introspection features_check diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.1.bb deleted file mode 100644 index 30534c978..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "A library on top of GStreamer for building an RTSP server" -HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-rtsp-server/" -SECTION = "multimedia" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" - -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base" - -PNREAL = "gst-rtsp-server" - -SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" - -SRC_URI[sha256sum] = "10a82865c3d199e66731017ca4b120bad071df9889e60cfe4dd6c49d953ef754" - -S = "${WORKDIR}/${PNREAL}-${PV}" - -inherit meson pkgconfig upstream-version-is-even gobject-introspection - -EXTRA_OEMESON += " \ - -Ddoc=disabled \ - -Dexamples=disabled \ - -Dtests=disabled \ -" - -GIR_MESON_ENABLE_FLAG = "enabled" -GIR_MESON_DISABLE_FLAG = "disabled" - -# Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well -require gstreamer1.0-plugins-packaging.inc - -CVE_PRODUCT += "gst-rtsp-server" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.2.bb new file mode 100644 index 000000000..b680aa38d --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.2.bb @@ -0,0 +1,31 @@ +SUMMARY = "A library on top of GStreamer for building an RTSP server" +HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-rtsp-server/" +SECTION = "multimedia" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" + +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base" + +PNREAL = "gst-rtsp-server" + +SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" + +SRC_URI[sha256sum] = "973922aba65a1672a131527dee965fb09bab4bb996c351f0ee7f42f0d5b954e2" + +S = "${WORKDIR}/${PNREAL}-${PV}" + +inherit meson pkgconfig upstream-version-is-even gobject-introspection + +EXTRA_OEMESON += " \ + -Ddoc=disabled \ + -Dexamples=disabled \ + -Dtests=disabled \ +" + +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" + +# Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well +require gstreamer1.0-plugins-packaging.inc + +CVE_PRODUCT += "gst-rtsp-server" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.1.bb deleted file mode 100644 index acf5598a6..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.1.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "VA-API support to GStreamer" -DESCRIPTION = "gstreamer-vaapi consists of a collection of VA-API \ -based plugins for GStreamer and helper libraries: `vaapidecode', \ -`vaapiconvert', and `vaapisink'." - -REALPN = "gstreamer-vaapi" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" - -SRC_URI[sha256sum] = "400d3c42810b50b4566df03f37319a6bdd758f969560c40147e7d9a3b0e8a6ea" - -S = "${WORKDIR}/${REALPN}-${PV}" -DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" - -inherit meson pkgconfig features_check upstream-version-is-even - -REQUIRED_DISTRO_FEATURES ?= "opengl" - -EXTRA_OEMESON += " \ - -Ddoc=disabled \ - -Dexamples=disabled \ - -Dtests=enabled \ -" - -PACKAGES =+ "${PN}-tests" - -# OpenGL packageconfig factored out to make it easy for distros -# and BSP layers to pick either glx, egl, or no GL. By default, -# try detecting X11 first, and if found (with OpenGL), use GLX, -# otherwise try to check if EGL can be used. -PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', \ - bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl', \ - '', d), d)}" - -PACKAGECONFIG ??= "drm encoders \ - ${PACKAGECONFIG_GL} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" - -PACKAGECONFIG[drm] = "-Dwith_drm=yes,-Dwith_drm=no,udev libdrm" -PACKAGECONFIG[egl] = "-Dwith_egl=yes,-Dwith_egl=no,virtual/egl" -PACKAGECONFIG[encoders] = "-Dwith_encoders=yes,-Dwith_encoders=no" -PACKAGECONFIG[glx] = "-Dwith_glx=yes,-Dwith_glx=no,virtual/libgl" -PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland wayland-protocols" -PACKAGECONFIG[x11] = "-Dwith_x11=yes,-Dwith_x11=no,virtual/libx11 libxrandr libxrender" - -FILES_${PN} += "${libdir}/gstreamer-*/*.so" -FILES_${PN}-dbg += "${libdir}/gstreamer-*/.debug" -FILES_${PN}-dev += "${libdir}/gstreamer-*/*.a" -FILES_${PN}-tests = "${bindir}/*" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.2.bb new file mode 100644 index 000000000..f237191d5 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.2.bb @@ -0,0 +1,52 @@ +SUMMARY = "VA-API support to GStreamer" +DESCRIPTION = "gstreamer-vaapi consists of a collection of VA-API \ +based plugins for GStreamer and helper libraries: `vaapidecode', \ +`vaapiconvert', and `vaapisink'." + +REALPN = "gstreamer-vaapi" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" + +SRC_URI[sha256sum] = "8c7b2c74fda095d83dea67accde6a68ba9f608d97ed969fdcf278930f9b1c7c0" + +S = "${WORKDIR}/${REALPN}-${PV}" +DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" + +inherit meson pkgconfig features_check upstream-version-is-even + +REQUIRED_DISTRO_FEATURES ?= "opengl" + +EXTRA_OEMESON += " \ + -Ddoc=disabled \ + -Dexamples=disabled \ + -Dtests=enabled \ +" + +PACKAGES =+ "${PN}-tests" + +# OpenGL packageconfig factored out to make it easy for distros +# and BSP layers to pick either glx, egl, or no GL. By default, +# try detecting X11 first, and if found (with OpenGL), use GLX, +# otherwise try to check if EGL can be used. +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', \ + bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl', \ + '', d), d)}" + +PACKAGECONFIG ??= "drm encoders \ + ${PACKAGECONFIG_GL} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" + +PACKAGECONFIG[drm] = "-Dwith_drm=yes,-Dwith_drm=no,udev libdrm" +PACKAGECONFIG[egl] = "-Dwith_egl=yes,-Dwith_egl=no,virtual/egl" +PACKAGECONFIG[encoders] = "-Dwith_encoders=yes,-Dwith_encoders=no" +PACKAGECONFIG[glx] = "-Dwith_glx=yes,-Dwith_glx=no,virtual/libgl" +PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland wayland-protocols" +PACKAGECONFIG[x11] = "-Dwith_x11=yes,-Dwith_x11=no,virtual/libx11 libxrandr libxrender" + +FILES_${PN} += "${libdir}/gstreamer-*/*.so" +FILES_${PN}-dbg += "${libdir}/gstreamer-*/.debug" +FILES_${PN}-dev += "${libdir}/gstreamer-*/*.a" +FILES_${PN}-tests = "${bindir}/*" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch index 17f8a0beb..fe58e718a 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch @@ -1,27 +1,41 @@ -From f700975f514758a4a7582c2c972fa54ecfca3302 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 25 Jan 2018 17:55:02 +0200 -Subject: [PATCH 1/4] gst/gstpluginloader.c: when env var is set do not fall - through to system plugin scanner +From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17 00:00:00 2001 +From: Jose Quaresma +Date: Sat, 10 Oct 2020 19:09:03 +0000 +Subject: [PATCH 1/3] gstpluginloader: when env var is set do not fall through + to system plugin scanner If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that. Falling through to the one installed on the system is problamatic in cross-compilation environemnts, regardless of whether one pointed to by the env var succeeded or failed. -written by: Alexander Kanavin +taken from: +http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669] Signed-off-by: Jose Quaresma --- - gst/gstpluginloader.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) + gst/gstpluginloader.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c -index d1e404d..2e00c3c 100644 +index d1e404d98..c626bf263 100644 --- a/gst/gstpluginloader.c +++ b/gst/gstpluginloader.c -@@ -475,9 +475,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) +@@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) + if (loader->child_running) + return TRUE; + +- /* Find the gst-plugin-scanner: first try the env-var if it is set, +- * otherwise use the installed version */ ++ /* Find the gst-plugin-scanner */ + env = g_getenv ("GST_PLUGIN_SCANNER_1_0"); + if (env == NULL) + env = g_getenv ("GST_PLUGIN_SCANNER"); + + if (env != NULL && *env != '\0') { ++ /* use the env-var if it is set */ + GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env); helper_bin = g_strdup (env); res = gst_plugin_loader_try_helper (loader, helper_bin); g_free (helper_bin); @@ -29,9 +43,24 @@ index d1e404d..2e00c3c 100644 - - if (!res) { + } else { ++ /* use the installed version */ GST_LOG ("Trying installed plugin scanner"); #ifdef G_OS_WIN32 +@@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) + #endif + res = gst_plugin_loader_try_helper (loader, helper_bin); + g_free (helper_bin); ++ } + +- if (!res) { +- GST_INFO ("No gst-plugin-scanner available, or not working"); +- } ++ if (!res) { ++ GST_INFO ("No gst-plugin-scanner available, or not working"); + } + + return loader->child_running; -- -2.28.0 +2.29.2 diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch deleted file mode 100644 index a2d215d72..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4449246a8d788e71dfe4679fba95955cec5894c1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 3 Nov 2020 22:58:26 -0800 -Subject: [PATCH] gst_private.h: increse padding in struct _GstClockEntryImpl - -When compiling for 32bit architectures with 64bit time_t e.g. riscv32, -the static assert that the GstClockEntryImpl smaller or -equal to the struct _GstClockEntryImpl triggered. -(they were 12bytes off). - -To fix this, the padding is increased by 8 bytes (on 32bit). - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/694] -Signed-off-by: Khem Raj ---- - gst/gst_private.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/gst_private.h b/gst/gst_private.h -index a8897e1..8252ede 100644 ---- a/gst/gst_private.h -+++ b/gst/gst_private.h -@@ -522,7 +522,7 @@ struct _GstClockEntryImpl - GstClockEntry entry; - GWeakRef clock; - GDestroyNotify destroy_entry; -- gpointer padding[19]; /* padding for allowing e.g. systemclock -+ gpointer padding[21]; /* padding for allowing e.g. systemclock - * to add data in lieu of overridable - * virtual functions on the clock */ - }; --- -2.29.2 - diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch index c8bd58d47..96abef17b 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch @@ -1,7 +1,7 @@ -From 355dd938bfb2cd36d6c3c4ed59ba1dcafdc78d95 Mon Sep 17 00:00:00 2001 +From 598d108e2c438d8f2ecd3bf948fa3ebbd3681490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 14 Aug 2020 16:38:26 +0100 -Subject: [PATCH 2/4] Remove unused valgrind detection +Subject: [PATCH 2/3] Remove unused valgrind detection Having this just to log a debug message in case we're running inside valgrind doesn't seem very useful, and @@ -19,7 +19,7 @@ Signed-off-by: Jose Quaresma 3 files changed, 42 deletions(-) diff --git a/gst/gst_private.h b/gst/gst_private.h -index 1b0f02b..a8897e1 100644 +index eefd044d9..8252ede51 100644 --- a/gst/gst_private.h +++ b/gst/gst_private.h @@ -116,8 +116,6 @@ G_GNUC_INTERNAL gboolean _priv_plugin_deps_env_vars_changed (GstPlugin * plugin @@ -32,10 +32,10 @@ index 1b0f02b..a8897e1 100644 G_GNUC_INTERNAL void _priv_gst_quarks_initialize (void); G_GNUC_INTERNAL void _priv_gst_mini_object_initialize (void); diff --git a/gst/gstinfo.c b/gst/gstinfo.c -index 37987d3..15f522e 100644 +index 5d317877b..097f8b20d 100644 --- a/gst/gstinfo.c +++ b/gst/gstinfo.c -@@ -304,36 +304,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT; +@@ -305,36 +305,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT; static volatile gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT; static volatile gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON; @@ -72,7 +72,7 @@ index 37987d3..15f522e 100644 static gchar * _replace_pattern_in_gst_debug_file_name (gchar * name, const char *token, guint val) -@@ -462,9 +432,6 @@ _priv_gst_debug_init (void) +@@ -463,9 +433,6 @@ _priv_gst_debug_init (void) _priv_GST_CAT_PROTECTION = _gst_debug_category_new ("GST_PROTECTION", 0, "protection"); @@ -82,7 +82,7 @@ index 37987d3..15f522e 100644 env = g_getenv ("GST_DEBUG_OPTIONS"); if (env != NULL) { if (strstr (env, "full_tags") || strstr (env, "full-tags")) -@@ -2502,12 +2469,6 @@ gst_debug_construct_win_color (guint colorinfo) +@@ -2503,12 +2470,6 @@ gst_debug_construct_win_color (guint colorinfo) return 0; } @@ -96,7 +96,7 @@ index 37987d3..15f522e 100644 _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file, const gchar * func, gint line, GObject * obj, const gchar * msg, diff --git a/meson.build b/meson.build -index f95b4f7..143c043 100644 +index ce1921aa4..7a84d0981 100644 --- a/meson.build +++ b/meson.build @@ -200,7 +200,6 @@ check_headers = [ @@ -108,5 +108,5 @@ index f95b4f7..143c043 100644 'sys/uio.h', ] -- -2.28.0 +2.29.2 diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch index 1c0e1f817..bf5e57249 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch @@ -1,7 +1,7 @@ -From 24867db22a5cc35e7643bc218e959ce56c306aca Mon Sep 17 00:00:00 2001 +From cf8077a7e3ab0ae236ebde79b7fc0b02eac658de Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Fri, 25 Oct 2019 00:06:26 +0200 -Subject: [PATCH 3/4] meson: Add option for installed tests +Subject: [PATCH 3/3] meson: Add option for installed tests This adds an option for producing installed versions of the unit tests. These versions don't need meson to run (only a small shell script). This @@ -23,7 +23,7 @@ Signed-off-by: Carlos Rafael Giani diff --git a/build-aux/gen-installed-test-desc.py b/build-aux/gen-installed-test-desc.py new file mode 100644 -index 0000000..69e8a0f +index 000000000..69e8a0faf --- /dev/null +++ b/build-aux/gen-installed-test-desc.py @@ -0,0 +1,18 @@ @@ -47,7 +47,7 @@ index 0000000..69e8a0f +write_template(args.output, build_template(args.test_execdir, args.testname)) diff --git a/build-aux/gen-installed-test-shscript.py b/build-aux/gen-installed-test-shscript.py new file mode 100644 -index 0000000..5da86fb +index 000000000..5da86fb37 --- /dev/null +++ b/build-aux/gen-installed-test-shscript.py @@ -0,0 +1,25 @@ @@ -77,7 +77,7 @@ index 0000000..5da86fb +write_template(args.output, build_template(args.test_execdir, args.testname)) +os.chmod(args.output, 0o755) diff --git a/meson_options.txt b/meson_options.txt -index 72c3997..346c423 100644 +index 72c3997e2..346c423d4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -15,6 +15,8 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso @@ -90,7 +90,7 @@ index 72c3997..346c423 100644 # Feature options option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') diff --git a/tests/check/meson.build b/tests/check/meson.build -index 372ea41..bb0dcfa 100644 +index a617cf159..e629131c5 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -120,11 +120,17 @@ if add_languages('cpp', native: false, required: false) @@ -168,7 +168,7 @@ index 372ea41..bb0dcfa 100644 env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') diff --git a/tests/files/testfile b/tests/files/testfile new file mode 100644 -index 0000000..89954e0 +index 000000000..89954e0e2 --- /dev/null +++ b/tests/files/testfile @@ -0,0 +1,80 @@ @@ -253,5 +253,5 @@ index 0000000..89954e0 +................................................................................ +................................................................................ -- -2.28.0 +2.29.2 diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb deleted file mode 100644 index d55b2871e..000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb +++ /dev/null @@ -1,70 +0,0 @@ -SUMMARY = "GStreamer 1.0 multimedia framework" -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -HOMEPAGE = "http://gstreamer.freedesktop.org/" -BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" -SECTION = "multimedia" -LICENSE = "LGPLv2+" - -DEPENDS = "glib-2.0 glib-2.0-native libxml2 bison-native flex-native" - -inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection - -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ - file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" - -S = "${WORKDIR}/gstreamer-${PV}" - -SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ - file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ - file://0002-Remove-unused-valgrind-detection.patch \ - file://0003-meson-Add-option-for-installed-tests.patch \ - file://0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch \ - " -SRC_URI[sha256sum] = "79df8de21f284a105a5c1568527f8c559c583c85c0f2bd7bdb5b0372b8beecba" - -PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ - check \ - debug \ - tools" - -PACKAGECONFIG[debug] = "-Dgst_debug=true,-Dgst_debug=false" -PACKAGECONFIG[tracer-hooks] = "-Dtracer_hooks=true,-Dtracer_hooks=false" -PACKAGECONFIG[check] = "-Dcheck=enabled,-Dcheck=disabled" -PACKAGECONFIG[tests] = "-Dtests=enabled -Dinstalled-tests=true,-Dtests=disabled -Dinstalled-tests=false" -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] = ",,libcap libcap-native" - -# TODO: put this in a gettext.bbclass patch -def gettext_oemeson(d): - if d.getVar('USE_NLS') == 'no': - return '-Dnls=disabled' - # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set - if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'): - return '-Dnls=disabled' - return '-Dnls=enabled' - -EXTRA_OEMESON += " \ - -Ddoc=disabled \ - -Dexamples=disabled \ - -Ddbghelp=disabled \ - ${@gettext_oemeson(d)} \ -" - -GIR_MESON_ENABLE_FLAG = "enabled" -GIR_MESON_DISABLE_FLAG = "disabled" - -PACKAGES += "${PN}-bash-completion" - -# Add the core element plugins to the main package -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" -FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" -FILES_${PN}-dbg += "${datadir}/gdb ${datadir}/gstreamer-1.0/gdb" - -CVE_PRODUCT = "gstreamer" - -require gstreamer1.0-ptest.inc diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.2.bb new file mode 100644 index 000000000..cce0f9922 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.2.bb @@ -0,0 +1,69 @@ +SUMMARY = "GStreamer 1.0 multimedia framework" +DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ +It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." +HOMEPAGE = "http://gstreamer.freedesktop.org/" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" +SECTION = "multimedia" +LICENSE = "LGPLv2+" + +DEPENDS = "glib-2.0 glib-2.0-native libxml2 bison-native flex-native" + +inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection + +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ + file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" + +S = "${WORKDIR}/gstreamer-${PV}" + +SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ + file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ + file://0002-Remove-unused-valgrind-detection.patch \ + file://0003-meson-Add-option-for-installed-tests.patch \ + " +SRC_URI[sha256sum] = "66cdeb4f970c2e55932a2f427177d438fe2c55c0b6d29e80fda80263f2ae5446" + +PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ + check \ + debug \ + tools" + +PACKAGECONFIG[debug] = "-Dgst_debug=true,-Dgst_debug=false" +PACKAGECONFIG[tracer-hooks] = "-Dtracer_hooks=true,-Dtracer_hooks=false" +PACKAGECONFIG[check] = "-Dcheck=enabled,-Dcheck=disabled" +PACKAGECONFIG[tests] = "-Dtests=enabled -Dinstalled-tests=true,-Dtests=disabled -Dinstalled-tests=false" +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] = "-Dptp-helper-permissions=capabilities,,libcap libcap-native" + +# TODO: put this in a gettext.bbclass patch +def gettext_oemeson(d): + if d.getVar('USE_NLS') == 'no': + return '-Dnls=disabled' + # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set + if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'): + return '-Dnls=disabled' + return '-Dnls=enabled' + +EXTRA_OEMESON += " \ + -Ddoc=disabled \ + -Dexamples=disabled \ + -Ddbghelp=disabled \ + ${@gettext_oemeson(d)} \ +" + +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" + +PACKAGES += "${PN}-bash-completion" + +# Add the core element plugins to the main package +FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" +FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" +FILES_${PN}-dbg += "${datadir}/gdb ${datadir}/gstreamer-1.0/gdb" + +CVE_PRODUCT = "gstreamer" + +require gstreamer1.0-ptest.inc diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 3a26cb59d..e40b8c1c4 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -56,47 +56,47 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0e5cd938de1a7a53ea5adac38cc10c39 \ file://src/pulsecore/filter/biquad.h;beginline=1;endline=4;md5=6d46d1365206528a20137355924233c1 \ " +# libtool is needed for libltdl, used in module loading. DEPENDS = "libatomic-ops libsndfile1 libtool" # optional DEPENDS += "udev alsa-lib glib-2.0" DEPENDS += "speexdsp libxml-parser-perl-native libcap" -inherit autotools bash-completion pkgconfig useradd gettext perlnative systemd manpages gsettings +inherit bash-completion meson pkgconfig useradd gettext perlnative systemd manpages gsettings # *.desktop rules wont be generated during configure and build will fail # if using --disable-nls USE_NLS = "yes" -EXTRA_OECONF = "\ - --disable-hal-compat \ - --disable-orc \ - --enable-tcpwrap=no \ - --with-access-group=audio \ - --disable-openssl \ - --with-database=simple \ - --without-zsh-completion-dir \ - --with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d \ - ac_cv_header_valgrind_memcheck_h=no \ - --disable-tests \ - --disable-running-from-build-tree \ +EXTRA_OEMESON = "\ + -Dhal-compat=false \ + -Dorc=disabled \ + -Daccess_group=audio \ + -Dopenssl=disabled \ + -Ddatabase=simple \ + -Dzshcompletiondir=no \ + -Dudevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \ + -Dvalgrind=disabled \ + -Dtests=false \ + -Drunning-from-build-tree=false \ " # soxr (the SoX Resampler library) doesn't seem to be currently packaged in # oe-core nor meta-oe, so let's not add a PACKAGECONFIG entry for it for now. -EXTRA_OECONF += "--without-soxr" +EXTRA_OEMESON += "-Dsoxr=disabled" # The FFTW dependency (for module-equalizer-sink) was removed in commit # ddbd713293 without explaining why it was not made a PACKAGECONFIG item # instead. Oh well, let's keep it disabled until someone expresses some # interest in having it enabled. -EXTRA_OECONF += "--without-fftw" +EXTRA_OEMESON += "-Dfftw=disabled" # The "adrian" echo canceller implementation has a non-standard license # (src/modules/echo-cancel/adrian-license.txt). It's a permissive license, so # the licensing terms are probably not problematic, but it would be an extra # hassle to add the license to OE-Core's set of licenses. The canceller isn't # very good anyway, better alternatives exist (such as the webrtc canceller). -EXTRA_OECONF += "--disable-adrian-aec" +EXTRA_OEMESON += "-Dadrian-aec=false" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ @@ -105,35 +105,25 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5' dbus gsettings \ " -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" -PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" -PACKAGECONFIG[gconf] = "--enable-gconf,--disable-gconf,gconf" -PACKAGECONFIG[gsettings] = "--enable-gsettings,--disable-gsettings,glib-2.0-native glib-2.0" -PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono" -PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" -PACKAGECONFIG[systemd] = "--enable-systemd-daemon --enable-systemd-login --enable-systemd-journal --with-systemduserunitdir=${systemd_user_unitdir},--disable-systemd-daemon --disable-systemd-login --disable-systemd-journal,systemd" -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" -PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[dbus] = "-Ddbus=enabled,-Ddbus=disabled,dbus" +PACKAGECONFIG[bluez5] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" +PACKAGECONFIG[gsettings] = "-Dgsettings=enabled,-Dgsettings=disabled,glib-2.0-native glib-2.0" +PACKAGECONFIG[ofono] = "-Dbluez5-ofono-headset=true,-Dbluez5-ofono-headset=false,ofono" +PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" +PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemduserunitdir=${systemd_user_unitdir},-Dsystemd=disabled,systemd" +PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 libxtst libice libsm libxcb" +PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi" +PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" # Since many embedded systems don't have non-root users, it's useful to be # able to use pulseaudio autospawn for root as well. PACKAGECONFIG[autospawn-for-root] = ",,," -PACKAGECONFIG[lirc] = "--enable-lirc,--disable-lirc,lirc" -PACKAGECONFIG[webrtc] = "--enable-webrtc-aec,--disable-webrtc-aec,webrtc-audio-processing" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, " - -EXTRA_OECONF_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}" -EXTRA_OECONF_append_armeb = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}" - +PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc" +PACKAGECONFIG[webrtc] = "-Dwebrtc-aec=enabled,-Dwebrtc-aec=disabled,webrtc-audio-processing" +PACKAGECONFIG[ipv6] = "-Dipv6=true,-Dipv6=false," +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false," export TARGET_PFPU = "${TARGET_FPU}" -# TODO: Use more fine granular version -#OE_LT_RPATH_ALLOW=":${libdir}/pulse-0.9:" -OE_LT_RPATH_ALLOW = "any" -OE_LT_RPATH_ALLOW[export]="1" - set_cfg_value () { sed -i -e "s/\(; *\)\?$2 =.*/$2 = $3/" "$1" if ! grep -q "^$2 = $3\$" "$1"; then @@ -143,7 +133,7 @@ set_cfg_value () { do_compile_append () { if ${@bb.utils.contains('PACKAGECONFIG', 'autospawn-for-root', 'true', 'false', d)}; then - set_cfg_value src/client.conf allow-autospawn-for-root yes + set_cfg_value src/pulse/client.conf allow-autospawn-for-root yes fi } @@ -269,7 +259,6 @@ RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" -FILES_${PN}-module-gconf += "${libexecdir}/pulse/gconf-helper" GSETTINGS_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'gsettings', '${PN}-module-gsettings', '', d)}" FILES_${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas" diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch new file mode 100644 index 000000000..d60a9a211 --- /dev/null +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch @@ -0,0 +1,67 @@ +From 6d202833a5ae241eeb648631cf95090c452198f9 Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen +Date: Fri, 14 Feb 2020 07:29:33 +0200 +Subject: [PATCH] build-sys: Add an option for enabling/disabling Valgrind + +In OpenEmbedded the PulseAudio recipe currently disables Valgrind +support by passing "ac_cv_header_valgrind_memcheck_h=no" to the +configure script (this was added to make it deterministic whether +Valgrdind support gets enabled or not). I'm converting the PulseAudio +recipe to use Meson, and I needed an option to disable Valgrind. + +Upstream-Status: Backport + +Signed-off-by: Tanu Kaskinen +--- + meson.build | 6 +++++- + meson_options.txt | 3 +++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 658eeee57..258962724 100644 +--- a/meson.build ++++ b/meson.build +@@ -220,7 +220,6 @@ check_headers = [ + 'sys/un.h', + 'sys/wait.h', + 'syslog.h', +- 'valgrind/memcheck.h', + 'xlocale.h', + ] + +@@ -231,6 +230,10 @@ foreach h : check_headers + endif + endforeach + ++if cc.has_header('valgrind/memcheck.h', required: get_option('valgrind')) ++ cdata.set('HAVE_VALGRIND_MEMCHECK_H', 1) ++endif ++ + # FIXME: move this to the above set + if cc.has_header('pthread.h') + cdata.set('HAVE_PTHREAD', 1) +@@ -841,6 +844,7 @@ summary = [ + 'Enable SoXR (resampler): @0@'.format(soxr_dep.found()), + 'Enable WebRTC echo canceller: @0@'.format(webrtc_dep.found()), + 'Enable Gcov coverage: @0@'.format(get_option('gcov')), ++ 'Enable Valgrind: @0@'.format(cdata.has('HAVE_VALGRIND_MEMCHECK_H')), + 'Enable man pages: @0@'.format(get_option('man')), + 'Enable unit tests: @0@'.format(get_option('tests')), + '', +diff --git a/meson_options.txt b/meson_options.txt +index 824f24e08..115cc84af 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -138,6 +138,9 @@ option('systemd', + option('udev', + type : 'feature', value : 'auto', + description : 'Optional udev support') ++option('valgrind', ++ type : 'feature', value : 'auto', ++ description : 'Optional Valgrind support') + option('x11', + type : 'feature', value : 'auto', + description : 'Optional X11 support') +-- +2.20.1 + diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch new file mode 100644 index 000000000..c9d8abcbf --- /dev/null +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch @@ -0,0 +1,82 @@ +From 9d0dc8aedd08d77797f90fa6075a59613f18bf0d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 20 Dec 2020 07:56:07 -0800 +Subject: [PATCH] meson: Check for __get_cpuid + +checking for presence of cpuid.h header alone is not sufficient in some case to use +cpuid related functions. e.g. when using clang which is built for +multiple targets will have cpuid.h header as part of compiler headers in +distribution but one maybe compiling pulseaudion for non-x86 target. The +current check in meson succeeds and then compile fails later because +cpuid.h is x86-specific header. Therefore checking for symbol that is +needed makes this robust, so even if header exist it will try to ensure +the given symbol can be used + +Fixes +src/pulsecore/core-util.c:113: +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/pulseaudio/14.0-r0/recipe-sysroot-native/usr/lib/clang/11.0.1/include/cpuid.h:11:2: error: this header is for x86 only +| #error this header is for x86 only +| ^ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +Cc: Tanu Kaskinen +--- + meson.build | 5 ++++- + src/pulsecore/core-util.c | 2 +- + src/pulsecore/cpu-x86.c | 2 +- + 3 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 2589627..5f5127e 100644 +--- a/meson.build ++++ b/meson.build +@@ -185,7 +185,6 @@ endif + check_headers = [ + 'arpa/inet.h', + 'byteswap.h', +- 'cpuid.h', + 'dlfcn.h', + 'execinfo.h', + 'grp.h', +@@ -243,6 +242,10 @@ if cc.has_header_symbol('pthread.h', 'PTHREAD_PRIO_INHERIT') + cdata.set('HAVE_PTHREAD_PRIO_INHERIT', 1) + endif + ++if cc.has_header_symbol('cpuid.h', '__get_cpuid') ++ cdata.set('HAVE_GET_CPUID', 1) ++endif ++ + # Functions + + check_functions = [ +diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c +index 601b1d1..6f34e7c 100644 +--- a/src/pulsecore/core-util.c ++++ b/src/pulsecore/core-util.c +@@ -109,7 +109,7 @@ + #include + #endif + +-#ifdef HAVE_CPUID_H ++#ifdef HAVE_GET_CPUID + #include + #endif + +diff --git a/src/pulsecore/cpu-x86.c b/src/pulsecore/cpu-x86.c +index 4e59e14..86595d4 100644 +--- a/src/pulsecore/cpu-x86.c ++++ b/src/pulsecore/cpu-x86.c +@@ -24,7 +24,7 @@ + + #include + +-#ifdef HAVE_CPUID_H ++#ifdef HAVE_GET_CPUID + #include + #endif + +-- +2.29.2 + diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.0.bb b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.0.bb index ac0c82e37..fccca1ba4 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.0.bb +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.0.bb @@ -3,6 +3,8 @@ require pulseaudio.inc SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ file://0001-client-conf-Add-allow-autospawn-for-root.patch \ file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \ + file://0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch \ + file://0001-meson-Check-for-__get_cpuid.patch \ file://volatiles.04_pulse \ " SRC_URI[md5sum] = "84a7776e63dd55c40db8fbd7c7e2e18e" diff --git a/poky/meta/recipes-multimedia/sbc/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch b/poky/meta/recipes-multimedia/sbc/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch new file mode 100644 index 000000000..11cec74fb --- /dev/null +++ b/poky/meta/recipes-multimedia/sbc/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch @@ -0,0 +1,45 @@ +From f4a1224323e386090a44bf70ee0ac9877ba7fb0d Mon Sep 17 00:00:00 2001 +From: Marius Bakke +Date: Tue, 22 Dec 2020 11:04:26 +0000 +Subject: [PATCH] sbc_primitives: Fix build on non-x86. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Don't call __builtin_cpu_init unless targeting i386 or x86_64. +Otherwise we get an error at link time: + + CC sbc/sbc_primitives.lo +sbc/sbc_primitives.c: In function ‘sbc_init_primitives_x86’: +sbc/sbc_primitives.c:596:2: warning: implicit declaration of function ‘__builtin_cpu_init’; did you mean ‘__builtin_irint’? [-Wimplicit-function-declaration] +[...] + CCLD src/sbcdec +ld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives': +sbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init' + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + sbc/sbc_primitives.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c +index 97a75be..09c214a 100644 +--- a/sbc/sbc_primitives.c ++++ b/sbc/sbc_primitives.c +@@ -593,6 +593,7 @@ static int sbc_calc_scalefactors_j( + + static void sbc_init_primitives_x86(struct sbc_encoder_state *state) + { ++#if defined(__x86_64__) || defined(__i386__) + __builtin_cpu_init(); + + #ifdef SBC_BUILD_WITH_MMX_SUPPORT +@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state) + if (__builtin_cpu_supports("sse4.2")) + sbc_init_primitives_sse(state); + #endif ++#endif + } + + /* diff --git a/poky/meta/recipes-multimedia/sbc/sbc_1.4.bb b/poky/meta/recipes-multimedia/sbc/sbc_1.4.bb deleted file mode 100644 index 674d77ef4..000000000 --- a/poky/meta/recipes-multimedia/sbc/sbc_1.4.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "SBC Audio Codec" -DESCRIPTION = "Bluetooth low-complexity, subband codec (SBC) library." -HOMEPAGE = "https://www.bluez.org" -SECTION = "libs" -LICENSE = "GPLv2+ & LGPLv2.1+" -LICENSE_${PN} = "LGPLv2.1+" -LICENSE_${PN}-examples = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ - file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ - file://src/sbcenc.c;beginline=1;endline=24;md5=08e7a70b127f4100ff2cd7d629147d8d \ - file://sbc/sbc.h;beginline=1;endline=26;md5=0f57d0df22b0d40746bdd29805a4361b" - -DEPENDS = "libsndfile1" - -SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/${BP}.tar.xz" - -SRC_URI[md5sum] = "800fb0908899baa48dc216d8e156cc05" -SRC_URI[sha256sum] = "518bf46e6bb3dc808a95e1eabad26fdebe8a099c1e781c27ed7fca6c2f4a54c9" - -inherit autotools pkgconfig - -PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples += "${bindir}/*" diff --git a/poky/meta/recipes-multimedia/sbc/sbc_1.5.bb b/poky/meta/recipes-multimedia/sbc/sbc_1.5.bb new file mode 100644 index 000000000..04d82320c --- /dev/null +++ b/poky/meta/recipes-multimedia/sbc/sbc_1.5.bb @@ -0,0 +1,24 @@ +SUMMARY = "SBC Audio Codec" +DESCRIPTION = "Bluetooth low-complexity, subband codec (SBC) library." +HOMEPAGE = "https://www.bluez.org" +SECTION = "libs" +LICENSE = "GPLv2+ & LGPLv2.1+" +LICENSE_${PN} = "LGPLv2.1+" +LICENSE_${PN}-examples = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ + file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ + file://src/sbcenc.c;beginline=1;endline=24;md5=08e7a70b127f4100ff2cd7d629147d8d \ + file://sbc/sbc.h;beginline=1;endline=26;md5=0f57d0df22b0d40746bdd29805a4361b" + +DEPENDS = "libsndfile1" + +SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/${BP}.tar.xz \ + file://0001-sbc_primitives-Fix-build-on-non-x86.patch \ + " + +SRC_URI[sha256sum] = "0cbad69823a99e8421fe0700e8cf9eeb8fa0c1ad28e8dbc2182b3353507931d2" + +inherit autotools pkgconfig + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples += "${bindir}/*" diff --git a/poky/meta/recipes-sato/puzzles/puzzles_git.bb b/poky/meta/recipes-sato/puzzles/puzzles_git.bb index 8e4d5b334..5b65cf865 100644 --- a/poky/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -18,7 +18,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "9aa7b7cdfb2bcd200f45941a58d6ae698882a2d4" +SRCREV = "84cb4c6701e027090ff3fd955ce08065e20121b2" PE = "2" PV = "0.0+git${SRCPV}" diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index b064a63ca..185523297 100644 --- a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -30,7 +30,7 @@ EXTRA_OECONF = "--enable-xim \ --enable-combining --disable-perl \ --with-x=${STAGING_DIR_HOST}${prefix}" -EXTRA_OECONF_append_libc-musl = " --disable-wtmp" +EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" PACKAGECONFIG ??= "" PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification," diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch deleted file mode 100644 index 3a02253e5..000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 8d1c44a03c1870912991467f8d8cd8bb6f85efa5 Mon Sep 17 00:00:00 2001 -From: "stephan.szabo@sony.com" -Date: Tue, 3 Nov 2020 20:06:15 +0000 -Subject: [PATCH] ICU 68.1 no longer exposes FALSE and TRUE macros by default - https://bugs.webkit.org/show_bug.cgi?id=218522 - -Reviewed by Don Olmstead. - -Source/WebCore: - -* platform/text/TextCodecICU.cpp: Replace use of TRUE with true - -Source/WebKit: - -* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false - -Source/WTF: - -Replace uses of FALSE and TRUE with false and true. - -* wtf/text/icu/UTextProvider.h: -* wtf/text/icu/UTextProviderLatin1.cpp: -* wtf/text/icu/UTextProviderUTF16.cpp: - -Upstream-Status: Backport -Signed-off-by: Ross Burton - -git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/WTF/wtf/text/icu/UTextProvider.h | 8 ++++---- - Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp | 14 +++++++------- - Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp | 4 ++-- - Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- - .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +- - 5 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/Source/WTF/wtf/text/icu/UTextProvider.h b/Source/WTF/wtf/text/icu/UTextProvider.h -index c8f28d6e..3c6fbeab 100644 ---- a/Source/WTF/wtf/text/icu/UTextProvider.h -+++ b/Source/WTF/wtf/text/icu/UTextProvider.h -@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits::max()); - text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { - text->chunkOffset = text->chunkLength; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } else { -@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits::max()); - text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } -diff --git a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp -index 0a646b7f..49980f95 100644 ---- a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp -+++ b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp -@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) - if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (index >= length && uText->chunkNativeLimit == length) { - // Off the end of the buffer, but we can't get it. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return FALSE; -+ return false; - } - } else { - if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (!index && !uText->chunkNativeStart) { - // Already at the beginning; can't go any farther. - uText->chunkOffset = 0; -- return FALSE; -+ return false; - } - } - -@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) - - uText->nativeIndexingLimit = uText->chunkLength; - -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) -@@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text) - static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo - ASSERT(newContext == UTextProviderContext::PriorContext); - textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) -diff --git a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp -index 69c8d091..9c3fa709 100644 ---- a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp -+++ b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp -@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) - static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo - ASSERT(newContext == UTextProviderContext::PriorContext); - textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) -diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp -index c2684939..e716a6fb 100644 ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -240,7 +240,7 @@ void TextCodecICU::createICUConverter() const - UErrorCode error = U_ZERO_ERROR; - m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close }; - if (m_converter) -- ucnv_setFallback(m_converter.get(), TRUE); -+ ucnv_setFallback(m_converter.get(), true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error) -diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -index 61e3f605..5a51b9ec 100644 ---- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -@@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::~DrawingMonitor() - int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor) - { - monitor->didDraw(); -- return FALSE; -+ return false; - } - - void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function&& callback) --- -2.25.1 - diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb deleted file mode 100644 index 31370f323..000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb +++ /dev/null @@ -1,148 +0,0 @@ -SUMMARY = "WebKit web rendering engine for the GTK+ platform" -HOMEPAGE = "https://www.webkitgtk.org/" -BUGTRACKER = "https://bugs.webkit.org/" - -LICENSE = "BSD & LGPLv2+" -LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ - file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ - file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ - file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ - " - -SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ - file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.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://0001-Fix-build-with-musl.patch \ - file://include_array.patch \ - file://include_xutil.patch \ - file://0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch \ - " -SRC_URI[sha256sum] = "c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a" - -inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" - -CVE_PRODUCT = "webkitgtk webkitgtk\+" - -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 \ - ruby-native libnotify gstreamer1.0-plugins-bad \ - gettext-native glib-2.0 glib-2.0-native libtasn1 \ - " - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ - enchant \ - libsecret \ - " - -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 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" -PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" -PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl" -PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" -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" -PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" - -# webkitgtk is full of /usr/bin/env python, particular for generating docs -do_configure[postfuncs] += "setup_python_link" -setup_python_link() { - if [ ! -e ${STAGING_BINDIR_NATIVE}/python ]; then - ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python - fi -} - -EXTRA_OECMAKE = " \ - -DPORT=GTK \ - -DCMAKE_BUILD_TYPE=Release \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ - ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \ - -DENABLE_MINIBROWSER=ON \ - -DPYTHON_EXECUTABLE=`which python3` \ - -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ - " - -# Javascript JIT is not supported on ARC -EXTRA_OECMAKE_append_arc = " -DENABLE_JIT=OFF " -# By default 25-bit "medium" calls are used on ARC -# which is not enough for binaries larger than 32 MiB -CFLAGS_append_arc = " -mlong-calls" -CXXFLAGS_append_arc = " -mlong-calls" - -# Javascript JIT is not supported on powerpc -EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " -EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " - -# ARM JIT code does not build on ARMv4/5/6 anymore -EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=OFF " -EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=OFF " -EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " - -EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " -EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " - -# JIT and gold linker does not work on RISCV -EXTRA_OECMAKE_append_riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" -EXTRA_OECMAKE_append_riscv64 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" - -# JIT not supported on MIPS either -EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " - -# JIT not supported on X32 -# An attempt was made to upstream JIT support for x32 in -# https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as -# unresolved due to limited X32 adoption. -EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF " - -SECURITY_CFLAGS_remove_aarch64 = "-fpie" -SECURITY_CFLAGS_append_aarch64 = " -fPIE" - -FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" - -RRECOMMENDS_${PN} += "ca-certificates shared-mime-info" - -# http://errors.yoctoproject.org/Errors/Details/20370/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv6 = "arm" - -# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 -# https://bugs.webkit.org/show_bug.cgi?id=159880 -# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. -# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). -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" - -PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" -src_package_preprocess () { - # Trim build paths from comments in generated sources to ensure reproducibility - sed -i -e "s,${WORKDIR},,g" \ - ${B}/DerivedSources/webkit2gtk/webkit2/*.cpp \ - ${B}/DerivedSources/ForwardingHeaders/JavaScriptCore/*.h \ - ${B}/DerivedSources/JavaScriptCore/*.h \ - ${B}/DerivedSources/JavaScriptCore/yarr/*.h \ - ${B}/DerivedSources/MiniBrowser/*.c -} - diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb new file mode 100644 index 000000000..a16a676d7 --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb @@ -0,0 +1,147 @@ +SUMMARY = "WebKit web rendering engine for the GTK+ platform" +HOMEPAGE = "https://www.webkitgtk.org/" +BUGTRACKER = "https://bugs.webkit.org/" + +LICENSE = "BSD & LGPLv2+" +LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ + file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ + file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ + " + +SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ + file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ + file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.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://0001-Fix-build-with-musl.patch \ + file://include_array.patch \ + file://include_xutil.patch \ + " +SRC_URI[sha256sum] = "d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24" + +inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" + +CVE_PRODUCT = "webkitgtk webkitgtk\+" + +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 \ + ruby-native libnotify gstreamer1.0-plugins-bad \ + gettext-native glib-2.0 glib-2.0-native libtasn1 \ + " + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ + enchant \ + libsecret \ + " + +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 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" +PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" +PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl" +PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" +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" +PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" + +# webkitgtk is full of /usr/bin/env python, particular for generating docs +do_configure[postfuncs] += "setup_python_link" +setup_python_link() { + if [ ! -e ${STAGING_BINDIR_NATIVE}/python ]; then + ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python + fi +} + +EXTRA_OECMAKE = " \ + -DPORT=GTK \ + -DCMAKE_BUILD_TYPE=Release \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ + ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \ + -DENABLE_MINIBROWSER=ON \ + -DPYTHON_EXECUTABLE=`which python3` \ + -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ + " + +# Javascript JIT is not supported on ARC +EXTRA_OECMAKE_append_arc = " -DENABLE_JIT=OFF " +# By default 25-bit "medium" calls are used on ARC +# which is not enough for binaries larger than 32 MiB +CFLAGS_append_arc = " -mlong-calls" +CXXFLAGS_append_arc = " -mlong-calls" + +# Javascript JIT is not supported on powerpc +EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " + +# ARM JIT code does not build on ARMv4/5/6 anymore +EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " + +EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " + +# JIT and gold linker does not work on RISCV +EXTRA_OECMAKE_append_riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" +EXTRA_OECMAKE_append_riscv64 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" + +# JIT not supported on MIPS either +EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " + +# JIT not supported on X32 +# An attempt was made to upstream JIT support for x32 in +# https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as +# unresolved due to limited X32 adoption. +EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF " + +SECURITY_CFLAGS_remove_aarch64 = "-fpie" +SECURITY_CFLAGS_append_aarch64 = " -fPIE" + +FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" + +RRECOMMENDS_${PN} += "ca-certificates shared-mime-info" + +# http://errors.yoctoproject.org/Errors/Details/20370/ +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" + +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). +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" + +PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" +src_package_preprocess () { + # Trim build paths from comments in generated sources to ensure reproducibility + sed -i -e "s,${WORKDIR},,g" \ + ${B}/DerivedSources/webkit2gtk/webkit2/*.cpp \ + ${B}/DerivedSources/ForwardingHeaders/JavaScriptCore/*.h \ + ${B}/DerivedSources/JavaScriptCore/*.h \ + ${B}/DerivedSources/JavaScriptCore/yarr/*.h \ + ${B}/DerivedSources/MiniBrowser/*.c +} + diff --git a/poky/meta/recipes-support/apr/apr-util_1.6.1.bb b/poky/meta/recipes-support/apr/apr-util_1.6.1.bb index 0dd8f025e..f7d827a1d 100644 --- a/poky/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/poky/meta/recipes-support/apr/apr-util_1.6.1.bb @@ -19,10 +19,9 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f" SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" -EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ +EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ --without-pgsql \ - --with-dbm=gdbm \ --without-sqlite2 \ --with-expat=${STAGING_DIR_HOST}${prefix}" @@ -69,7 +68,7 @@ PACKAGECONFIG ??= "crypto gdbm" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" -PACKAGECONFIG[gdbm] = "--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" +PACKAGECONFIG[gdbm] = "--with-dbm=gdbm --with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" #files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" diff --git a/poky/meta/recipes-support/apr/apr_1.7.0.bb b/poky/meta/recipes-support/apr/apr_1.7.0.bb index 7073af8c9..c9b9bf0f5 100644 --- a/poky/meta/recipes-support/apr/apr_1.7.0.bb +++ b/poky/meta/recipes-support/apr/apr_1.7.0.bb @@ -1,4 +1,8 @@ SUMMARY = "Apache Portable Runtime (APR) library" +DESCRIPTION = "The Apache Portable Runtime (APR) is a supporting library for the \ +Apache web server. It provides a set of APIs that map to the underlying \ +operating system (OS). Where the OS does not support a particular function, \ +APR will provide an emulation." HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" DEPENDS = "util-linux" diff --git a/poky/meta/recipes-support/aspell/aspell_0.60.8.bb b/poky/meta/recipes-support/aspell/aspell_0.60.8.bb index 629987810..f1d931b39 100644 --- a/poky/meta/recipes-support/aspell/aspell_0.60.8.bb +++ b/poky/meta/recipes-support/aspell/aspell_0.60.8.bb @@ -1,4 +1,8 @@ SUMMARY = "GNU Aspell spell-checker" +DESCRIPTION = "GNU Aspell is a spell-checker which can be used either as a \ +standalone application or embedded in other programs. Its main feature is that \ +it does a much better job of suggesting possible spellings than just about any \ +other spell-checker available for the English language" SECTION = "console/utils" LICENSE = "LGPLv2 | LGPLv2.1" diff --git a/poky/meta/recipes-support/atk/at-spi2-core_2.38.0.bb b/poky/meta/recipes-support/atk/at-spi2-core_2.38.0.bb index 88add83dd..a0657950b 100644 --- a/poky/meta/recipes-support/atk/at-spi2-core_2.38.0.bb +++ b/poky/meta/recipes-support/atk/at-spi2-core_2.38.0.bb @@ -1,4 +1,6 @@ SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" +DESCRIPTION = "At-Spi2 is a protocol over DBus, toolkit widgets use it to \ +provide their content to screen readers such as Orca." HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" LICENSE = "LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" diff --git a/poky/meta/recipes-support/attr/acl_2.2.53.bb b/poky/meta/recipes-support/attr/acl_2.2.53.bb index 5bb50f77f..b120c1f16 100644 --- a/poky/meta/recipes-support/attr/acl_2.2.53.bb +++ b/poky/meta/recipes-support/attr/acl_2.2.53.bb @@ -1,5 +1,7 @@ SUMMARY = "Utilities for managing POSIX Access Control Lists" HOMEPAGE = "http://savannah.nongnu.org/projects/acl/" +DESCRIPTION = "ACL allows you to provide different levels of access to files \ +and folders for different users." SECTION = "libs" LICENSE = "LGPLv2.1+ & GPLv2+" diff --git a/poky/meta/recipes-support/attr/attr.inc b/poky/meta/recipes-support/attr/attr.inc index 0c3330a68..97bca4698 100644 --- a/poky/meta/recipes-support/attr/attr.inc +++ b/poky/meta/recipes-support/attr/attr.inc @@ -1,4 +1,8 @@ SUMMARY = "Utilities for manipulating filesystem extended attributes" +DESCRIPTION = "A set of tools for manipulating extended attributes on filesystem \ +objects, in particular getfattr(1) and setfattr(1). An attr(1) command \ +is also provided which is largely compatible with the SGI IRIX tool of \ +the same name." HOMEPAGE = "http://savannah.nongnu.org/projects/attr/" SECTION = "libs" diff --git a/poky/meta/recipes-support/bash-completion/bash-completion_2.11.bb b/poky/meta/recipes-support/bash-completion/bash-completion_2.11.bb index bab8a018c..f00e0fc5b 100644 --- a/poky/meta/recipes-support/bash-completion/bash-completion_2.11.bb +++ b/poky/meta/recipes-support/bash-completion/bash-completion_2.11.bb @@ -1,4 +1,6 @@ SUMMARY = "Programmable Completion for Bash 4" +DESCRIPTION = "bash completion extends bash's standard completion behavior to \ +achieve complex command lines with just a few keystrokes." HOMEPAGE = "https://github.com/scop/bash-completion" BUGTRACKER = "https://github.com/scop/bash-completion/issues" diff --git a/poky/meta/recipes-support/boost/boost-1.74.0.inc b/poky/meta/recipes-support/boost/boost-1.74.0.inc deleted file mode 100644 index b47fdaf09..000000000 --- a/poky/meta/recipes-support/boost/boost-1.74.0.inc +++ /dev/null @@ -1,20 +0,0 @@ -# The Boost web site provides free peer-reviewed portable -# C++ source libraries. The emphasis is on libraries which -# work well with the C++ Standard Library. The libraries are -# intended to be widely useful, and are in regular use by -# thousands of programmers across a broad spectrum of applications. -HOMEPAGE = "http://www.boost.org/" -LICENSE = "BSL-1.0 & MIT & Python-2.0" -LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" - -BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" -BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" -BOOST_P = "boost_${BOOST_VER}" - -SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2" -SRC_URI[sha256sum] = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1" - -UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" -UPSTREAM_CHECK_REGEX = "boostorg/release/(?P.*)/source/" - -S = "${WORKDIR}/${BOOST_P}" diff --git a/poky/meta/recipes-support/boost/boost-1.75.0.inc b/poky/meta/recipes-support/boost/boost-1.75.0.inc new file mode 100644 index 000000000..e5a8488c5 --- /dev/null +++ b/poky/meta/recipes-support/boost/boost-1.75.0.inc @@ -0,0 +1,20 @@ +# The Boost web site provides free peer-reviewed portable +# C++ source libraries. The emphasis is on libraries which +# work well with the C++ Standard Library. The libraries are +# intended to be widely useful, and are in regular use by +# thousands of programmers across a broad spectrum of applications. +HOMEPAGE = "http://www.boost.org/" +LICENSE = "BSL-1.0 & MIT & Python-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" +BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" +BOOST_P = "boost_${BOOST_VER}" + +SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2" +SRC_URI[sha256sum] = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb" + +UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" +UPSTREAM_CHECK_REGEX = "boostorg/release/(?P.*)/source/" + +S = "${WORKDIR}/${BOOST_P}" diff --git a/poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch b/poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch deleted file mode 100644 index 169906344..000000000 --- a/poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 8845a786598f1d9e83aa1b7d2966b0d1eb765ba0 Mon Sep 17 00:00:00 2001 -From: Christopher Larson -Date: Tue, 13 Dec 2016 10:14:31 -0700 -Subject: [PATCH 1/3] Apply boost-1.62.0-no-forced-flags.patch - -Upstream-Status: Inappropriate -Signed-off-by: Christopher Larson ---- - libs/log/build/Jamfile.v2 | 4 ++-- - libs/log/config/x86-ext/Jamfile.jam | 16 ++++++++-------- - libs/log/src/dump_avx2.cpp | 4 ++++ - libs/log/src/dump_ssse3.cpp | 4 ++++ - 4 files changed, 18 insertions(+), 10 deletions(-) - -diff --git a/libs/log/build/Jamfile.v2 b/libs/log/build/Jamfile.v2 -index 4abbdbc..b3016fc 100644 ---- a/libs/log/build/Jamfile.v2 -+++ b/libs/log/build/Jamfile.v2 -@@ -373,7 +373,7 @@ rule avx2-targets-cond ( properties * ) - } - else if clang in $(properties) - { -- result = "-mavx -mavx2" ; -+ result = ; - } - else if intel in $(properties) - { -@@ -383,7 +383,7 @@ rule avx2-targets-cond ( properties * ) - } - else - { -- result = "-xCORE-AVX2 -fabi-version=0" ; -+ result = "-fabi-version=0" ; - } - } - else if msvc in $(properties) -diff --git a/libs/log/config/x86-ext/Jamfile.jam b/libs/log/config/x86-ext/Jamfile.jam -index 0e9695a..dcc394d 100644 ---- a/libs/log/config/x86-ext/Jamfile.jam -+++ b/libs/log/config/x86-ext/Jamfile.jam -@@ -15,19 +15,19 @@ project /boost/log/x86-extensions - - obj ssse3 : ssse3.cpp - : -- gcc:"-msse -msse2 -msse3 -mssse3" -- clang:"-msse -msse2 -msse3 -mssse3" -- intel-linux:"-xSSSE3" -- intel-darwin:"-xSSSE3" -+ gcc: -+ clang: -+ intel-linux: -+ intel-darwin: - intel-win:"/QxSSSE3" - ; - - obj avx2 : avx2.cpp - : -- gcc:"-mavx -mavx2 -fabi-version=0" -- clang:"-mavx -mavx2" -- intel-linux:"-xCORE-AVX2 -fabi-version=0" -- intel-darwin:"-xCORE-AVX2 -fabi-version=0" -+ gcc:"-fabi-version=0" -+ clang: -+ intel-linux:"-fabi-version=0" -+ intel-darwin:"-fabi-version=0" - intel-win:"/arch:CORE-AVX2" - msvc:"/arch:AVX" - ; -diff --git a/libs/log/src/dump_avx2.cpp b/libs/log/src/dump_avx2.cpp -index 4ab1250..610fc6d 100644 ---- a/libs/log/src/dump_avx2.cpp -+++ b/libs/log/src/dump_avx2.cpp -@@ -22,6 +22,10 @@ - #include - #include - -+#if !defined(__AVX2__) -+#error "AVX2 Unsupported!" -+#endif -+ - #if defined(__x86_64) || defined(__x86_64__) || \ - defined(__amd64__) || defined(__amd64) || \ - defined(_M_X64) -diff --git a/libs/log/src/dump_ssse3.cpp b/libs/log/src/dump_ssse3.cpp -index 1325b49..60d4112 100644 ---- a/libs/log/src/dump_ssse3.cpp -+++ b/libs/log/src/dump_ssse3.cpp -@@ -22,6 +22,10 @@ - #include - #include - -+#if !defined(__SSSE3__) -+#error "SSSE3 Unsupported!" -+#endif -+ - #if defined(__x86_64) || defined(__x86_64__) || \ - defined(__amd64__) || defined(__amd64) || \ - defined(_M_X64) --- -2.8.0 diff --git a/poky/meta/recipes-support/boost/boost_1.74.0.bb b/poky/meta/recipes-support/boost/boost_1.74.0.bb deleted file mode 100644 index b01b390a5..000000000 --- a/poky/meta/recipes-support/boost/boost_1.74.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require boost-${PV}.inc -require boost.inc - -SRC_URI += "file://arm-intrinsics.patch \ - file://boost-CVE-2012-2677.patch \ - file://boost-math-disable-pch-for-gcc.patch \ - file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ - file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ - file://0001-dont-setup-compiler-flags-m32-m64.patch \ - file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \ - " diff --git a/poky/meta/recipes-support/boost/boost_1.75.0.bb b/poky/meta/recipes-support/boost/boost_1.75.0.bb new file mode 100644 index 000000000..33137e236 --- /dev/null +++ b/poky/meta/recipes-support/boost/boost_1.75.0.bb @@ -0,0 +1,10 @@ +require boost-${PV}.inc +require boost.inc + +SRC_URI += "file://arm-intrinsics.patch \ + file://boost-CVE-2012-2677.patch \ + file://boost-math-disable-pch-for-gcc.patch \ + file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ + file://0001-dont-setup-compiler-flags-m32-m64.patch \ + file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \ + " diff --git a/poky/meta/recipes-support/curl/curl_7.73.0.bb b/poky/meta/recipes-support/curl/curl_7.73.0.bb deleted file mode 100644 index 0f26b0f1a..000000000 --- a/poky/meta/recipes-support/curl/curl_7.73.0.bb +++ /dev/null @@ -1,85 +0,0 @@ -SUMMARY = "Command line tool and library for client-side URL transfers" -HOMEPAGE = "http://curl.haxx.se/" -BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker" -SECTION = "console/network" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=2e9fb35867314fe31c6a4977ef7dd531" - -SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ - file://0001-replace-krb5-config-with-pkg-config.patch \ -" - -SRC_URI[sha256sum] = "cf34fe0b07b800f1c01a499a6e8b2af548f6d0e044dca4a29d88a4bee146d131" - -# Curl has used many names over the years... -CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" - -inherit autotools pkgconfig binconfig multilib_header - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls libidn proxy threaded-resolver verbose zlib" -PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" -PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" - -# 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" -PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" -PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" -PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," -PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" -PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," -PACKAGECONFIG[imap] = "--enable-imap,--disable-imap," -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap," -PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps," -PACKAGECONFIG[libidn] = "--with-libidn2,--without-libidn2,libidn2" -PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" -PACKAGECONFIG[mbedtls] = "--with-mbedtls=${STAGING_DIR_TARGET},--without-mbedtls,mbedtls" -PACKAGECONFIG[mqtt] = "--enable-mqtt,--disable-mqtt," -PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" -PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," -PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy," -PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" -PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp," -PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," -PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp," -PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl" -PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" -PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," -PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" -PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" -PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" - -EXTRA_OECONF = " \ - --disable-libcurl-option \ - --disable-ntlm-wb \ - --enable-crypto-auth \ - --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ - --without-libmetalink \ - --without-libpsl \ - --enable-debug \ - --enable-optimize \ - --disable-curldebug \ -" - -do_install_append_class-target() { - # cleanup buildpaths from curl-config - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - ${D}${bindir}/curl-config -} - -PACKAGES =+ "lib${BPN}" - -FILES_lib${BPN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${BPN} += "ca-certificates" - -FILES_${PN} += "${datadir}/zsh" - -inherit multilib_script -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/curl/curl_7.74.0.bb b/poky/meta/recipes-support/curl/curl_7.74.0.bb new file mode 100644 index 000000000..873bbe814 --- /dev/null +++ b/poky/meta/recipes-support/curl/curl_7.74.0.bb @@ -0,0 +1,85 @@ +SUMMARY = "Command line tool and library for client-side URL transfers" +HOMEPAGE = "http://curl.haxx.se/" +BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker" +SECTION = "console/network" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=2e9fb35867314fe31c6a4977ef7dd531" + +SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ + file://0001-replace-krb5-config-with-pkg-config.patch \ +" + +SRC_URI[sha256sum] = "0f4d63e6681636539dc88fa8e929f934cd3a840c46e0bf28c73be11e521b77a5" + +# Curl has used many names over the years... +CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" + +inherit autotools pkgconfig binconfig multilib_header + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls libidn proxy threaded-resolver verbose zlib" +PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" +PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" + +# 'ares' and 'threaded-resolver' are mutually exclusive +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" +PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" +PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" +PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," +PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" +PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," +PACKAGECONFIG[imap] = "--enable-imap,--disable-imap," +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" +PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap," +PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps," +PACKAGECONFIG[libidn] = "--with-libidn2,--without-libidn2,libidn2" +PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" +PACKAGECONFIG[mbedtls] = "--with-mbedtls=${STAGING_DIR_TARGET},--without-mbedtls,mbedtls" +PACKAGECONFIG[mqtt] = "--enable-mqtt,--disable-mqtt," +PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" +PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," +PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy," +PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" +PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp," +PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," +PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp," +PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl" +PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" +PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," +PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" +PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" +PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" + +EXTRA_OECONF = " \ + --disable-libcurl-option \ + --disable-ntlm-wb \ + --enable-crypto-auth \ + --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ + --without-libmetalink \ + --without-libpsl \ + --enable-debug \ + --enable-optimize \ + --disable-curldebug \ +" + +do_install_append_class-target() { + # cleanup buildpaths from curl-config + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + ${D}${bindir}/curl-config +} + +PACKAGES =+ "lib${BPN}" + +FILES_lib${BPN} = "${libdir}/lib*.so.*" +RRECOMMENDS_lib${BPN} += "ca-certificates" + +FILES_${PN} += "${datadir}/zsh" + +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/diffoscope/diffoscope_161.bb b/poky/meta/recipes-support/diffoscope/diffoscope_161.bb deleted file mode 100644 index 0f566a3ec..000000000 --- a/poky/meta/recipes-support/diffoscope/diffoscope_161.bb +++ /dev/null @@ -1,17 +0,0 @@ -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[sha256sum] = "9c27d60a7bf3984b53c8af3fee86eb3d3e2292c4ddb9449c38b6cba068b8e22c" - -RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" - -# Dependencies don't build for musl -COMPATIBLE_HOST_libc-musl = 'null' - -BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-support/diffoscope/diffoscope_163.bb b/poky/meta/recipes-support/diffoscope/diffoscope_163.bb new file mode 100644 index 000000000..2b66d628f --- /dev/null +++ b/poky/meta/recipes-support/diffoscope/diffoscope_163.bb @@ -0,0 +1,17 @@ +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[sha256sum] = "1afeea6e383bdd2626a9e9b827ff487723c0de581d9f9f4d4f5fc9b65728662a" + +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" + +# Dependencies don't build for musl +COMPATIBLE_HOST_libc-musl = 'null' + +BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-support/enchant/enchant2_2.2.13.bb b/poky/meta/recipes-support/enchant/enchant2_2.2.13.bb deleted file mode 100644 index 3b890e733..000000000 --- a/poky/meta/recipes-support/enchant/enchant2_2.2.13.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Enchant Spell checker API Library" -SECTION = "libs" -HOMEPAGE = "https://abiword.github.io/enchant/" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "glib-2.0" - -inherit autotools pkgconfig - -SRC_URI = "https://github.com/AbiWord/enchant/releases/download/v${PV}/enchant-${PV}.tar.gz" -SRC_URI[sha256sum] = "eab9f90d79039133660029616e2a684644bd524be5dc43340d4cfc3fb3c68a20" - -UPSTREAM_CHECK_URI = "https://github.com/AbiWord/enchant/releases" - -S = "${WORKDIR}/enchant-${PV}" - -EXTRA_OEMAKE = "pkgdatadir=${datadir}/enchant-2" - -PACKAGECONFIG ??= "aspell" -PACKAGECONFIG[aspell] = "--with-aspell,--without-aspell,aspell,aspell" -PACKAGECONFIG[hunspell] = "--with-hunspell,--without-hunspell,hunspell,hunspell" - -FILES_${PN} += " \ - ${datadir}/enchant-2 \ - ${libdir}/enchant-2 \ -" -FILES_${PN}-staticdev += "${libdir}/enchant-2/*.a" diff --git a/poky/meta/recipes-support/enchant/enchant2_2.2.14.bb b/poky/meta/recipes-support/enchant/enchant2_2.2.14.bb new file mode 100644 index 000000000..a5080d9c7 --- /dev/null +++ b/poky/meta/recipes-support/enchant/enchant2_2.2.14.bb @@ -0,0 +1,28 @@ +SUMMARY = "Enchant Spell checker API Library" +SECTION = "libs" +HOMEPAGE = "https://abiword.github.io/enchant/" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "glib-2.0" + +inherit autotools pkgconfig + +SRC_URI = "https://github.com/AbiWord/enchant/releases/download/v${PV}/enchant-${PV}.tar.gz" +SRC_URI[sha256sum] = "bf7cc9a410b54c29648c7711dc8f210e7b13768508aaf43cc9c4527d5a9c7a8e" + +UPSTREAM_CHECK_URI = "https://github.com/AbiWord/enchant/releases" + +S = "${WORKDIR}/enchant-${PV}" + +EXTRA_OEMAKE = "pkgdatadir=${datadir}/enchant-2" + +PACKAGECONFIG ??= "aspell" +PACKAGECONFIG[aspell] = "--with-aspell,--without-aspell,aspell,aspell" +PACKAGECONFIG[hunspell] = "--with-hunspell,--without-hunspell,hunspell,hunspell" + +FILES_${PN} += " \ + ${datadir}/enchant-2 \ + ${libdir}/enchant-2 \ +" +FILES_${PN}-staticdev += "${libdir}/enchant-2/*.a" diff --git a/poky/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch b/poky/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch deleted file mode 100644 index c1580418d..000000000 --- a/poky/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f993697af81c37df9c55e0ebedeb1b8b880506ae Mon Sep 17 00:00:00 2001 -From: Richard Leitner -Date: Tue, 5 May 2020 11:59:42 +0200 -Subject: [PATCH] gdbm: fix link failure against gcc-10 - -Copied from gentoo's solution at https://bugs.gentoo.org/show_bug.cgi?id=705898 -Original patch by Sergei Trofimovich - -Original description: - -Before the change on gcc-10 link failed as: -``` - CCLD gdbmtool -ld: ./libgdbmapp.a(parseopt.o):(.bss+0x8): multiple definition of `parseopt_program_args'; - gdbmtool.o:(.data.rel.local+0x260): first defined here -ld: ./libgdbmapp.a(parseopt.o):(.bss+0x10): multiple definition of `parseopt_program_doc'; - gdbmtool.o:(.data.rel.local+0x268): first defined here -``` - -gcc-10 will change the default from -fcommon to fno-common: - https://gcc.gnu.org/PR85678. - -The fix is to avoid multiple definition and rely on -declarations only. - -Upstream-Status: Pending -Signed-off-by: Richard Leitner ---- - src/parseopt.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/parseopt.c b/src/parseopt.c -index 268e080..a4c8576 100644 ---- a/src/parseopt.c -+++ b/src/parseopt.c -@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin) - } - - char *parseopt_program_name; --char *parseopt_program_doc; --char *parseopt_program_args; - const char *program_bug_address = "<" PACKAGE_BUGREPORT ">"; - void (*parseopt_help_hook) (FILE *stream); - --- -2.26.2 - diff --git a/poky/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/poky/meta/recipes-support/gdbm/gdbm_1.18.1.bb deleted file mode 100644 index fbb1fe72d..000000000 --- a/poky/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Key/value database library with extensible hashing" -HOMEPAGE = "http://www.gnu.org/software/gdbm/" -SECTION = "libs" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=241da1b9fe42e642cbb2c24d5e0c4d24" - - -SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ - file://run-ptest \ - file://ptest.patch \ - file://gdbm-fix-link-failure-against-gcc-10.patch \ - " - -SRC_URI[md5sum] = "988dc82182121c7570e0cb8b4fcd5415" -SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc" - -inherit autotools gettext texinfo lib_package ptest - -# Needed for dbm python module -EXTRA_OECONF = "--enable-libgdbm-compat --without-readline" - -# Stop presence of dbm/nbdm on the host contaminating builds -CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" - -BBCLASSEXTEND = "native nativesdk" - -do_install_append () { - # Create a symlink to ndbm.h and gdbm.h in include/gdbm to let other packages to find - # these headers - install -d ${D}${includedir}/gdbm - ln -sf ../ndbm.h ${D}/${includedir}/gdbm/ndbm.h - ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h -} - -RDEPENDS_${PN}-ptest += "diffutils ${PN}-bin" - -do_compile_ptest() { - oe_runmake -C tests buildtests -} - -PACKAGES =+ "${PN}-compat \ - " -FILES_${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS} \ - " diff --git a/poky/meta/recipes-support/gdbm/gdbm_1.19.bb b/poky/meta/recipes-support/gdbm/gdbm_1.19.bb new file mode 100644 index 000000000..1f390a4aa --- /dev/null +++ b/poky/meta/recipes-support/gdbm/gdbm_1.19.bb @@ -0,0 +1,43 @@ +SUMMARY = "Key/value database library with extensible hashing" +HOMEPAGE = "http://www.gnu.org/software/gdbm/" +SECTION = "libs" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=241da1b9fe42e642cbb2c24d5e0c4d24" + + +SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ + file://run-ptest \ + file://ptest.patch \ + " + +SRC_URI[md5sum] = "aeb29c6a90350a4c959cd1df38cd0a7e" +SRC_URI[sha256sum] = "37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc" + +inherit autotools gettext texinfo lib_package ptest + +# Needed for dbm python module +EXTRA_OECONF = "--enable-libgdbm-compat --without-readline" + +# Stop presence of dbm/nbdm on the host contaminating builds +CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" + +BBCLASSEXTEND = "native nativesdk" + +do_install_append () { + # Create a symlink to ndbm.h and gdbm.h in include/gdbm to let other packages to find + # these headers + install -d ${D}${includedir}/gdbm + ln -sf ../ndbm.h ${D}/${includedir}/gdbm/ndbm.h + ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h +} + +RDEPENDS_${PN}-ptest += "diffutils ${PN}-bin" + +do_compile_ptest() { + oe_runmake -C tests buildtests +} + +PACKAGES =+ "${PN}-compat \ + " +FILES_${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS} \ + " diff --git a/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch index c641a1961..a0af2d48d 100644 --- a/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +++ b/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -1,4 +1,4 @@ -From 56343af532389c31eab32c096c9a989c53c78ce0 Mon Sep 17 00:00:00 2001 +From abc5c396aaddaef2e6811362e3e0cc0da28c2b34 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1d05d39..eaaf33c 100644 +index 64cb8c6..3fe9027 100644 --- a/configure.ac +++ b/configure.ac -@@ -1858,7 +1858,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1824,7 +1824,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) diff --git a/poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch b/poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch index 607a09f18..a13b4d5fb 100644 --- a/poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch +++ b/poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch @@ -1,4 +1,4 @@ -From 9a901dbb1c48685f2db6d7b55916c9484e871f16 Mon Sep 17 00:00:00 2001 +From 6c75656b68cb6e38b039ae532bd39437cd6daec5 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 16 Aug 2017 11:18:01 +0800 Subject: [PATCH] dirmngr uses libgpg error @@ -11,20 +11,18 @@ Rebase to 2.1.23 Signed-off-by: Hongxu Jia --- - dirmngr/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + dirmngr/Makefile.am | 1 + + 1 file changed, 1 insertion(+) diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am -index 208a813..292c036 100644 +index 00d3c42..450d873 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am -@@ -90,7 +90,8 @@ endif - dirmngr_LDADD = $(libcommonpth) \ +@@ -101,6 +101,7 @@ dirmngr_LDADD = $(libcommonpth) \ $(DNSLIBS) $(LIBASSUAN_LIBS) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ -- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) -+ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \ -+ $(GPG_ERROR_LIBS) + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \ ++ $(GPG_ERROR_LIBS) \ + $(dirmngr_robj) if USE_LDAP dirmngr_LDADD += $(ldaplibs) - endif diff --git a/poky/meta/recipes-support/gnupg/gnupg/relocate.patch b/poky/meta/recipes-support/gnupg/gnupg/relocate.patch index aa8d1e3cc..7f7812cd4 100644 --- a/poky/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/poky/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From 4005b3342db06749453835720b5a5c2392a90810 Mon Sep 17 00:00:00 2001 +From bd66af2ac7bb6d9294ac8055a55462ba7c4f9c9b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its diff --git a/poky/meta/recipes-support/gnupg/gnupg_2.2.23.bb b/poky/meta/recipes-support/gnupg/gnupg_2.2.23.bb deleted file mode 100644 index c624b67a0..000000000 --- a/poky/meta/recipes-support/gnupg/gnupg_2.2.23.bb +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)" -HOMEPAGE = "http://www.gnupg.org/" -LICENSE = "GPLv3 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \ - file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257" - -DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt" - -inherit autotools gettext texinfo pkgconfig - -UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" -SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch \ - file://0002-use-pkgconfig-instead-of-npth-config.patch \ - file://0003-dirmngr-uses-libgpg-error.patch \ - file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ - file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ - " -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[sha256sum] = "10b55e49d78b3e49f1edb58d7541ecbdad92ddaeeb885b6f486ed23d1cd1da5c" - -EXTRA_OECONF = "--disable-ldap \ - --disable-ccid-driver \ - --with-zlib=${STAGING_LIBDIR}/.. \ - --with-bzip2=${STAGING_LIBDIR}/.. \ - --with-readline=${STAGING_LIBDIR}/.. \ - --enable-gpg-is-gpg2 \ - " - -# A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg) -PACKAGES =+ "${PN}-gpg" -FILES_${PN}-gpg = " \ - ${bindir}/gpg \ - ${bindir}/gpg2 \ - ${bindir}/gpg-agent \ -" - -# Normal package (gnupg) should depend on minimal package (gnupg-gpg) -# to ensure all tools are included. This is done only in non-native -# builds. Native builds don't have sub-packages, so appending RDEPENDS -# in this case breaks recipe parsing. -RDEPENDS_${PN} += "${@ "" if ("native" in d.getVar("PN")) else (d.getVar("PN") + "-gpg")}" - -RRECOMMENDS_${PN} = "pinentry" - -do_configure_prepend () { - # Else these could be used in prefernce to those in aclocal-copy - rm -f ${S}/m4/gpg-error.m4 - rm -f ${S}/m4/libassuan.m4 - rm -f ${S}/m4/ksba.m4 - rm -f ${S}/m4/libgcrypt.m4 -} - -do_install_append() { - ln -sf gpg2 ${D}${bindir}/gpg - ln -sf gpgv2 ${D}${bindir}/gpgv -} - -do_install_append_class-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" -PACKAGECONFIG[gnutls] = "--enable-gnutls, --disable-gnutls, gnutls" -PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/gnupg/gnupg_2.2.26.bb b/poky/meta/recipes-support/gnupg/gnupg_2.2.26.bb new file mode 100644 index 000000000..1c6e68b4b --- /dev/null +++ b/poky/meta/recipes-support/gnupg/gnupg_2.2.26.bb @@ -0,0 +1,80 @@ +SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)" +HOMEPAGE = "http://www.gnupg.org/" +LICENSE = "GPLv3 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \ + file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257" + +DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt" + +inherit autotools gettext texinfo pkgconfig + +UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" +SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch \ + file://0002-use-pkgconfig-instead-of-npth-config.patch \ + file://0003-dirmngr-uses-libgpg-error.patch \ + file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ + file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ + " +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[sha256sum] = "517569e6c9fad22175df16be5900f94c991c41e53612db63c14493e814cfff6d" + +EXTRA_OECONF = "--disable-ldap \ + --disable-ccid-driver \ + --with-zlib=${STAGING_LIBDIR}/.. \ + --with-bzip2=${STAGING_LIBDIR}/.. \ + --with-readline=${STAGING_LIBDIR}/.. \ + --enable-gpg-is-gpg2 \ + " + +# A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg) +PACKAGES =+ "${PN}-gpg" +FILES_${PN}-gpg = " \ + ${bindir}/gpg \ + ${bindir}/gpg2 \ + ${bindir}/gpg-agent \ +" + +# Normal package (gnupg) should depend on minimal package (gnupg-gpg) +# to ensure all tools are included. This is done only in non-native +# builds. Native builds don't have sub-packages, so appending RDEPENDS +# in this case breaks recipe parsing. +RDEPENDS_${PN} += "${@ "" if ("native" in d.getVar("PN")) else (d.getVar("PN") + "-gpg")}" + +RRECOMMENDS_${PN} = "pinentry" + +do_configure_prepend () { + # Else these could be used in prefernce to those in aclocal-copy + rm -f ${S}/m4/gpg-error.m4 + rm -f ${S}/m4/libassuan.m4 + rm -f ${S}/m4/ksba.m4 + rm -f ${S}/m4/libgcrypt.m4 +} + +do_install_append() { + ln -sf gpg2 ${D}${bindir}/gpg + ln -sf gpgv2 ${D}${bindir}/gpgv +} + +do_install_append_class-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" +PACKAGECONFIG[gnutls] = "--enable-gnutls, --disable-gnutls, gnutls" +PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch index 34c8985c1..6eb1edbdb 100644 --- a/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch +++ b/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch @@ -1,3 +1,8 @@ +From 8a5c96057cf305bbeac0d6e0e59ee24fbb9497fe Mon Sep 17 00:00:00 2001 +From: Joe Slater +Date: Wed, 25 Jan 2017 13:52:59 -0800 +Subject: [PATCH] gnutls: account for ARM_EABI + Certain syscall's are not availabe for arm-eabi, so we eliminate reference to them. @@ -5,12 +10,18 @@ Upstream-Status: Pending Signed-off-by: Joe Slater +--- + tests/seccomp.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/seccomp.c b/tests/seccomp.c +index ed14d00..3c5b726 100644 --- a/tests/seccomp.c +++ b/tests/seccomp.c -@@ -49,7 +49,9 @@ int disable_system_calls(void) - } +@@ -53,7 +53,9 @@ int disable_system_calls(void) ADD_SYSCALL(nanosleep, 0); + ADD_SYSCALL(clock_nanosleep, 0); +#if ! defined(__ARM_EABI__) ADD_SYSCALL(time, 0); +#endif diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.6.15.bb b/poky/meta/recipes-support/gnutls/gnutls_3.6.15.bb deleted file mode 100644 index b936db50d..000000000 --- a/poky/meta/recipes-support/gnutls/gnutls_3.6.15.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "GNU Transport Layer Security Library" -HOMEPAGE = "http://www.gnu.org/software/gnutls/" -BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" - -LICENSE = "GPLv3+ & LGPLv2.1+" -LICENSE_${PN} = "LGPLv2.1+" -LICENSE_${PN}-xx = "LGPLv2.1+" -LICENSE_${PN}-bin = "GPLv3+" -LICENSE_${PN}-openssl = "GPLv3+" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ - file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ - file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" - -DEPENDS = "nettle gmp virtual/libiconv libunistring" -DEPENDS_append_libc-musl = " argp-standalone" - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" - -SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ - file://arm_eabi.patch \ - " - -SRC_URI[sha256sum] = "0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558" - -inherit autotools texinfo pkgconfig gettext lib_package gtk-doc - -PACKAGECONFIG ??= "libidn" - -# You must also have CONFIG_SECCOMP enabled in the kernel for -# seccomp to work. -PACKAGECONFIG[seccomp] = "ac_cv_libseccomp=yes,ac_cv_libseccomp=no,libseccomp" -PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn2" -PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" -PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" -PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" - -EXTRA_OECONF = " \ - --enable-doc \ - --disable-libdane \ - --disable-guile \ - --disable-rpath \ - --enable-local-libopts \ - --enable-openssl-compatibility \ - --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ - --with-librt-prefix=${STAGING_DIR_HOST}${prefix} \ - --with-default-trust-store-file=${sysconfdir}/ssl/certs/ca-certificates.crt \ -" - -# Otherwise the tools try and use HOSTTOOLS_DIR/bash as a shell. -export POSIX_SHELL="${base_bindir}/sh" - -LDFLAGS_append_libc-musl = " -largp" - -do_configure_prepend() { - for dir in . lib; do - rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 - done -} - -PACKAGES =+ "${PN}-openssl ${PN}-xx" - -FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" -FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" -FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb b/poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb new file mode 100644 index 000000000..e3ca86b93 --- /dev/null +++ b/poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb @@ -0,0 +1,67 @@ +SUMMARY = "GNU Transport Layer Security Library" +HOMEPAGE = "http://www.gnu.org/software/gnutls/" +BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" + +LICENSE = "GPLv3+ & LGPLv2.1+" +LICENSE_${PN} = "LGPLv2.1+" +LICENSE_${PN}-xx = "LGPLv2.1+" +LICENSE_${PN}-bin = "GPLv3+" +LICENSE_${PN}-openssl = "GPLv3+" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ + file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ + file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" + +DEPENDS = "nettle gmp virtual/libiconv libunistring" +DEPENDS_append_libc-musl = " argp-standalone" + +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" + +SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ + file://arm_eabi.patch \ + " + +SRC_URI[sha256sum] = "49e2a22691d252c9f24a9829b293a8f359095bc5a818351f05f1c0a5188a1df8" + +inherit autotools texinfo pkgconfig gettext lib_package gtk-doc + +PACKAGECONFIG ??= "libidn" + +# You must also have CONFIG_SECCOMP enabled in the kernel for +# seccomp to work. +PACKAGECONFIG[seccomp] = "ac_cv_libseccomp=yes,ac_cv_libseccomp=no,libseccomp" +PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn2" +PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" +PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" +PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" + +EXTRA_OECONF = " \ + --enable-doc \ + --disable-libdane \ + --disable-guile \ + --disable-rpath \ + --enable-local-libopts \ + --enable-openssl-compatibility \ + --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ + --with-librt-prefix=${STAGING_DIR_HOST}${prefix} \ + --with-default-trust-store-file=${sysconfdir}/ssl/certs/ca-certificates.crt \ +" + +# Otherwise the tools try and use HOSTTOOLS_DIR/bash as a shell. +export POSIX_SHELL="${base_bindir}/sh" + +LDFLAGS_append_libc-musl = " -largp" + +do_configure_prepend() { + for dir in . lib; do + rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 + done +} + +PACKAGES =+ "${PN}-openssl ${PN}-xx" + +FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" +FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" +FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/icu/icu_68.1.bb b/poky/meta/recipes-support/icu/icu_68.1.bb deleted file mode 100644 index 98aa6b7be..000000000 --- a/poky/meta/recipes-support/icu/icu_68.1.bb +++ /dev/null @@ -1,150 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ -portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), giving applications the \ -same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its --with-cross-build option when -# cross-compiling. Taken the situation that different builds may share a common sstate-cache -# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" - -EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" - -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end up being compiled - # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk" - -LIC_FILES_CHKSUM = "file://../LICENSE;md5=002d2fdc32d17f0ec06e9a47f2c0c8d0" - -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 = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" -DATA_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-data.zip" -SRC_URI = "${BASE_SRC_URI};name=code \ - ${DATA_SRC_URI};name=data \ - file://filter.json \ - file://fix-install-manx.patch \ - file://0001-icu-Added-armeb-support.patch \ - " - -SRC_URI_append_class-target = "\ - file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ - " -SRC_URI[code.sha256sum] = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d" -SRC_URI[data.sha256sum] = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510" - -UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" -UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" - -EXTRA_OECONF_append_libc-musl = " ac_cv_func_strtod_l=no" - -PACKAGECONFIG ?= "" -PACKAGECONFIG[make-icudata] = ",,," - -do_make_icudata_class-target () { - ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} - cd ${S} - rm -rf data - cp -a ${WORKDIR}/data . - AR='${BUILD_AR}' \ - CC='${BUILD_CC}' \ - CPP='${BUILD_CPP}' \ - CXX='${BUILD_CXX}' \ - RANLIB='${BUILD_RANLIB}' \ - CFLAGS='${BUILD_CFLAGS}' \ - CPPFLAGS='${BUILD_CPPFLAGS}' \ - CXXFLAGS='${BUILD_CXXFLAGS}' \ - LDFLAGS='${BUILD_LDFLAGS}' \ - ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \ - ./runConfigureICU Linux --with-data-packaging=archive - oe_runmake - install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat -} - -do_make_icudata() { - : -} - -addtask make_icudata before do_configure after do_patch diff --git a/poky/meta/recipes-support/icu/icu_68.2.bb b/poky/meta/recipes-support/icu/icu_68.2.bb new file mode 100644 index 000000000..1ca87feee --- /dev/null +++ b/poky/meta/recipes-support/icu/icu_68.2.bb @@ -0,0 +1,150 @@ +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ +portable set of C/C++ and Java libraries for Unicode support, software \ +internationalization (I18N) and globalization (G11N), giving applications the \ +same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" + +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its --with-cross-build option when +# cross-compiling. Taken the situation that different builds may share a common sstate-cache +# into consideration, the native build directory needs to be staged. +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" + +EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" + +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end up being compiled + # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ + -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ + ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk" + +LIC_FILES_CHKSUM = "file://../LICENSE;md5=002d2fdc32d17f0ec06e9a47f2c0c8d0" + +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 = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" +DATA_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-data.zip" +SRC_URI = "${BASE_SRC_URI};name=code \ + ${DATA_SRC_URI};name=data \ + file://filter.json \ + file://fix-install-manx.patch \ + file://0001-icu-Added-armeb-support.patch \ + " + +SRC_URI_append_class-target = "\ + file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ + " +SRC_URI[code.sha256sum] = "c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625" +SRC_URI[data.sha256sum] = "2989b466fa010edc41297e12fdd5ae47c2610ad68b63af1a0bd2a1acfaf497f3" + +UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" +UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" + +EXTRA_OECONF_append_libc-musl = " ac_cv_func_strtod_l=no" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[make-icudata] = ",,," + +do_make_icudata_class-target () { + ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} + cd ${S} + rm -rf data + cp -a ${WORKDIR}/data . + AR='${BUILD_AR}' \ + CC='${BUILD_CC}' \ + CPP='${BUILD_CPP}' \ + CXX='${BUILD_CXX}' \ + RANLIB='${BUILD_RANLIB}' \ + CFLAGS='${BUILD_CFLAGS}' \ + CPPFLAGS='${BUILD_CPPFLAGS}' \ + CXXFLAGS='${BUILD_CXXFLAGS}' \ + LDFLAGS='${BUILD_LDFLAGS}' \ + ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \ + ./runConfigureICU Linux --with-data-packaging=archive + oe_runmake + install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat +} + +do_make_icudata() { + : +} + +addtask make_icudata before do_configure after do_patch diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.1.bb b/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.1.bb deleted file mode 100644 index 43f76dc56..000000000 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -require libcap-ng.inc - -FILESEXTRAPATHS_prepend := "${THISDIR}/libcap-ng:" - -SUMMARY .= " - python" - -inherit lib_package autotools python3native - -DEPENDS += "libcap-ng python3 swig-native" - -S = "${WORKDIR}/libcap-ng-${PV}" - -EXTRA_OECONF += "--with-python --with-python3" -EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" - -do_install_append() { - rm -rf ${D}${bindir} - rm -rf ${D}${libdir}/.debug - rm -f ${D}${libdir}/lib* - rm -rf ${D}${libdir}/pkgconfig - rm -rf ${D}${datadir} - rm -rf ${D}${includedir} -} - -# PACKAGES = "${PN}" - -FILES_${PN} = "${libdir}/python${PYTHON_BASEVERSION}" -FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/.debug/_capng.so" - diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb b/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb new file mode 100644 index 000000000..43f76dc56 --- /dev/null +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb @@ -0,0 +1,29 @@ +require libcap-ng.inc + +FILESEXTRAPATHS_prepend := "${THISDIR}/libcap-ng:" + +SUMMARY .= " - python" + +inherit lib_package autotools python3native + +DEPENDS += "libcap-ng python3 swig-native" + +S = "${WORKDIR}/libcap-ng-${PV}" + +EXTRA_OECONF += "--with-python --with-python3" +EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" + +do_install_append() { + rm -rf ${D}${bindir} + rm -rf ${D}${libdir}/.debug + rm -f ${D}${libdir}/lib* + rm -rf ${D}${libdir}/pkgconfig + rm -rf ${D}${datadir} + rm -rf ${D}${includedir} +} + +# PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/python${PYTHON_BASEVERSION}" +FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/.debug/_capng.so" + diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng.inc b/poky/meta/recipes-support/libcap-ng/libcap-ng.inc index a312b602f..8c52b5d0b 100644 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -7,10 +7,10 @@ LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" -SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ +SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ file://python.patch \ " -SRC_URI[sha256sum] = "f06b17aaca029e245c9a26c698c6cc8a1cf42b58483d93e94ee02b478bdc1055" +SRC_URI[sha256sum] = "52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb b/poky/meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb deleted file mode 100644 index 6e6de4549..000000000 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -require libcap-ng.inc - -inherit lib_package autotools - -EXTRA_OECONF += "--without-python --without-python3" - -BBCLASSEXTEND = "native nativesdk" - -do_install_append() { - # Moving libcap-ng to base_libdir - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mkdir -p ${D}/${base_libdir}/ - mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/ - relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} - ln -sf ${relpath}/libcap-ng.so.0.0.0 ${D}${libdir}/libcap-ng.so - fi -} diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb b/poky/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb new file mode 100644 index 000000000..6e6de4549 --- /dev/null +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb @@ -0,0 +1,17 @@ +require libcap-ng.inc + +inherit lib_package autotools + +EXTRA_OECONF += "--without-python --without-python3" + +BBCLASSEXTEND = "native nativesdk" + +do_install_append() { + # Moving libcap-ng to base_libdir + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mkdir -p ${D}/${base_libdir}/ + mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/ + relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} + ln -sf ${relpath}/libcap-ng.so.0.0.0 ${D}${libdir}/libcap-ng.so + fi +} diff --git a/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch b/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch index 3c737b884..d2653afb7 100644 --- a/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch +++ b/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch @@ -1,4 +1,4 @@ -From c22c6c16362c7dbc8d6faea06edee5e07759c5fa Mon Sep 17 00:00:00 2001 +From 6aa15fe548e5b1d6ca3b373779beb7521ea95ba9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 15 Jan 2020 17:16:28 +0100 Subject: [PATCH] tests: do not statically link a test @@ -7,7 +7,6 @@ This fails on e.g. centos 7 Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin - --- progs/Makefile | 2 +- tests/Makefile | 4 ++-- @@ -27,7 +26,7 @@ index 1d7fc7a..37db8f7 100644 sudotest: test tcapsh-static sudo $(LDPATH) ./quicktest.sh diff --git a/tests/Makefile b/tests/Makefile -index 3431df9..727fb86 100644 +index 01f7589..094ec57 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes) @@ -36,7 +35,7 @@ index 3431df9..727fb86 100644 else -LDFLAGS += --static +LDFLAGS += - DEPS=../libcap/libcap.a ../progs/tcapsh-static + DEPS=../libcap/libcap.a ifeq ($(PTHREADS),yes) DEPS += ../libcap/libpsx.a @@ -106,7 +106,7 @@ noexploit: exploit.o $(DEPS) @@ -48,3 +47,6 @@ index 3431df9..727fb86 100644 clean: rm -f psx_test libcap_psx_test libcap_launch_test *~ +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libcap/libcap_2.45.bb b/poky/meta/recipes-support/libcap/libcap_2.45.bb deleted file mode 100644 index 067ba32d9..000000000 --- a/poky/meta/recipes-support/libcap/libcap_2.45.bb +++ /dev/null @@ -1,76 +0,0 @@ -SUMMARY = "Library for getting/setting POSIX.1e capabilities" -HOMEPAGE = "http://sites.google.com/site/fullycapable/" - -# no specific GPL version required -LICENSE = "BSD | GPLv2" -LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" - -DEPENDS = "hostperl-runtime-native gperf-native" - -SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \ - file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \ - file://0002-tests-do-not-run-target-executables.patch \ - file://0001-tests-do-not-statically-link-a-test.patch \ - " -SRC_URI[sha256sum] = "d66639f765c0e10557666b00f519caf0bd07a95f867dddaee131cd284fac3286" - -UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" - -inherit lib_package - -# do NOT pass target cflags to host compilations -# -do_configure() { - # libcap uses := for compilers, fortunately, it gives us a hint - # on what should be replaced with ?= - sed -e 's,:=,?=,g' -i Make.Rules - sed -e 's,^BUILD_CFLAGS ?= ,BUILD_CFLAGS := $(BUILD_CFLAGS) ,' -i Make.Rules -} - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG_class-native ??= "" - -PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam" - -EXTRA_OEMAKE = " \ - INDENT= \ - lib='${baselib}' \ - RAISE_SETFCAP=no \ - DYNAMIC=yes \ - BUILD_GPERF=yes \ -" - -EXTRA_OEMAKE_append_class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}" - -# these are present in the libcap defaults, so include in our CFLAGS too -CFLAGS += "-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" - -do_compile() { - oe_runmake ${PACKAGECONFIG_CONFARGS} -} - -do_install() { - oe_runmake install \ - ${PACKAGECONFIG_CONFARGS} \ - DESTDIR="${D}" \ - prefix="${prefix}" \ - SBINDIR="${sbindir}" -} - -do_install_append() { - # Move the library to base_libdir - install -d ${D}${base_libdir} - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mv ${D}${libdir}/libcap* ${D}${base_libdir} - if [ -d ${D}${libdir}/security ]; then - mv ${D}${libdir}/security ${D}${base_libdir} - fi - fi -} - -FILES_${PN}-dev += "${base_libdir}/*.so" - -# pam files -FILES_${PN} += "${base_libdir}/security/*.so" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libcap/libcap_2.46.bb b/poky/meta/recipes-support/libcap/libcap_2.46.bb new file mode 100644 index 000000000..605a73812 --- /dev/null +++ b/poky/meta/recipes-support/libcap/libcap_2.46.bb @@ -0,0 +1,76 @@ +SUMMARY = "Library for getting/setting POSIX.1e capabilities" +HOMEPAGE = "http://sites.google.com/site/fullycapable/" + +# no specific GPL version required +LICENSE = "BSD | GPLv2" +LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" + +DEPENDS = "hostperl-runtime-native gperf-native" + +SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \ + file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \ + file://0002-tests-do-not-run-target-executables.patch \ + file://0001-tests-do-not-statically-link-a-test.patch \ + " +SRC_URI[sha256sum] = "4ed3d11413fa6c9667e49f819808fbb581cd8864b839f87d7c2a02c70f21d8b4" + +UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" + +inherit lib_package + +# do NOT pass target cflags to host compilations +# +do_configure() { + # libcap uses := for compilers, fortunately, it gives us a hint + # on what should be replaced with ?= + sed -e 's,:=,?=,g' -i Make.Rules + sed -e 's,^BUILD_CFLAGS ?= ,BUILD_CFLAGS := $(BUILD_CFLAGS) ,' -i Make.Rules +} + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG_class-native ??= "" + +PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam" + +EXTRA_OEMAKE = " \ + INDENT= \ + lib='${baselib}' \ + RAISE_SETFCAP=no \ + DYNAMIC=yes \ + BUILD_GPERF=yes \ +" + +EXTRA_OEMAKE_append_class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}" + +# these are present in the libcap defaults, so include in our CFLAGS too +CFLAGS += "-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" + +do_compile() { + oe_runmake ${PACKAGECONFIG_CONFARGS} +} + +do_install() { + oe_runmake install \ + ${PACKAGECONFIG_CONFARGS} \ + DESTDIR="${D}" \ + prefix="${prefix}" \ + SBINDIR="${sbindir}" +} + +do_install_append() { + # Move the library to base_libdir + install -d ${D}${base_libdir} + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mv ${D}${libdir}/libcap* ${D}${base_libdir} + if [ -d ${D}${libdir}/security ]; then + mv ${D}${libdir}/security ${D}${base_libdir} + fi + fi +} + +FILES_${PN}-dev += "${base_libdir}/*.so" + +# pam files +FILES_${PN} += "${base_libdir}/security/*.so" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libexif/files/CVE-2020-0198.patch b/poky/meta/recipes-support/libexif/files/CVE-2020-0198.patch new file mode 100644 index 000000000..2a48844cb --- /dev/null +++ b/poky/meta/recipes-support/libexif/files/CVE-2020-0198.patch @@ -0,0 +1,66 @@ +From ca71eda33fe8421f98fbe20eb4392473357c1c43 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Wed, 30 Dec 2020 10:22:47 +0800 +Subject: [PATCH] fixed another unsigned integer overflow + +first fixed by google in android fork, +https://android.googlesource.com/platform/external/libexif/+/1e187b62682ffab5003c702657d6d725b4278f16%5E%21/#F0 + +(use a more generic overflow check method, also check second overflow instance.) + +https://security-tracker.debian.org/tracker/CVE-2020-0198 + +Upstream-Status: Backport[https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c] +CVE: CVE-2020-0198 + +Signed-off-by: Changqing Li +--- + libexif/exif-data.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/libexif/exif-data.c b/libexif/exif-data.c +index 8b280d3..34d58fc 100644 +--- a/libexif/exif-data.c ++++ b/libexif/exif-data.c +@@ -47,6 +47,8 @@ + #undef JPEG_MARKER_APP1 + #define JPEG_MARKER_APP1 0xe1 + ++#define CHECKOVERFLOW(offset,datasize,structsize) (( offset >= datasize) || (structsize > datasize) || (offset > datasize - structsize )) ++ + static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; + + struct _ExifDataPrivate +@@ -327,7 +329,7 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o); + return; + } +- if (s > ds - o) { ++ if (CHECKOVERFLOW(o,ds,s)) { + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o); + return; + } +@@ -420,9 +422,9 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + } + + /* Read the number of entries */ +- if ((offset + 2 < offset) || (offset + 2 < 2) || (offset + 2 > ds)) { ++ if (CHECKOVERFLOW(offset, ds, 2)) { + exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", +- "Tag data past end of buffer (%u > %u)", offset+2, ds); ++ "Tag data past end of buffer (%u+2 > %u)", offset, ds); + return; + } + n = exif_get_short (d + offset, data->priv->order); +@@ -431,7 +433,7 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + offset += 2; + + /* Check if we have enough data. */ +- if (offset + 12 * n > ds) { ++ if (CHECKOVERFLOW(offset, ds, 12*n)) { + n = (ds - offset) / 12; + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", + "Short data; only loading %hu entries...", n); +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libexif/files/CVE-2020-0452.patch b/poky/meta/recipes-support/libexif/files/CVE-2020-0452.patch new file mode 100644 index 000000000..a117b8b36 --- /dev/null +++ b/poky/meta/recipes-support/libexif/files/CVE-2020-0452.patch @@ -0,0 +1,39 @@ +From 302acd49eba0a125b0f20692df6abc6f7f7ca53e Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Wed, 30 Dec 2020 10:18:51 +0800 +Subject: [PATCH] fixed a incorrect overflow check that could be optimized + away. + +inspired by: +https://android.googlesource.com/platform/external/libexif/+/8e7345f3bc0bad06ac369d6cbc1124c8ceaf7d4b + +https://source.android.com/security/bulletin/2020-11-01 + +CVE-2020-0452 + +Upsteam-Status: Backport[https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06] +CVE: CVE-2020-0452 + +Signed-off-by: Changqing Li +--- + libexif/exif-entry.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c +index 5de215f..3a6ce84 100644 +--- a/libexif/exif-entry.c ++++ b/libexif/exif-entry.c +@@ -1371,8 +1371,8 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen) + { + unsigned char *utf16; + +- /* Sanity check the size to prevent overflow */ +- if (e->size+sizeof(uint16_t)+1 < e->size) break; ++ /* Sanity check the size to prevent overflow. Note EXIF files are 64kb at most. */ ++ if (e->size >= 65536 - sizeof(uint16_t)*2) break; + + /* The tag may not be U+0000-terminated , so make a local + U+0000-terminated copy before converting it */ +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libexif/libexif_0.6.22.bb b/poky/meta/recipes-support/libexif/libexif_0.6.22.bb index 2478ba07d..dc30926c5 100644 --- a/poky/meta/recipes-support/libexif/libexif_0.6.22.bb +++ b/poky/meta/recipes-support/libexif/libexif_0.6.22.bb @@ -8,6 +8,8 @@ def version_underscore(v): return "_".join(v.split(".")) SRC_URI = "https://github.com/libexif/libexif/releases/download/libexif-${@version_underscore("${PV}")}-release/libexif-${PV}.tar.xz \ + file://CVE-2020-0198.patch \ + file://CVE-2020-0452.patch \ " SRC_URI[sha256sum] = "5048f1c8fc509cc636c2f97f4b40c293338b6041a5652082d5ee2cf54b530c56" diff --git a/poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch b/poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch deleted file mode 100644 index 57b336c0c..000000000 --- a/poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ce091718716400119d6be6bd637c0e3f4f6ca315 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Thu, 21 Nov 2019 08:07:41 -0600 -Subject: [PATCH] Make man pages reproducible - -Instructs the man page to be gzip'ed without the file name or timestamp -so that it builds reproducibly. - -Upstream-Status: Backport [https://github.com/smuellerDD/jitterentropy-library/pull/14] -Signed-off-by: Joshua Watt ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 2e78607..860b720 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,7 +60,7 @@ cppcheck: - install: - install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 - install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ -- gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 -+ gzip -n -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) - $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) --- -2.23.0 - diff --git a/poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch b/poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch deleted file mode 100644 index 9af334ce2..000000000 --- a/poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 060b9b4147f6e5ff386a8b017796118d783e59fa Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Tue, 22 Oct 2019 12:44:30 -0500 -Subject: [PATCH] Makefile: cleanup install for rebuilds - -Support the ability to rebuild and redeploy without a clean. This -required some force linking and man archive creation. - -Provide the ability to override the stripping of the shared lib for -cases where a embedded target build may want to control stripping -or provide cross arch tools. - -Upstream-Status: Backport [060b9b4147f6e5ff386a8b017796118d783e59fa] -Signed-off-by: Matthew Weber -Signed-off-by: Stephan Mueller -Signed-off-by: Joshua Watt ---- - Makefile | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 4ff069b..2e78607 100644 ---- a/Makefile -+++ b/Makefile -@@ -14,6 +14,8 @@ LIBDIR := lib - # include target directory - INCDIR := include - -+INSTALL_STRIP ?= install -s -+ - NAME := jitterentropy - LIBMAJOR=$(shell cat jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}') - LIBMINOR=$(shell cat jitterentropy-base.c | grep define | grep MINVERSION | awk '{print $$3}') -@@ -58,15 +60,15 @@ cppcheck: - install: - install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 - install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ -- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 -+ gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) -- install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ -+ $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) - install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ - install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ - $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) -- ln -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) -- ln -s lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so -+ ln -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) -+ ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so - - clean: - @- $(RM) $(NAME) --- -2.23.0 - diff --git a/poky/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb b/poky/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb deleted file mode 100644 index 710ef0172..000000000 --- a/poky/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Hardware RNG based on CPU timing jitter" -DESCRIPTION = "The Jitter RNG provides a noise source using the CPU execution timing jitter. \ -It does not depend on any system resource other than a high-resolution time \ -stamp. It is a small-scale, yet fast entropy source that is viable in almost \ -all environments and on a lot of CPU architectures." -HOMEPAGE = "http://www.chronox.de/jent.html" -LICENSE = "GPLv2+ | BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=a95aadbdfae7ed812bb2b7b86eb5981c \ - file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ - " -SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git \ - file://0001-Makefile-cleanup-install-for-rebuilds.patch \ - file://0001-Make-man-pages-reproducible.patch" -SRCREV = "933a44f33ed3d6612f7cfaa7ad1207c8da4886ba" -S = "${WORKDIR}/git" - -do_configure[noexec] = "1" - -LDFLAGS += "-Wl,-O0" - -do_install () { - oe_runmake install INCDIR="/include" \ - DESTDIR="${D}" \ - PREFIX="${exec_prefix}" \ - LIBDIR="${baselib}" \ - INSTALL_STRIP="install" -} - diff --git a/poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb b/poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb new file mode 100644 index 000000000..953ecfd05 --- /dev/null +++ b/poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "Hardware RNG based on CPU timing jitter" +DESCRIPTION = "The Jitter RNG provides a noise source using the CPU execution timing jitter. \ +It does not depend on any system resource other than a high-resolution time \ +stamp. It is a small-scale, yet fast entropy source that is viable in almost \ +all environments and on a lot of CPU architectures." +HOMEPAGE = "http://www.chronox.de/jent.html" +LICENSE = "GPLv2+ | BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb16b29576d4c43a9dcd6a40fb3310c7 \ + file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ + " +SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git" +SRCREV = "a37e57d9b939d1f93a1b92e1486edd44a3c1cb4c" +S = "${WORKDIR}/git" + +do_configure[noexec] = "1" + +LDFLAGS += "-Wl,-O0" + +do_install () { + oe_runmake install INCDIR="/include" \ + DESTDIR="${D}" \ + PREFIX="${exec_prefix}" \ + LIBDIR="${baselib}" \ + INSTALL_STRIP="install" +} + diff --git a/poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch index ebb7fa588..af96bd57c 100644 --- a/poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch +++ b/poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch @@ -1,4 +1,4 @@ -From 7bd2b060e9ea3e2ff11e67d1e98ab882819b28b7 Mon Sep 17 00:00:00 2001 +From 6081640895b6d566fa21123e2de7d111eeab5c4c Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 3 Dec 2012 18:17:31 +0800 Subject: [PATCH] libksba: add pkgconfig support @@ -11,11 +11,15 @@ They think pkgconfig adds no portability and maintaining them is not worthwhile. Signed-off-by: Chen Qi +--- + src/ksba.m4 | 90 +++-------------------------------------------------- + 1 file changed, 4 insertions(+), 86 deletions(-) + diff --git a/src/ksba.m4 b/src/ksba.m4 -index ad8de4f..af903ad 100644 +index 6b55bb8..6e7336f 100644 --- a/src/ksba.m4 +++ b/src/ksba.m4 -@@ -22,37 +22,6 @@ dnl with a changed API. +@@ -23,37 +23,6 @@ dnl with a changed API. dnl AC_DEFUN([AM_PATH_KSBA], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -23,7 +27,7 @@ index ad8de4f..af903ad 100644 - dnl since that is consistent with how our three siblings use the directory/ - dnl package name in --with-$dir_name-prefix=PFX. - AC_ARG_WITH(libksba-prefix, -- AC_HELP_STRING([--with-libksba-prefix=PFX], +- AS_HELP_STRING([--with-libksba-prefix=PFX], - [prefix where KSBA is installed (optional)]), - ksba_config_prefix="$withval", ksba_config_prefix="") - @@ -53,7 +57,7 @@ index ad8de4f..af903ad 100644 tmp=ifelse([$1], ,1:1.0.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then -@@ -63,56 +32,13 @@ AC_DEFUN([AM_PATH_KSBA], +@@ -64,56 +33,13 @@ AC_DEFUN([AM_PATH_KSBA], min_ksba_version="$tmp" fi @@ -113,7 +117,7 @@ index ad8de4f..af903ad 100644 if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([KSBA API version]) if test "$req_ksba_api" -eq "$tmp" ; then -@@ -125,14 +51,8 @@ AC_DEFUN([AM_PATH_KSBA], +@@ -126,14 +52,8 @@ AC_DEFUN([AM_PATH_KSBA], fi fi if test $ok = yes; then @@ -129,7 +133,7 @@ index ad8de4f..af903ad 100644 if test x"$libksba_config_host" != xnone ; then if test x"$libksba_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -146,8 +66,6 @@ AC_DEFUN([AM_PATH_KSBA], +@@ -147,8 +67,6 @@ AC_DEFUN([AM_PATH_KSBA], fi fi else diff --git a/poky/meta/recipes-support/libksba/libksba_1.4.0.bb b/poky/meta/recipes-support/libksba/libksba_1.4.0.bb deleted file mode 100644 index a9daf22d7..000000000 --- a/poky/meta/recipes-support/libksba/libksba_1.4.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Easy API to create and parse X.509 and CMS related objects" -HOMEPAGE = "http://www.gnupg.org/related_software/libksba/" -LICENSE = "GPLv3+ & (GPLv2+ | LGPLv3+)" -LICENSE_${PN} = "GPLv2+ | LGPLv3+" -LICENSE_${PN}-doc = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=fd541d83f75d038c4e0617b672ed8bda \ - file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ - file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - " - -DEPENDS = "libgpg-error" - -BINCONFIG = "${bindir}/ksba-config" - -inherit autotools binconfig-disabled pkgconfig texinfo - -UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" -SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://ksba-add-pkgconfig-support.patch" - -SRC_URI[sha256sum] = "bfe6a8e91ff0f54d8a329514db406667000cb207238eded49b599761bfca41b6" - -do_configure_prepend () { - # Else these could be used in preference to those in aclocal-copy - rm -f ${S}/m4/gpg-error.m4 -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libksba/libksba_1.5.0.bb b/poky/meta/recipes-support/libksba/libksba_1.5.0.bb new file mode 100644 index 000000000..005389eab --- /dev/null +++ b/poky/meta/recipes-support/libksba/libksba_1.5.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "Easy API to create and parse X.509 and CMS related objects" +HOMEPAGE = "http://www.gnupg.org/related_software/libksba/" +LICENSE = "GPLv3+ & (GPLv2+ | LGPLv3+)" +LICENSE_${PN} = "GPLv2+ | LGPLv3+" +LICENSE_${PN}-doc = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=fd541d83f75d038c4e0617b672ed8bda \ + file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ + file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + " + +DEPENDS = "libgpg-error" + +BINCONFIG = "${bindir}/ksba-config" + +inherit autotools binconfig-disabled pkgconfig texinfo + +UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" +SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://ksba-add-pkgconfig-support.patch" + +SRC_URI[sha256sum] = "ae4af129216b2d7fdea0b5bf2a788cd458a79c983bb09a43f4d525cc87aba0ba" + +do_configure_prepend () { + # Else these could be used in preference to those in aclocal-copy + rm -f ${S}/m4/gpg-error.m4 +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libpcre/libpcre2_10.35.bb b/poky/meta/recipes-support/libpcre/libpcre2_10.35.bb deleted file mode 100644 index 35c019c10..000000000 --- a/poky/meta/recipes-support/libpcre/libpcre2_10.35.bb +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION = "There are two major versions of the PCRE library. The \ -newest version is PCRE2, which is a re-working of the original PCRE \ -library to provide an entirely new API. The original, very widely \ -deployed PCRE library's API and feature are stable, future releases \ - will be for bugfixes only. All new future features will be to PCRE2, \ -not the original PCRE 8.x series." -SUMMARY = "Perl Compatible Regular Expressions version 2" -HOMEPAGE = "http://www.pcre.org" -SECTION = "devel" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=a06590e9bd4c229532364727aaeaf084" - -SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2" - -SRC_URI[sha256sum] = "9ccba8e02b0ce78046cdfb52e5c177f0f445e421059e43becca4359c669d4613" - -CVE_PRODUCT = "pcre2" - -S = "${WORKDIR}/pcre2-${PV}" - -PROVIDES += "pcre2" -DEPENDS += "bzip2 zlib" - -BINCONFIG = "${bindir}/pcre2-config" - -inherit autotools binconfig-disabled - -EXTRA_OECONF = "\ - --enable-newline-is-lf \ - --with-link-size=2 \ - --with-match-limit=10000000 \ - --enable-pcre2-16 \ - --enable-pcre2-32 \ -" -CFLAGS += "-D_REENTRANT" -CXXFLAGS_append_powerpc = " -lstdc++" - -PACKAGES =+ "libpcre2-16 libpcre2-32 pcre2grep pcre2grep-doc pcre2test pcre2test-doc" - -SUMMARY_pcre2grep = "grep utility that uses perl 5 compatible regexes" -SUMMARY_pcre2grep-doc = "grep utility that uses perl 5 compatible regexes - docs" -SUMMARY_pcre2test = "program for testing Perl-comatible regular expressions" -SUMMARY_pcre2test-doc = "program for testing Perl-comatible regular expressions - docs" - -FILES_libpcre2-16 = "${libdir}/libpcre2-16.so.*" -FILES_libpcre2-32 = "${libdir}/libpcre2-32.so.*" -FILES_pcre2grep = "${bindir}/pcre2grep" -FILES_pcre2grep-doc = "${mandir}/man1/pcre2grep.1" -FILES_pcre2test = "${bindir}/pcre2test" -FILES_pcre2test-doc = "${mandir}/man1/pcre2test.1" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libpcre/libpcre2_10.36.bb b/poky/meta/recipes-support/libpcre/libpcre2_10.36.bb new file mode 100644 index 000000000..d8077a122 --- /dev/null +++ b/poky/meta/recipes-support/libpcre/libpcre2_10.36.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "There are two major versions of the PCRE library. The \ +newest version is PCRE2, which is a re-working of the original PCRE \ +library to provide an entirely new API. The original, very widely \ +deployed PCRE library's API and feature are stable, future releases \ + will be for bugfixes only. All new future features will be to PCRE2, \ +not the original PCRE 8.x series." +SUMMARY = "Perl Compatible Regular Expressions version 2" +HOMEPAGE = "http://www.pcre.org" +SECTION = "devel" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENCE;md5=60c08fab1357bfe9084b333bc33362d6" + +SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2" + +SRC_URI[sha256sum] = "a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c" + +CVE_PRODUCT = "pcre2" + +S = "${WORKDIR}/pcre2-${PV}" + +PROVIDES += "pcre2" +DEPENDS += "bzip2 zlib" + +BINCONFIG = "${bindir}/pcre2-config" + +inherit autotools binconfig-disabled + +EXTRA_OECONF = "\ + --enable-newline-is-lf \ + --with-link-size=2 \ + --with-match-limit=10000000 \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ +" +CFLAGS += "-D_REENTRANT" +CXXFLAGS_append_powerpc = " -lstdc++" + +PACKAGES =+ "libpcre2-16 libpcre2-32 pcre2grep pcre2grep-doc pcre2test pcre2test-doc" + +SUMMARY_pcre2grep = "grep utility that uses perl 5 compatible regexes" +SUMMARY_pcre2grep-doc = "grep utility that uses perl 5 compatible regexes - docs" +SUMMARY_pcre2test = "program for testing Perl-comatible regular expressions" +SUMMARY_pcre2test-doc = "program for testing Perl-comatible regular expressions - docs" + +FILES_libpcre2-16 = "${libdir}/libpcre2-16.so.*" +FILES_libpcre2-32 = "${libdir}/libpcre2-32.so.*" +FILES_pcre2grep = "${bindir}/pcre2grep" +FILES_pcre2grep-doc = "${mandir}/man1/pcre2grep.1" +FILES_pcre2test = "${bindir}/pcre2test" +FILES_pcre2test-doc = "${mandir}/man1/pcre2test.1" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libusb/libusb1_1.0.23.bb b/poky/meta/recipes-support/libusb/libusb1_1.0.23.bb deleted file mode 100644 index 2fd658b4e..000000000 --- a/poky/meta/recipes-support/libusb/libusb1_1.0.23.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Userspace library to access USB (version 1.0)" -HOMEPAGE = "http://libusb.sf.net" -BUGTRACKER = "http://www.libusb.org/report" -SECTION = "libs" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ - file://run-ptest \ - " - -SRC_URI[md5sum] = "be79ed4a4a440169deec8beaac6aae33" -SRC_URI[sha256sum] = "4fc17b2ef3502757641bf8fe2c14ad86ec86302a2b785abcb0806fd03aa1201f" - -S = "${WORKDIR}/libusb-${PV}" - -inherit autotools pkgconfig ptest - -PACKAGECONFIG_class-target ??= "udev" -PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" - -EXTRA_OECONF = "--libdir=${base_libdir}" - -do_install_append() { - install -d ${D}${libdir} - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} - fi -} - -do_compile_ptest() { - oe_runmake -C tests stress -} - -do_install_ptest() { - install -m 755 ${B}/tests/.libs/stress ${D}${PTEST_PATH} -} - -FILES_${PN} += "${base_libdir}/*.so.*" - -FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" diff --git a/poky/meta/recipes-support/libusb/libusb1_1.0.24.bb b/poky/meta/recipes-support/libusb/libusb1_1.0.24.bb new file mode 100644 index 000000000..4c552ae6c --- /dev/null +++ b/poky/meta/recipes-support/libusb/libusb1_1.0.24.bb @@ -0,0 +1,43 @@ +SUMMARY = "Userspace library to access USB (version 1.0)" +HOMEPAGE = "http://libusb.sf.net" +BUGTRACKER = "http://www.libusb.org/report" +SECTION = "libs" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ + file://run-ptest \ + " + +SRC_URI[sha256sum] = "7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a" + +S = "${WORKDIR}/libusb-${PV}" + +inherit autotools pkgconfig ptest + +PACKAGECONFIG_class-target ??= "udev" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" + +EXTRA_OECONF = "--libdir=${base_libdir}" + +do_install_append() { + install -d ${D}${libdir} + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + fi +} + +do_compile_ptest() { + oe_runmake -C tests stress +} + +do_install_ptest() { + install -m 755 ${B}/tests/.libs/stress ${D}${PTEST_PATH} +} + +FILES_${PN} += "${base_libdir}/*.so.*" + +FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" diff --git a/poky/meta/recipes-support/nettle/nettle_3.6.bb b/poky/meta/recipes-support/nettle/nettle_3.6.bb index 90f8625ae..7c1b1a2d5 100644 --- a/poky/meta/recipes-support/nettle/nettle_3.6.bb +++ b/poky/meta/recipes-support/nettle/nettle_3.6.bb @@ -1,5 +1,8 @@ SUMMARY = "A low level cryptographic library" HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/" +DESCRIPTION = "It tries to solve a problem of providing a common set of \ +cryptographic algorithms for higher-level applications by implementing a \ +context-independent set of cryptographic algorithms" SECTION = "libs" LICENSE = "LGPLv3+ | GPLv2+" diff --git a/poky/meta/recipes-support/sqlite/sqlite3_3.33.0.bb b/poky/meta/recipes-support/sqlite/sqlite3_3.33.0.bb deleted file mode 100644 index 33f041a16..000000000 --- a/poky/meta/recipes-support/sqlite/sqlite3_3.33.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -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[sha256sum] = "106a2c48c7f75a298a7557bcc0d5f4f454e5b43811cc738b7ca294d6956bbb15" - -# -19242 is only an issue in specific development branch commits -CVE_CHECK_WHITELIST += "CVE-2019-19242" -# This is believed to be iOS specific (https://groups.google.com/g/sqlite-dev/c/U7OjAbZO6LA) -CVE_CHECK_WHITELIST += "CVE-2015-3717" diff --git a/poky/meta/recipes-support/sqlite/sqlite3_3.34.0.bb b/poky/meta/recipes-support/sqlite/sqlite3_3.34.0.bb new file mode 100644 index 000000000..19996fc06 --- /dev/null +++ b/poky/meta/recipes-support/sqlite/sqlite3_3.34.0.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[sha256sum] = "bf6db7fae37d51754737747aaaf413b4d6b3b5fbacd52bdb2d0d6e5b2edd9aee" + +# -19242 is only an issue in specific development branch commits +CVE_CHECK_WHITELIST += "CVE-2019-19242" +# This is believed to be iOS specific (https://groups.google.com/g/sqlite-dev/c/U7OjAbZO6LA) +CVE_CHECK_WHITELIST += "CVE-2015-3717" diff --git a/poky/scripts/lib/devtool/upgrade.py b/poky/scripts/lib/devtool/upgrade.py index 0c1de8cdc..5a057e95f 100644 --- a/poky/scripts/lib/devtool/upgrade.py +++ b/poky/scripts/lib/devtool/upgrade.py @@ -178,7 +178,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee uri, rev = _get_uri(crd) if srcrev: rev = srcrev - if uri.startswith('git://'): + if uri.startswith('git://') or uri.startswith('gitsm://'): __run('git fetch') __run('git checkout %s' % rev) __run('git tag -f devtool-base-new') @@ -270,7 +270,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee else: logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) if not skiptag: - if uri.startswith('git://'): + if uri.startswith('git://') or uri.startswith('gitsm://'): suffix = 'new' else: suffix = newpv diff --git a/poky/scripts/lib/wic/ksparser.py b/poky/scripts/lib/wic/ksparser.py index 913e3283d..3eb669da3 100644 --- a/poky/scripts/lib/wic/ksparser.py +++ b/poky/scripts/lib/wic/ksparser.py @@ -229,6 +229,23 @@ class KickStart(): err = "%s:%d: SquashFS does not support LABEL" \ % (confpath, lineno) raise KickStartError(err) + if parsed.fstype == 'msdos' or parsed.fstype == 'vfat': + if parsed.fsuuid: + if parsed.fsuuid.upper().startswith('0X'): + if len(parsed.fsuuid) > 10: + err = "%s:%d: fsuuid %s given in wks kickstart file " \ + "exceeds the length limit for %s filesystem. " \ + "It should be in the form of a 32 bit hexadecimal" \ + "number (for example, 0xABCD1234)." \ + % (confpath, lineno, parsed.fsuuid, parsed.fstype) + raise KickStartError(err) + elif len(parsed.fsuuid) > 8: + err = "%s:%d: fsuuid %s given in wks kickstart file " \ + "exceeds the length limit for %s filesystem. " \ + "It should be in the form of a 32 bit hexadecimal" \ + "number (for example, 0xABCD1234)." \ + % (confpath, lineno, parsed.fsuuid, parsed.fstype) + raise KickStartError(err) if parsed.use_label and not parsed.label: err = "%s:%d: Must set the label with --label" \ % (confpath, lineno) diff --git a/poky/scripts/lib/wic/partition.py b/poky/scripts/lib/wic/partition.py index ebe250b00..286c7867c 100644 --- a/poky/scripts/lib/wic/partition.py +++ b/poky/scripts/lib/wic/partition.py @@ -207,11 +207,21 @@ class Partition(): p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot) if (pseudo_dir): + # Canonicalize the ignore paths. This corresponds to + # calling oe.path.canonicalize(), which is used in bitbake.conf. + ignore_paths = [rootfs] + (get_bitbake_var("PSEUDO_IGNORE_PATHS") or "").split(",") + canonical_paths = [] + for path in ignore_paths: + if "$" not in path: + trailing_slash = path.endswith("/") and "/" or "" + canonical_paths.append(os.path.realpath(path) + trailing_slash) + ignore_paths = ",".join(canonical_paths) + pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix pseudo += "export PSEUDO_LOCALSTATEDIR=%s;" % pseudo_dir pseudo += "export PSEUDO_PASSWD=%s;" % rootfs_dir pseudo += "export PSEUDO_NOSYMLINKEXP=1;" - pseudo += "export PSEUDO_IGNORE_PATHS=%s;" % (rootfs + "," + (get_bitbake_var("PSEUDO_IGNORE_PATHS") or "")) + pseudo += "export PSEUDO_IGNORE_PATHS=%s;" % ignore_paths pseudo += "%s " % get_bitbake_var("FAKEROOTCMD") else: pseudo = None diff --git a/poky/scripts/lib/wic/plugins/imager/direct.py b/poky/scripts/lib/wic/plugins/imager/direct.py index 55db826e9..0ca67b77d 100644 --- a/poky/scripts/lib/wic/plugins/imager/direct.py +++ b/poky/scripts/lib/wic/plugins/imager/direct.py @@ -343,6 +343,13 @@ class PartitionedImage(): part.fsuuid = '0x' + str(uuid.uuid4())[:8].upper() else: part.fsuuid = str(uuid.uuid4()) + else: + #make sure the fsuuid for vfat/msdos align with format 0xYYYYYYYY + if part.fstype == 'vfat' or part.fstype == 'msdos': + if part.fsuuid.upper().startswith("0X"): + part.fsuuid = '0x' + part.fsuuid.upper()[2:].rjust(8,"0") + else: + part.fsuuid = '0x' + part.fsuuid.upper().rjust(8,"0") def prepare(self, imager): """Prepare an image. Call prepare method of all image partitions.""" diff --git a/poky/scripts/lib/wic/plugins/source/empty.py b/poky/scripts/lib/wic/plugins/source/empty.py new file mode 100644 index 000000000..041617d64 --- /dev/null +++ b/poky/scripts/lib/wic/plugins/source/empty.py @@ -0,0 +1,32 @@ +# +# SPDX-License-Identifier: MIT +# + +# The empty wic plugin is used to create unformatted empty partitions for wic +# images. +# To use it you must pass "empty" as argument for the "--source" parameter in +# the wks file. For example: +# part foo --source empty --ondisk sda --size="1024" --align 1024 + +import logging + +from wic.pluginbase import SourcePlugin + +logger = logging.getLogger('wic') + +class EmptyPartitionPlugin(SourcePlugin): + """ + Populate unformatted empty partition. + """ + + name = 'empty' + + @classmethod + def do_prepare_partition(cls, part, source_params, cr, cr_workdir, + oe_builddir, bootimg_dir, kernel_dir, + rootfs_dir, native_sysroot): + """ + Called to do the actual content population for a partition i.e. it + 'prepares' the partition to be incorporated into the image. + """ + return -- cgit v1.2.3 From 87ddd3eab4df68e624b5350ccaab28b3b97547c0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 28 Jan 2021 18:27:13 -0600 Subject: Revert "libpam: update 1.3.1 -> 1.5.1" This reverts commit b0384720a46fb25c4ad180e3f256ffdeb53dc8a6. OpenBMC is not ready for the removal of pam_cracklib and pam_tally2. Until code is ready to move to new libs in libpam_1.5, carry a revert in OpenBMC to stay at libpam_1.3. openbmc/openbmc#3750 tracks this work Signed-off-by: Andrew Geissler Change-Id: I8da478dd1965f52d3a21e5274a96bd16e95bc7f9 --- ..._namespace-Makefile.am-correctly-install-.patch | 28 --- .../pam/libpam/crypt_configure.patch | 40 ++++ .../pam-security-abstract-securetty-handling.patch | 203 +++++++++++++++++++++ .../pam/libpam/pam-unix-nullok-secure.patch | 195 ++++++++++++++++++++ poky/meta/recipes-extended/pam/libpam_1.3.1.bb | 164 +++++++++++++++++ poky/meta/recipes-extended/pam/libpam_1.5.1.bb | 162 ---------------- 6 files changed, 602 insertions(+), 190 deletions(-) delete mode 100644 poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch create mode 100644 poky/meta/recipes-extended/pam/libpam/crypt_configure.patch create mode 100644 poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch create mode 100644 poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch create mode 100644 poky/meta/recipes-extended/pam/libpam_1.3.1.bb delete mode 100644 poky/meta/recipes-extended/pam/libpam_1.5.1.bb diff --git a/poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch b/poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch deleted file mode 100644 index b41d1e596..000000000 --- a/poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e2db4082f6b988f1d5803028e9e47aee5f3519ac Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sun, 27 Dec 2020 00:30:45 +0100 -Subject: [PATCH] modules/pam_namespace/Makefile.am: correctly install systemd - unit file - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - modules/pam_namespace/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am -index 21e1b33..ddd5fc0 100644 ---- a/modules/pam_namespace/Makefile.am -+++ b/modules/pam_namespace/Makefile.am -@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) - securelibdir = $(SECUREDIR) - secureconfdir = $(SCONFIGDIR) - namespaceddir = $(SCONFIGDIR)/namespace.d --servicedir = $(prefix)/lib/systemd/system -+servicedir = /lib/systemd/system - - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) --- -2.24.0 - diff --git a/poky/meta/recipes-extended/pam/libpam/crypt_configure.patch b/poky/meta/recipes-extended/pam/libpam/crypt_configure.patch new file mode 100644 index 000000000..917a8af64 --- /dev/null +++ b/poky/meta/recipes-extended/pam/libpam/crypt_configure.patch @@ -0,0 +1,40 @@ +From b86575ab4a0df07da160283459da270e1c0372a0 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" +Date: Tue, 24 May 2016 14:11:09 +0300 +Subject: [PATCH] crypt_configure + +This patch fixes a case where it find crypt defined in libc (musl) but +not in specified libraries then it ends up assigning +LIBCRYPT="-l" which then goes into makefile cause all sort of problems +e.g. + +ld: cannot find -l-m32 +| collect2: error: ld returned 1 exit status +The reason is that -l appears on commandline with +out any library and compiler treats the next argument as library name +whatever it is. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +Signed-off-by: Maxin B. John +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index df39d07..e68d856 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -401,7 +401,7 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], + [crypt_libs="crypt"]) + + BACKUP_LIBS=$LIBS +-AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="${ac_lib:+-l$ac_lib}", LIBCRYPT="") ++AC_SEARCH_LIBS([crypt],[$crypt_libs], [test "$ac_cv_search_crypt" = "none required" || LIBCRYPT="$ac_cv_search_crypt"]) + AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) + LIBS=$BACKUP_LIBS + AC_SUBST(LIBCRYPT) +-- +2.4.0 + diff --git a/poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch b/poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch new file mode 100644 index 000000000..9b8d4c297 --- /dev/null +++ b/poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch @@ -0,0 +1,203 @@ +Description: extract the securetty logic for use with the "nullok_secure" option + introduced in the "055_pam_unix_nullok_secure" patch. + +Upstream-Status: Pending + +Signed-off-by: Ming Liu +=================================================================== +Index: Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am +=================================================================== +--- Linux-PAM-1.3.0.orig/modules/pam_securetty/Makefile.am ++++ Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am +@@ -24,6 +24,10 @@ endif + securelib_LTLIBRARIES = pam_securetty.la + pam_securetty_la_LIBADD = $(top_builddir)/libpam/libpam.la + ++pam_securetty_la_SOURCES = \ ++ pam_securetty.c \ ++ tty_secure.c ++ + if ENABLE_REGENERATE_MAN + noinst_DATA = README + README: pam_securetty.8.xml +Index: Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c +=================================================================== +--- Linux-PAM-1.3.0.orig/modules/pam_securetty/pam_securetty.c ++++ Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c +@@ -1,7 +1,5 @@ + /* pam_securetty module */ + +-#define SECURETTY_FILE "/etc/securetty" +-#define TTY_PREFIX "/dev/" + #define CMDLINE_FILE "/proc/cmdline" + #define CONSOLEACTIVE_FILE "/sys/class/tty/console/active" + +@@ -40,6 +38,9 @@ + #include + #include + ++extern int _pammodutil_tty_secure(const pam_handle_t *pamh, ++ const char *uttyname); ++ + #define PAM_DEBUG_ARG 0x0001 + #define PAM_NOCONSOLE_ARG 0x0002 + +@@ -73,11 +74,7 @@ securetty_perform_check (pam_handle_t *p + const char *username; + const char *uttyname; + const void *void_uttyname; +- char ttyfileline[256]; +- char ptname[256]; +- struct stat ttyfileinfo; + struct passwd *user_pwd; +- FILE *ttyfile; + + /* log a trail for debugging */ + if (ctrl & PAM_DEBUG_ARG) { +@@ -105,50 +102,7 @@ securetty_perform_check (pam_handle_t *p + return PAM_SERVICE_ERR; + } + +- /* The PAM_TTY item may be prefixed with "/dev/" - skip that */ +- if (strncmp(TTY_PREFIX, uttyname, sizeof(TTY_PREFIX)-1) == 0) { +- uttyname += sizeof(TTY_PREFIX)-1; +- } +- +- if (stat(SECURETTY_FILE, &ttyfileinfo)) { +- pam_syslog(pamh, LOG_NOTICE, "Couldn't open %s: %m", SECURETTY_FILE); +- return PAM_SUCCESS; /* for compatibility with old securetty handling, +- this needs to succeed. But we still log the +- error. */ +- } +- +- if ((ttyfileinfo.st_mode & S_IWOTH) || !S_ISREG(ttyfileinfo.st_mode)) { +- /* If the file is world writable or is not a +- normal file, return error */ +- pam_syslog(pamh, LOG_ERR, +- "%s is either world writable or not a normal file", +- SECURETTY_FILE); +- return PAM_AUTH_ERR; +- } +- +- ttyfile = fopen(SECURETTY_FILE,"r"); +- if (ttyfile == NULL) { /* Check that we opened it successfully */ +- pam_syslog(pamh, LOG_ERR, "Error opening %s: %m", SECURETTY_FILE); +- return PAM_SERVICE_ERR; +- } +- +- if (isdigit(uttyname[0])) { +- snprintf(ptname, sizeof(ptname), "pts/%s", uttyname); +- } else { +- ptname[0] = '\0'; +- } +- +- retval = 1; +- +- while ((fgets(ttyfileline, sizeof(ttyfileline)-1, ttyfile) != NULL) +- && retval) { +- if (ttyfileline[strlen(ttyfileline) - 1] == '\n') +- ttyfileline[strlen(ttyfileline) - 1] = '\0'; +- +- retval = ( strcmp(ttyfileline, uttyname) +- && (!ptname[0] || strcmp(ptname, uttyname)) ); +- } +- fclose(ttyfile); ++ retval = _pammodutil_tty_secure(pamh, uttyname); + + if (retval && !(ctrl & PAM_NOCONSOLE_ARG)) { + FILE *cmdlinefile; +Index: Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c +=================================================================== +--- /dev/null ++++ Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c +@@ -0,0 +1,90 @@ ++/* ++ * A function to determine if a particular line is in /etc/securetty ++ */ ++ ++ ++#define SECURETTY_FILE "/etc/securetty" ++#define TTY_PREFIX "/dev/" ++ ++/* This function taken out of pam_securetty by Sam Hartman ++ * */ ++/* ++ * by Elliot Lee , Red Hat Software. ++ * July 25, 1996. ++ * Slight modifications AGM. 1996/12/3 ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++extern int _pammodutil_tty_secure(const pam_handle_t *pamh, ++ const char *uttyname); ++ ++int _pammodutil_tty_secure(const pam_handle_t *pamh, const char *uttyname) ++{ ++ int retval = PAM_AUTH_ERR; ++ char ttyfileline[256]; ++ char ptname[256]; ++ struct stat ttyfileinfo; ++ FILE *ttyfile; ++ /* The PAM_TTY item may be prefixed with "/dev/" - skip that */ ++ if (strncmp(TTY_PREFIX, uttyname, sizeof(TTY_PREFIX)-1) == 0) ++ uttyname += sizeof(TTY_PREFIX)-1; ++ ++ if (stat(SECURETTY_FILE, &ttyfileinfo)) { ++ pam_syslog(pamh, LOG_NOTICE, "Couldn't open %s: %m", ++ SECURETTY_FILE); ++ return PAM_SUCCESS; /* for compatibility with old securetty handling, ++ this needs to succeed. But we still log the ++ error. */ ++ } ++ ++ if ((ttyfileinfo.st_mode & S_IWOTH) || !S_ISREG(ttyfileinfo.st_mode)) { ++ /* If the file is world writable or is not a ++ normal file, return error */ ++ pam_syslog(pamh, LOG_ERR, ++ "%s is either world writable or not a normal file", ++ SECURETTY_FILE); ++ return PAM_AUTH_ERR; ++ } ++ ++ ttyfile = fopen(SECURETTY_FILE,"r"); ++ if(ttyfile == NULL) { /* Check that we opened it successfully */ ++ pam_syslog(pamh, LOG_ERR, "Error opening %s: %m", SECURETTY_FILE); ++ return PAM_SERVICE_ERR; ++ } ++ ++ if (isdigit(uttyname[0])) { ++ snprintf(ptname, sizeof(ptname), "pts/%s", uttyname); ++ } else { ++ ptname[0] = '\0'; ++ } ++ ++ retval = 1; ++ ++ while ((fgets(ttyfileline,sizeof(ttyfileline)-1, ttyfile) != NULL) ++ && retval) { ++ if(ttyfileline[strlen(ttyfileline) - 1] == '\n') ++ ttyfileline[strlen(ttyfileline) - 1] = '\0'; ++ retval = ( strcmp(ttyfileline,uttyname) ++ && (!ptname[0] || strcmp(ptname, uttyname)) ); ++ } ++ fclose(ttyfile); ++ ++ if(retval) { ++ retval = PAM_AUTH_ERR; ++ } ++ ++ return retval; ++} diff --git a/poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch b/poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch new file mode 100644 index 000000000..d2cc66882 --- /dev/null +++ b/poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch @@ -0,0 +1,195 @@ +From b6545b83f94c5fb7aec1478b8d458a1393f479c8 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" +Date: Wed, 25 May 2016 14:12:25 +0300 +Subject: [PATCH] pam_unix: support 'nullok_secure' option + +Debian patch to add a new 'nullok_secure' option to pam_unix, +which accepts users with null passwords only when the applicant is +connected from a tty listed in /etc/securetty. + +Authors: Sam Hartman , + Steve Langasek + +Upstream-Status: Pending + +Signed-off-by: Ming Liu +Signed-off-by: Amarnath Valluri +Signed-off-by: Maxin B. John +--- + modules/pam_unix/Makefile.am | 3 ++- + modules/pam_unix/pam_unix.8.xml | 19 ++++++++++++++++++- + modules/pam_unix/support.c | 40 +++++++++++++++++++++++++++++++++++----- + modules/pam_unix/support.h | 8 ++++++-- + 4 files changed, 61 insertions(+), 9 deletions(-) + +diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am +index 56df178..2bba460 100644 +--- a/modules/pam_unix/Makefile.am ++++ b/modules/pam_unix/Makefile.am +@@ -30,7 +30,8 @@ if HAVE_VERSIONING + pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map + endif + pam_unix_la_LIBADD = $(top_builddir)/libpam/libpam.la \ +- @LIBCRYPT@ @LIBSELINUX@ @TIRPC_LIBS@ @NSL_LIBS@ ++ @LIBCRYPT@ @LIBSELINUX@ @TIRPC_LIBS@ @NSL_LIBS@ \ ++ ../pam_securetty/tty_secure.lo + + securelib_LTLIBRARIES = pam_unix.la + +diff --git a/modules/pam_unix/pam_unix.8.xml b/modules/pam_unix/pam_unix.8.xml +index 1b318f1..be0330e 100644 +--- a/modules/pam_unix/pam_unix.8.xml ++++ b/modules/pam_unix/pam_unix.8.xml +@@ -159,7 +159,24 @@ + + The default action of this module is to not permit the + user access to a service if their official password is blank. +- The argument overrides this default. ++ The argument overrides this default ++ and allows any user with a blank password to access the ++ service. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ The default action of this module is to not permit the ++ user access to a service if their official password is blank. ++ The argument overrides this ++ default and allows any user with a blank password to access ++ the service as long as the value of PAM_TTY is set to one of ++ the values found in /etc/securetty. + + + +diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c +index fc8595e..29e3341 100644 +--- a/modules/pam_unix/support.c ++++ b/modules/pam_unix/support.c +@@ -183,13 +183,22 @@ int _set_ctrl(pam_handle_t *pamh, int flags, int *remember, int *rounds, + /* now parse the arguments to this module */ + + for (; argc-- > 0; ++argv) { ++ int sl; + + D(("pam_unix arg: %s", *argv)); + + for (j = 0; j < UNIX_CTRLS_; ++j) { +- if (unix_args[j].token +- && !strncmp(*argv, unix_args[j].token, strlen(unix_args[j].token))) { +- break; ++ if (unix_args[j].token) { ++ sl = strlen(unix_args[j].token); ++ if (unix_args[j].token[sl-1] == '=') { ++ /* exclude argument from comparison */ ++ if (!strncmp(*argv, unix_args[j].token, sl)) ++ break; ++ } else { ++ /* compare full strings */ ++ if (!strcmp(*argv, unix_args[j].token)) ++ break; ++ } + } + } + +@@ -560,6 +569,7 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, + if (child == 0) { + static char *envp[] = { NULL }; + const char *args[] = { NULL, NULL, NULL, NULL }; ++ int nullok = off(UNIX__NONULL, ctrl); + + /* XXX - should really tidy up PAM here too */ + +@@ -587,7 +597,16 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, + /* exec binary helper */ + args[0] = CHKPWD_HELPER; + args[1] = user; +- if (off(UNIX__NONULL, ctrl)) { /* this means we've succeeded */ ++ if (on(UNIX_NULLOK_SECURE, ctrl)) { ++ const void *uttyname; ++ retval = pam_get_item(pamh, PAM_TTY, &uttyname); ++ if (retval != PAM_SUCCESS || uttyname == NULL ++ || _pammodutil_tty_secure(pamh, (const char *)uttyname) != PAM_SUCCESS) { ++ nullok = 0; ++ } ++ } ++ ++ if (nullok) { + args[2]="nullok"; + } else { + args[2]="nonull"; +@@ -672,6 +691,17 @@ _unix_blankpasswd (pam_handle_t *pamh, unsigned int ctrl, const char *name) + if (on(UNIX__NONULL, ctrl)) + return 0; /* will fail but don't let on yet */ + ++ if (on(UNIX_NULLOK_SECURE, ctrl)) { ++ int retval2; ++ const void *uttyname; ++ retval2 = pam_get_item(pamh, PAM_TTY, &uttyname); ++ if (retval2 != PAM_SUCCESS || uttyname == NULL) ++ return 0; ++ ++ if (_pammodutil_tty_secure(pamh, (const char *)uttyname) != PAM_SUCCESS) ++ return 0; ++ } ++ + /* UNIX passwords area */ + + retval = get_pwd_hash(pamh, name, &pwd, &salt); +@@ -758,7 +788,7 @@ int _unix_verify_password(pam_handle_t * pamh, const char *name + } + } + } else { +- retval = verify_pwd_hash(p, salt, off(UNIX__NONULL, ctrl)); ++ retval = verify_pwd_hash(p, salt, _unix_blankpasswd(pamh, ctrl, name)); + } + + if (retval == PAM_SUCCESS) { +diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h +index b4c279c..8da4a8e 100644 +--- a/modules/pam_unix/support.h ++++ b/modules/pam_unix/support.h +@@ -98,8 +98,9 @@ typedef struct { + #define UNIX_QUIET 28 /* Don't print informational messages */ + #define UNIX_NO_PASS_EXPIRY 29 /* Don't check for password expiration if not used for authentication */ + #define UNIX_DES 30 /* DES, default */ ++#define UNIX_NULLOK_SECURE 31 /* NULL passwords allowed only on secure ttys */ + /* -------------- */ +-#define UNIX_CTRLS_ 31 /* number of ctrl arguments defined */ ++#define UNIX_CTRLS_ 32 /* number of ctrl arguments defined */ + + #define UNIX_DES_CRYPT(ctrl) (off(UNIX_MD5_PASS,ctrl)&&off(UNIX_BIGCRYPT,ctrl)&&off(UNIX_SHA256_PASS,ctrl)&&off(UNIX_SHA512_PASS,ctrl)&&off(UNIX_BLOWFISH_PASS,ctrl)) + +@@ -117,7 +118,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = + /* UNIX_AUTHTOK_TYPE */ {"authtok_type=", _ALL_ON_, 0100, 0}, + /* UNIX__PRELIM */ {NULL, _ALL_ON_^(0600), 0200, 0}, + /* UNIX__UPDATE */ {NULL, _ALL_ON_^(0600), 0400, 0}, +-/* UNIX__NONULL */ {NULL, _ALL_ON_, 01000, 0}, ++/* UNIX__NONULL */ {NULL, _ALL_ON_^(02000000000), 01000, 0}, + /* UNIX__QUIET */ {NULL, _ALL_ON_, 02000, 0}, + /* UNIX_USE_AUTHTOK */ {"use_authtok", _ALL_ON_, 04000, 0}, + /* UNIX_SHADOW */ {"shadow", _ALL_ON_, 010000, 0}, +@@ -139,6 +140,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = + /* UNIX_QUIET */ {"quiet", _ALL_ON_, 01000000000, 0}, + /* UNIX_NO_PASS_EXPIRY */ {"no_pass_expiry", _ALL_ON_, 02000000000, 0}, + /* UNIX_DES */ {"des", _ALL_ON_^(0260420000), 0, 1}, ++/* UNIX_NULLOK_SECURE */ {"nullok_secure", _ALL_ON_^(01000), 02000000000, 0}, + }; + + #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag) +@@ -172,6 +174,8 @@ extern int _unix_read_password(pam_handle_t * pamh + ,const char *data_name + ,const void **pass); + ++extern int _pammodutil_tty_secure(const pam_handle_t *pamh, const char *uttyname); ++ + extern int _unix_run_verify_binary(pam_handle_t *pamh, + unsigned int ctrl, const char *user, int *daysleft); + #endif /* _PAM_UNIX_SUPPORT_H */ +-- +2.4.0 + diff --git a/poky/meta/recipes-extended/pam/libpam_1.3.1.bb b/poky/meta/recipes-extended/pam/libpam_1.3.1.bb new file mode 100644 index 000000000..b58b9ac5f --- /dev/null +++ b/poky/meta/recipes-extended/pam/libpam_1.3.1.bb @@ -0,0 +1,164 @@ +DISABLE_STATIC = "" +SUMMARY = "Linux-PAM (Pluggable Authentication Modules)" +DESCRIPTION = "Linux-PAM (Pluggable Authentication Modules for Linux), a flexible mechanism for authenticating users" +HOMEPAGE = "https://fedorahosted.org/linux-pam/" +BUGTRACKER = "https://fedorahosted.org/linux-pam/newticket" +SECTION = "base" +# PAM is dual licensed under GPL and BSD. +# /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time +# libpam-runtime-1.0.1 is GPLv2+), by openembedded +LICENSE = "GPLv2+ | BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 \ + file://libpamc/License;md5=a4da476a14c093fdc73be3c3c9ba8fb3 \ + " + +SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux-PAM-${PV}.tar.xz \ + file://99_pam \ + file://pam.d/common-account \ + file://pam.d/common-auth \ + file://pam.d/common-password \ + file://pam.d/common-session \ + file://pam.d/common-session-noninteractive \ + file://pam.d/other \ + file://libpam-xtests.patch \ + file://pam-security-abstract-securetty-handling.patch \ + file://pam-unix-nullok-secure.patch \ + file://crypt_configure.patch \ + " + +SRC_URI[md5sum] = "558ff53b0fc0563ca97f79e911822165" +SRC_URI[sha256sum] = "eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db" + +DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt" + +EXTRA_OECONF = "--includedir=${includedir}/security \ + --libdir=${base_libdir} \ + --disable-nis \ + --disable-regenerate-docu \ + --disable-prelude" + +CFLAGS_append = " -fPIC " + +S = "${WORKDIR}/Linux-PAM-${PV}" + +inherit autotools gettext pkgconfig + +PACKAGECONFIG ??= "" +PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," +PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," + +PACKAGES += "${PN}-runtime ${PN}-xtests" +FILES_${PN} = "${base_libdir}/lib*${SOLIBS}" +FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" +FILES_${PN}-runtime = "${sysconfdir}" +FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" + +PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" + +def get_multilib_bit(d): + baselib = d.getVar('baselib') or '' + return baselib.replace('lib', '') + +libpam_suffix = "suffix${@get_multilib_bit(d)}" + +RPROVIDES_${PN} += "${PN}-${libpam_suffix}" +RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" + +RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \ + " +RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-succeed-if-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-time-${libpam_suffix} \ + coreutils" + +# FIXME: Native suffix breaks here, disable it for now +RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" +RRECOMMENDS_${PN}_class-native = "" + +python populate_packages_prepend () { + def pam_plugin_append_file(pn, dir, file): + nf = os.path.join(dir, file) + of = d.getVar('FILES_' + pn) + if of: + nf = of + " " + nf + d.setVar('FILES_' + pn, nf) + + def pam_plugin_hook(file, pkg, pattern, format, basename): + pn = d.getVar('PN') + libpam_suffix = d.getVar('libpam_suffix') + + rdeps = d.getVar('RDEPENDS_' + pkg) + if rdeps: + rdeps = rdeps + " " + pn + "-" + libpam_suffix + else: + rdeps = pn + "-" + libpam_suffix + d.setVar('RDEPENDS_' + pkg, rdeps) + + provides = d.getVar('RPROVIDES_' + pkg) + if provides: + provides = provides + " " + pkg + "-" + libpam_suffix + else: + provides = pkg + "-" + libpam_suffix + d.setVar('RPROVIDES_' + pkg, provides) + + mlprefix = d.getVar('MLPREFIX') or '' + dvar = d.expand('${WORKDIR}/package') + pam_libdir = d.expand('${base_libdir}/security') + pam_sbindir = d.expand('${sbindir}') + pam_filterdir = d.expand('${base_libdir}/security/pam_filter') + pam_pkgname = mlprefix + 'pam-plugin%s' + + do_split_packages(d, pam_libdir, r'^pam(.*)\.so$', pam_pkgname, + 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='') + pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd') + pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update') + pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally') + pam_plugin_append_file('%spam-plugin-tally2' % mlprefix, pam_sbindir, 'pam_tally2') + pam_plugin_append_file('%spam-plugin-timestamp' % mlprefix, pam_sbindir, 'pam_timestamp_check') + pam_plugin_append_file('%spam-plugin-mkhomedir' % mlprefix, pam_sbindir, 'mkhomedir_helper') + pam_plugin_append_file('%spam-plugin-console' % mlprefix, pam_sbindir, 'pam_console_apply') + do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') +} + +do_install() { + autotools_do_install + + # don't install /var/run when populating rootfs. Do it through volatile + rm -rf ${D}${localstatedir} + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/99_pam ${D}${sysconfdir}/default/volatiles + + install -d ${D}${sysconfdir}/pam.d/ + install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ + + # The lsb requires unix_chkpwd has setuid permission + chmod 4755 ${D}${sbindir}/unix_chkpwd + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session + fi +} + +inherit features_check +REQUIRED_DISTRO_FEATURES = "pam" + +BBCLASSEXTEND = "nativesdk native" + +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session" +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-auth" +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-password" +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-account" +CONFFILES_${PN}-runtime += "${sysconfdir}/security/limits.conf" + +UPSTREAM_CHECK_URI = "https://github.com/linux-pam/linux-pam/releases" + +CVE_PRODUCT = "linux-pam" diff --git a/poky/meta/recipes-extended/pam/libpam_1.5.1.bb b/poky/meta/recipes-extended/pam/libpam_1.5.1.bb deleted file mode 100644 index 8c008a970..000000000 --- a/poky/meta/recipes-extended/pam/libpam_1.5.1.bb +++ /dev/null @@ -1,162 +0,0 @@ -DISABLE_STATIC = "" -SUMMARY = "Linux-PAM (Pluggable Authentication Modules)" -DESCRIPTION = "Linux-PAM (Pluggable Authentication Modules for Linux), a flexible mechanism for authenticating users" -HOMEPAGE = "https://fedorahosted.org/linux-pam/" -BUGTRACKER = "https://fedorahosted.org/linux-pam/newticket" -SECTION = "base" -# PAM is dual licensed under GPL and BSD. -# /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time -# libpam-runtime-1.0.1 is GPLv2+), by openembedded -LICENSE = "GPLv2+ | BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 \ - file://libpamc/License;md5=a4da476a14c093fdc73be3c3c9ba8fb3 \ - " - -SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux-PAM-${PV}.tar.xz \ - file://99_pam \ - file://pam.d/common-account \ - file://pam.d/common-auth \ - file://pam.d/common-password \ - file://pam.d/common-session \ - file://pam.d/common-session-noninteractive \ - file://pam.d/other \ - file://libpam-xtests.patch \ - file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \ - file://0001-Makefile.am-support-usrmage.patch \ - " - -SRC_URI[sha256sum] = "201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc" - -DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt" - -EXTRA_OECONF = "--includedir=${includedir}/security \ - --libdir=${base_libdir} \ - --disable-nis \ - --disable-regenerate-docu \ - --disable-doc \ - --disable-prelude" - -CFLAGS_append = " -fPIC " - -S = "${WORKDIR}/Linux-PAM-${PV}" - -inherit autotools gettext pkgconfig systemd - -PACKAGECONFIG ??= "" -PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," -PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," - -PACKAGES += "${PN}-runtime ${PN}-xtests" -FILES_${PN} = "${base_libdir}/lib*${SOLIBS}" -FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" -FILES_${PN}-runtime = "${sysconfdir} ${sbindir} ${systemd_system_unitdir}" -FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" - -PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" - -def get_multilib_bit(d): - baselib = d.getVar('baselib') or '' - return baselib.replace('lib', '') - -libpam_suffix = "suffix${@get_multilib_bit(d)}" - -RPROVIDES_${PN} += "${PN}-${libpam_suffix}" -RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" - -RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \ - " -RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-succeed-if-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-time-${libpam_suffix} \ - bash coreutils" - -# FIXME: Native suffix breaks here, disable it for now -RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" -RRECOMMENDS_${PN}_class-native = "" - -python populate_packages_prepend () { - def pam_plugin_append_file(pn, dir, file): - nf = os.path.join(dir, file) - of = d.getVar('FILES_' + pn) - if of: - nf = of + " " + nf - d.setVar('FILES_' + pn, nf) - - def pam_plugin_hook(file, pkg, pattern, format, basename): - pn = d.getVar('PN') - libpam_suffix = d.getVar('libpam_suffix') - - rdeps = d.getVar('RDEPENDS_' + pkg) - if rdeps: - rdeps = rdeps + " " + pn + "-" + libpam_suffix - else: - rdeps = pn + "-" + libpam_suffix - d.setVar('RDEPENDS_' + pkg, rdeps) - - provides = d.getVar('RPROVIDES_' + pkg) - if provides: - provides = provides + " " + pkg + "-" + libpam_suffix - else: - provides = pkg + "-" + libpam_suffix - d.setVar('RPROVIDES_' + pkg, provides) - - mlprefix = d.getVar('MLPREFIX') or '' - dvar = d.expand('${WORKDIR}/package') - pam_libdir = d.expand('${base_libdir}/security') - pam_sbindir = d.expand('${sbindir}') - pam_filterdir = d.expand('${base_libdir}/security/pam_filter') - pam_pkgname = mlprefix + 'pam-plugin%s' - - do_split_packages(d, pam_libdir, r'^pam(.*)\.so$', pam_pkgname, - 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='') - pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd') - pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update') - pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally') - pam_plugin_append_file('%spam-plugin-tally2' % mlprefix, pam_sbindir, 'pam_tally2') - pam_plugin_append_file('%spam-plugin-timestamp' % mlprefix, pam_sbindir, 'pam_timestamp_check') - pam_plugin_append_file('%spam-plugin-mkhomedir' % mlprefix, pam_sbindir, 'mkhomedir_helper') - pam_plugin_append_file('%spam-plugin-console' % mlprefix, pam_sbindir, 'pam_console_apply') - do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') -} - -do_install() { - autotools_do_install - - # don't install /var/run when populating rootfs. Do it through volatile - rm -rf ${D}${localstatedir} - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/99_pam ${D}${sysconfdir}/default/volatiles - - install -d ${D}${sysconfdir}/pam.d/ - install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ - - # The lsb requires unix_chkpwd has setuid permission - chmod 4755 ${D}${sbindir}/unix_chkpwd - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session - fi -} - -inherit features_check -REQUIRED_DISTRO_FEATURES = "pam" - -BBCLASSEXTEND = "nativesdk native" - -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-auth" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-password" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-account" -CONFFILES_${PN}-runtime += "${sysconfdir}/security/limits.conf" - -UPSTREAM_CHECK_URI = "https://github.com/linux-pam/linux-pam/releases" - -CVE_PRODUCT = "linux-pam" -- cgit v1.2.3 From 779a182c6adac1c33ae63e0a20f73e19e97047d3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Feb 2021 10:16:58 -0600 Subject: owners: change over to email for root dir Signed-off-by: Andrew Geissler Change-Id: Iac0374bc3f229ff7c4456d3ddaf7101ab3fe9b21 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index d5ea39ca7..15c6c2dbd 100644 --- a/OWNERS +++ b/OWNERS @@ -1,2 +1,2 @@ owners: -- Brad Bishop +- bradleyb@fuzziesquirrel.com -- cgit v1.2.3 From 1759d1e64b4502368e613790debc3915c377358e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Feb 2021 02:31:28 +0000 Subject: phosphor-logging: srcrev bump f397afcc47..b50c705c3b Lei YU (1): Return entryID on commiting logs Change-Id: I89f9d08e0942d063c009f3ced5f091cfa10537bd Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 37270958e..5a1ffd5eb 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -55,7 +55,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "f397afcc472d521341a5ab9afd6065a6195db6c0" +SRCREV = "b50c705c3bb3738673f98cd371b408a5b48e629a" S = "${WORKDIR}/git" -- cgit v1.2.3 From 68aaa23b838f9eb9fce74dfafa9d2b536eeb1af4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Feb 2021 02:31:52 +0000 Subject: phosphor-sel-logger: srcrev bump e526b86d7f..7d8a3003fb Lei YU (1): Return entryID as recordID Change-Id: I70fdf0b887b1b9205210b964310630aefbdc0700 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb index ec8fcdc18..375323497 100644 --- a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb +++ b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS += "systemd sdbusplus boost phosphor-ipmi-host" SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=git" -SRCREV = "e526b86d7f9eef3b7a58f2800263666a04051239" +SRCREV = "7d8a3003fb8038291f5e678cbfd74344ec6e62d2" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From e278196472873c9dffefc69e36c98c91413ab344 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Feb 2021 08:30:53 +0000 Subject: sdeventplus: srcrev bump cd29b6d01d..921758b9da William A. Kennington III (1): gitignore: Update to include meson build directory Change-Id: Ifc6b520508a69f9f91ecf15b9aad18a9ea642d82 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb index dbd461a43..1c8b6c8f5 100644 --- a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb +++ b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb @@ -20,6 +20,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/sdeventplus" -SRCREV = "cd29b6d01de6fb30d27b1f548f13400131bfef2b" +SRCREV = "921758b9daeb3a96b9545ece2b7c9de3a8f79ba9" S = "${WORKDIR}/git" -- cgit v1.2.3 From 130419db66e06c0c3457e69c30a5d846e7194209 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Feb 2021 09:41:06 +0000 Subject: ssifbridge: srcrev bump f624941f50..b26a9b6aea Dung Cao (2): Clean up potential compile warnings Fix maximum SSIF message size Change-Id: Ie537f1c6e9e91bd17ed76cc28cdf045e8a7d8080 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb index b086a0a36..117d65afc 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb @@ -20,5 +20,5 @@ DEPENDS += "cli11" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ssifbridge.git;protocol=git;branch=master" -SRCREV= "f624941f501e2ddd1f2d4518dbdbd3642560f610" +SRCREV= "b26a9b6aea6c578fa71274bed14466607b0d8426" -- cgit v1.2.3 From 3afcd3351ab00d34969376af3e8a117fc53eddf6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Feb 2021 13:41:48 +0000 Subject: telemetry: srcrev bump d960e1f37e..1ac4d54784 Wludzik, Jozef (2): Fix meson file and remove warnings from compilation Update README.md file Change-Id: Ief490296f55e462e5daf0de4c7c93230f82b027d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 33e176b50..8946d41c5 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "d960e1f37e72115fdd8ec0163c99bb19e0487b91" +SRCREV = "1ac4d547845d70f987a7bf43bb65405be92727d8" S = "${WORKDIR}/git" -- cgit v1.2.3 From 7a8f94ef10adc0ea86dd7fca181d44f7dc205d1d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Feb 2021 17:10:50 +0000 Subject: bmcweb: srcrev bump 6a9f85f905..d830ff5aa4 Adriana Kobylak (1): http: utility: Add base64encode Change-Id: I42e56c437a53e981667b3c2557639e40e12cecf5 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 69fde7b97..a51a25d46 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "6a9f85f9050e2c0f38148e295d7e25f56d05c6de" +SRCREV = "d830ff5aa48b2c39aac411162873239b235b0858" S = "${WORKDIR}/git" -- cgit v1.2.3 From 7dc2f7a38dccb3d87a9b79d0a66b25da1027a72f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Feb 2021 21:42:03 +0000 Subject: webui-vue: srcrev bump be6858c06b..dada89cf0c SurenNeware (1): Change system indicatorLED property Yoshie Muranaka (1): Add property check on Server power operations page Change-Id: I3032e70cab1c14b05d9c3da670a6a6b23b71326c Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index c94c4b6fc..2bca5e543 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "be6858c06bfbd1e06935ad01b743c1043f74488a" +SRCREV = "dada89cf0c79a7daa7fb943f8f83455a61ad1ecd" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 3af54d4313f771699c4c72ecf2373f0e67425621 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 3 Nov 2020 16:15:19 -0600 Subject: meta-hxt: update Yocto compat for gatesgarth The next release of Yocto is soon and most of the upstream layers have switched support strings for it. Support layer compat for gatesgarth (current) and dunsfell (previous). Signed-off-by: Patrick Williams Change-Id: I3b5ef37d96be06be175e35ad689546bf8d584601 --- meta-hxt/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-hxt/conf/layer.conf b/meta-hxt/conf/layer.conf index bc33c2b24..5de44030d 100644 --- a/meta-hxt/conf/layer.conf +++ b/meta-hxt/conf/layer.conf @@ -3,3 +3,5 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "hxt" BBFILE_PATTERN_hxt = "" + +LAYERSERIES_COMPAT_hxt = "dunfell gatesgarth" -- cgit v1.2.3 From 30da885208b1392ebb76ebc6890e021dd61d4a4e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 13:42:40 -0600 Subject: mpreboot: introduce new distro feature The memory preserving reboot is a feature utilized on IBM systems which allows a system to be rebooted with its memory preserved. This is utilized in situations where the host firmware has crashed and put the processor in an unusable state. The processors are put back in a good state by rebooting the system. Memory is preserved though so host firmware can capture the relevant data from memory needed to debug the cause of the failure. This feature is implemented across a few different repositories within OpenBMC so lets create a distro feature to enable it across all of the software stacks. Signed-off-by: Andrew Geissler Change-Id: Ia16626ba6e46aa8de642abef677735ed957f9f9e --- meta-ibm/conf/distro/include/ibm-mpreboot.inc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 meta-ibm/conf/distro/include/ibm-mpreboot.inc diff --git a/meta-ibm/conf/distro/include/ibm-mpreboot.inc b/meta-ibm/conf/distro/include/ibm-mpreboot.inc new file mode 100644 index 000000000..334db3a5e --- /dev/null +++ b/meta-ibm/conf/distro/include/ibm-mpreboot.inc @@ -0,0 +1,3 @@ +# mpreboot is an ibm specific system reboot which preserves the host +# memory. This is utilized to debug issues in the host software. +DISTRO_FEATURES += "mpreboot" -- cgit v1.2.3 From e008cb7a6a9a1b046e637f9f9c0b2851655da65a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 13:49:27 -0600 Subject: mpreboot: add to rainier and tacoma systems Both rainier and witherspoon-tacoma systems support the mpreboot feature. Signed-off-by: Andrew Geissler Change-Id: Ieeb4724a5cf5678ba0f6ab950b5403db5aebcd88 --- meta-ibm/conf/machine/rainier.conf | 1 + meta-ibm/conf/machine/witherspoon-tacoma.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/meta-ibm/conf/machine/rainier.conf b/meta-ibm/conf/machine/rainier.conf index 9c1a7a46d..f5152f7c5 100644 --- a/meta-ibm/conf/machine/rainier.conf +++ b/meta-ibm/conf/machine/rainier.conf @@ -11,6 +11,7 @@ require conf/machine/include/openpower.inc include conf/machine/include/ibm-power10-cpu.inc require conf/distro/include/openpower-virtual-pnor.inc require conf/distro/include/phosphor-mmc.inc +require conf/distro/include/ibm-mpreboot.inc SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf index 6948853c5..8d2a9078c 100644 --- a/meta-ibm/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf @@ -12,6 +12,7 @@ require conf/machine/include/openpower.inc require conf/machine/include/p9.inc require conf/distro/include/openpower-virtual-pnor.inc require conf/distro/include/phosphor-mmc.inc +require conf/distro/include/ibm-mpreboot.inc SERIAL_CONSOLES = "115200;ttyS4" -- cgit v1.2.3 From aa25e2c3f2a771666db1cff98633a2b834b422c8 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 14:14:25 -0600 Subject: mpreboot: utilize new distro feature for checks Previous code was piggy backing the memory preserving reboot function off of the phal machine feature. This had issues in that a witherspoon-tacoma system also supports mpreboot, but does not support phal. Signed-off-by: Andrew Geissler Change-Id: Ib044f5252843e84be3304bc0df8ffb8aa947526c --- .../recipes-phosphor/host/op-proc-control-systemd-links.bb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb index cae79bef0..7ce65f927 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb @@ -57,8 +57,11 @@ pkg_postinst_${PN}() { LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.requires/proc-pre-poweroff@0.service" TARGET="../proc-pre-poweroff@.service" ln -s $TARGET $LINK + fi - # on phal systems, obmc-host-crash@.target is used for MPIPL + # If the memory preserving reboot feature is enabled, set it up + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'mpreboot', d)}" = mpreboot ]; then + # on mpreboot systems, obmc-host-crash@.target is used for mpreboot mkdir -p $D$systemd_system_unitdir/obmc-host-crash@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-crash@0.target.requires/obmc-host-force-warm-reboot@0.target" TARGET="../obmc-host-force-warm-reboot@.target" @@ -68,12 +71,12 @@ pkg_postinst_${PN}() { TARGET="../op-enter-mpreboot@.service" ln -s $TARGET $LINK - # ensure diagnostic mode is shown for MPIPL + # ensure diagnostic mode is shown for MPREBOOT LINK="$D$systemd_system_unitdir/obmc-host-crash@0.target.requires/obmc-host-diagnostic-mode@0.target" TARGET="../obmc-host-diagnostic-mode@.target" ln -s $TARGET $LINK else - # If not phal, default to quiesce target in crash target to support + # If not a mpreboot system, default to quiesce target in crash target to support # older system designs like witherspoon mkdir -p $D$systemd_system_unitdir/obmc-host-crash@0.target.wants LINK="$D$systemd_system_unitdir/obmc-host-crash@0.target.wants/obmc-host-quiesce@0.target" @@ -104,7 +107,10 @@ pkg_prerm_${PN}() { LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.requires/proc-pre-poweroff@0.service" rm $LINK + fi + # Remove mpreboot specific units if enabled + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'mpreboot', d)}" = mpreboot ]; then LINK="$D$systemd_system_unitdir/obmc-host-crash@0.target.requires/obmc-host-force-warm-reboot@0.target" rm $LINK -- cgit v1.2.3 From ee12600186bed70bba59fbf0b8d9651093bdbdc0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 16:17:23 -0600 Subject: mpreboot: separate out systemd target work The OpenBMC community has been moving away from the use of the SYSTEMD_LINK macro and going towards more explicit commands to create the needed wants/requires relationships for systemd. This commit does that in preparation for some other work in this area utilizing the new mpreboot distro feature. No functional changes were done with this commit. Signed-off-by: Andrew Geissler Change-Id: I01086e51400cf94498c62d9bc6cbcc75813b20f6 --- .../openpower-debug-collector-systemd-links.inc | 25 ++++++++++++++++++++++ .../debug/openpower-debug-collector_git.bb | 21 +----------------- 2 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc new file mode 100644 index 000000000..7b2bb59cd --- /dev/null +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc @@ -0,0 +1,25 @@ +pkg_postinst_${PN}_append() { + mkdir -p $D$systemd_system_unitdir/obmc-host-crash@0.target.wants + mkdir -p $D$systemd_system_unitdir/obmc-host-timeout@0.target.wants + + LINK="$D$systemd_system_unitdir/obmc-host-crash@0.target.wants/openpower-debug-collector-checkstop@0.service" + TARGET="../openpower-debug-collector-checkstop@.service" + ln -s $TARGET $LINK + + LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog@0.service" + TARGET="../openpower-debug-collector-watchdog@.service" + ln -s $TARGET $LINK + + LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" + TARGET="../openpower-debug-collector-watchdog-timeout.service" + ln -s $TARGET $LINK +} + +pkg_prerm_${PN}_append() { + LINK="$D$systemd_system_unitdir/obmc-host-crash@0.target.wants/openpower-debug-collector-checkstop@0.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog@0.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" + rm $LINK +} diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index 08b58ea7c..505e23255 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -11,6 +11,7 @@ inherit autotools \ phosphor-dbus-yaml require ${BPN}.inc +require ${BPN}-systemd-links.inc DEPENDS += " \ phosphor-logging \ @@ -26,26 +27,6 @@ APPS = "checkstop watchdog" DEBUG_TMPL = "openpower-debug-collector-{0}@.service" SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'DEBUG_TMPL', 'APPS')}" -# This needs to be executed as part of host crash -CHECKSTOP_TMPL = "openpower-debug-collector-checkstop@.service" -CRASH_TGTFMT = "obmc-host-crash@{0}.target" -CHECKSTOP_INSTFMT = "openpower-debug-collector-checkstop@{0}.service" -CRASH_CHECKSTOP_FMT = "../${CHECKSTOP_TMPL}:${CRASH_TGTFMT}.wants/${CHECKSTOP_INSTFMT}" - -# Make watchdog part of obmc-host-timeout target -WDOG_TMPL = "openpower-debug-collector-watchdog@.service" -TIMEOUT_TGTFMT = "obmc-host-timeout@{0}.target" -WDOG_INSTFMT = "openpower-debug-collector-watchdog@{0}.service" -TIMEOUT_WDOG_FMT = "../${WDOG_TMPL}:${TIMEOUT_TGTFMT}.wants/${WDOG_INSTFMT}" - -# Capture debug information on watchdog timeout -DEBUG_WD_TIMEOUT_TMPL = "openpower-debug-collector-watchdog-timeout@.service" -DEBUG_WD_TIMEOUT_INSTFMT = "openpower-debug-collector-watchdog-timeout@{0}.service" -DEBUG_WD_TIMEOUT_FMT = "../${DEBUG_WD_TIMEOUT_TMPL}:${TIMEOUT_TGTFMT}.wants/${DEBUG_WD_TIMEOUT_INSTFMT}" - -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CRASH_CHECKSTOP_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'TIMEOUT_WDOG_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'DEBUG_WD_TIMEOUT_FMT', 'OBMC_HOST_INSTANCES')}" # Do not depend on phosphor-logging for native build DEPENDS_remove_class-native = "phosphor-logging" -- cgit v1.2.3 From 1314054a7f06a0c11677833323eca06eb4826b6e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Feb 2021 16:26:18 -0600 Subject: mpreboot: do not install service if mpreboot enabled When mpreboot is enabled, there is a more advanced form of diagnostic and recovery put into the obmc-host-crash@.target. In this case we do not want the basic error reported by the service within this repo. Tested: - Verified correct services installed for mpreboot on Rainier and Tacoma machines - Verified non-mpreboot services installed on Witherspoon machine Signed-off-by: Andrew Geissler Change-Id: If29ad7a83c1e1551a7eb319179eca504e9f93678 --- .../debug/openpower-debug-collector-systemd-links.inc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc index 7b2bb59cd..a3b729ec7 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc @@ -2,9 +2,14 @@ pkg_postinst_${PN}_append() { mkdir -p $D$systemd_system_unitdir/obmc-host-crash@0.target.wants mkdir -p $D$systemd_system_unitdir/obmc-host-timeout@0.target.wants - LINK="$D$systemd_system_unitdir/obmc-host-crash@0.target.wants/openpower-debug-collector-checkstop@0.service" - TARGET="../openpower-debug-collector-checkstop@.service" - ln -s $TARGET $LINK + # The obmc-host-crash target is repurposed for the memory preserving reboot + # feature when it is enabled. If not enabled, then install the standard + # debug collector checkstop service for basic error reporting + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'mpreboot', d)}" != mpreboot ]; then + LINK="$D$systemd_system_unitdir/obmc-host-crash@0.target.wants/openpower-debug-collector-checkstop@0.service" + TARGET="../openpower-debug-collector-checkstop@.service" + ln -s $TARGET $LINK + fi LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog@0.service" TARGET="../openpower-debug-collector-watchdog@.service" @@ -16,8 +21,10 @@ pkg_postinst_${PN}_append() { } pkg_prerm_${PN}_append() { - LINK="$D$systemd_system_unitdir/obmc-host-crash@0.target.wants/openpower-debug-collector-checkstop@0.service" - rm $LINK + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'mpreboot', d)}" != mpreboot ]; then + LINK="$D$systemd_system_unitdir/obmc-host-crash@0.target.wants/openpower-debug-collector-checkstop@0.service" + rm $LINK + fi LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog@0.service" rm $LINK LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" -- cgit v1.2.3 From 4b3c19b0f5b96f21266e0fbe68c1ed9c8c2bb57a Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Tue, 19 Jan 2021 11:39:37 -0600 Subject: phosphor-software-manager: Add verify-full-signature The phosphor-software-manager now supports signature checking of the whole tarball contents, ensuring that all the expected images are contained in the tarball. This new check adds an additional level of security, and the new tarball signature file is included in the built tarball now by default: https://gerrit.openbmc-project.xyz/c/openbmc/meta-phosphor/+/39036 https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-bmc-code-mgmt/+/39118 Change the verify_signature PACKAGECONFIG option to use the new verify-full-signature since this is the recommended option now and the previous one is marked as a legacy option. Tested: Verified the generated config.h in the phosphor-software-manager build directory has both the original WANT_SIGNATURE_VERIFY and the new WANT_SIGNATURE_FULL_VERIFY defined. Change-Id: I138d0c8ca9fc25d4e08e101c5a097c9cb4fbcbb5 Signed-off-by: Adriana Kobylak --- meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index d561eba48..4fa2aa457 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -24,7 +24,9 @@ DBUS_PACKAGES = "${SOFTWARE_MGR_PACKAGES}" # handles the rest. SYSTEMD_PACKAGES = "" -PACKAGECONFIG[verify_signature] = "-Dverify-signature=enabled, -Dverify-signature=disabled" +PACKAGECONFIG[verify_signature] = " \ + -Dverify-full-signature=enabled, \ + -Dverify-full-signature=disabled" PACKAGECONFIG[sync_bmc_files] = "-Dsync-bmc-files=enabled, -Dsync-bmc-files=disabled" PACKAGECONFIG[ubifs_layout] = "-Dbmc-layout=ubi" PACKAGECONFIG[mmc_layout] = "-Dbmc-layout=mmc" -- cgit v1.2.3 From f2ef53c9f809490491646e216f01bb780bd0f502 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Wed, 3 Feb 2021 11:59:02 -0800 Subject: Move dbus-sensors to meson This commit is designed to go in tandem with: https://gerrit.openbmc-project.xyz/c/openbmc/dbus-sensors/+/27100 Which removes the cmake support entirely, and moves 100% to meson. This provides consistency for openbmc in its project generation. This was previously checked in and +1ed on meta-phosphor. This commit simply moves the content to openbmc/openbmc https://gerrit.openbmc-project.xyz/c/openbmc/meta-phosphor/+/37365 Tested: Checked out 27100 and built. Signed-off-by: Ed Tanous Change-Id: I96d46b110df0787692df9fecab6e537be19a74ae --- .../recipes-phosphor/sensors/dbus-sensors_git.bb | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 035b4c61e..aaae804c6 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "2a40e939307c5ffccf19b19d500eac5935c63009" +SRCREV = "feb19ef095c4ab9ec037b2f23ab6318f59a96eab" PV = "0.1+git${SRCPV}" @@ -19,18 +19,20 @@ PACKAGECONFIG ??= " \ ipmbsensor \ mcutempsensor \ psusensor \ + external \ " -PACKAGECONFIG[adcsensor] = "-DDISABLE_ADC=OFF, -DDISABLE_ADC=ON" -PACKAGECONFIG[cpusensor] = "-DDISABLE_CPU=OFF, -DDISABLE_CPU=ON" -PACKAGECONFIG[exitairtempsensor] = "-DDISABLE_EXIT_AIR=OFF, -DDISABLE_EXIT_AIR=ON" -PACKAGECONFIG[externalsensor] = "-DDISABLE_EXTERNAL=OFF, -DDISABLE_EXTERNAL=ON" -PACKAGECONFIG[fansensor] = "-DDISABLE_FAN=OFF, -DDISABLE_FAN=ON" -PACKAGECONFIG[hwmontempsensor] = "-DDISABLE_HWMON_TEMP=OFF, -DDISABLE_HWMON_TEMP=ON" -PACKAGECONFIG[intrusionsensor] = "-DDISABLE_INTRUSION=OFF, -DDISABLE_INTRUSION=ON" -PACKAGECONFIG[ipmbsensor] = "-DDISABLE_IPMB=OFF, -DDISABLE_IPMB=ON" -PACKAGECONFIG[mcutempsensor] = "-DDISABLE_MCUTEMP=OFF, -DDISABLE_MCUTEMP=ON" -PACKAGECONFIG[psusensor] = "-DDISABLE_PSU=OFF, -DDISABLE_PSU=ON" +PACKAGECONFIG[adcsensor] = "-Dadc=enabled, -Dadc=disabled" +PACKAGECONFIG[cpusensor] = "-Dcpu=enabled, -Dcpu=disabled" +PACKAGECONFIG[exitairtempsensor] = "-Dexit-air=enabled, -Dexit-air=disabled" +PACKAGECONFIG[fansensor] = "-Dfan=enabled, -Dfan=disabled" +PACKAGECONFIG[hwmontempsensor] = "-Dhwmon-temp=enabled, -Dhwmon-temp=disabled" +PACKAGECONFIG[intrusionsensor] = "-Dintrusion=enabled, -Dintrusion=disabled" +PACKAGECONFIG[ipmbsensor] = "-Dipmb=enabled, -Dipmb=disabled" +PACKAGECONFIG[mcutempsensor] = "-Dmcu=enabled, -Dmcu=disabled" +PACKAGECONFIG[psusensor] = "-Dpsu-temp=enabled, -Dpsu-temp=disabled" +PACKAGECONFIG[nvmesensor] = "-Dnvme=enabled, -Dnvme=disabled" +PACKAGECONFIG[external] = "-Dexternal=enabled, -Dexternal=disabled" SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'adcsensor', \ 'xyz.openbmc_project.adcsensor.service', \ @@ -64,8 +66,7 @@ SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'externalsensor' '', d)}" DEPENDS = "boost nlohmann-json sdbusplus i2c-tools libgpiod" -inherit cmake systemd +inherit meson systemd S = "${WORKDIR}/git" -EXTRA_OECMAKE = "-DYOCTO=1" -- cgit v1.2.3 From c82045ac3508ea255948d24695383a8b4b7f931f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 25 Jan 2021 21:30:50 +0000 Subject: intel-ipmi-oem: srcrev bump 6d6dc7ad72..b910987a7d Kuiying Wang (1): Fix ipmid crash issue caused by null pointer in ipmiStorageGetSDR Change-Id: Ib93eadd2ac361b0890875e177fcdea90a0e741d5 Signed-off-by: Andrew Geissler --- meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 20bd1bd36..a63a8241b 100755 --- a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "6d6dc7ad721268a66adecca423716ce9fcf3838b" +SRCREV = "b910987a7d832e38e9342f0946aeb555a48f9cb0" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From d27eea0e3844ed0a468ed21134bfcfa0557d1fc7 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 25 Jan 2021 21:29:50 +0000 Subject: libpeci: srcrev bump c965e72c67..bc641112ab Jason M. Bills (2): Return an error for invalid target addresses Initialize variables Change-Id: I7f4a4759ea4bf4202a4bbbf2f90d496f8345da81 Signed-off-by: Andrew Geissler --- meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb b/meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb index bc046e5a2..b5fcae1f7 100644 --- a/meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb @@ -8,6 +8,6 @@ inherit cmake SRC_URI = "git://github.com/openbmc/libpeci" PV = "0.1+git${SRCPV}" -SRCREV = "c965e72c6765e054531c1ab91e7fa13f04651f21" +SRCREV = "bc641112abc99b4a972665aa984023a6713a21ac" S = "${WORKDIR}/git" -- cgit v1.2.3 From 51d608d241c1af6b58ed9a710ea808d7e01d603b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 5 Feb 2021 04:40:17 +0000 Subject: pfr-manager: srcrev bump 0884191b64..ffc5538235 Chalapathi Venkataramashetty (1): pfr-manager: Remove the compiler flag -fno-rtti to fix build Change-Id: Iab195034a0638f5e3b8107b9cce15573859e5962 Signed-off-by: Andrew Geissler --- meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb index 0399ad6c9..8e81541b7 100644 --- a/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb @@ -8,7 +8,7 @@ inherit cmake systemd SRC_URI = "git://github.com/openbmc/pfr-manager" PV = "0.1+git${SRCPV}" -SRCREV = "0884191b6478bdd787852ab9d290caaeb7816454" +SRCREV = "ffc55382359ea9bc788c377c145fbad896873b3a" S = "${WORKDIR}/git" -- cgit v1.2.3 From 686a4151f5a5db67225daf542c83ce54620110cd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Feb 2021 04:10:37 +0000 Subject: phosphor-time-manager: srcrev bump c6d33972d9..1e1dc44732 Ratan Gupta (1): Fixing the unused variable compiler issue Change-Id: Ida10c3494bb22430254b4533ff57b056fb1387e5 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb index 4e9616ecc..4f1aa27d8 100644 --- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb @@ -20,7 +20,7 @@ RDEPENDS_${PN} += "phosphor-network" RDEPENDS_${PN} += "phosphor-mapper" SRC_URI += "git://github.com/openbmc/phosphor-time-manager" -SRCREV = "c6d33972d95fd77dbbe5a249ee35ba90e25314f8" +SRCREV = "1e1dc447321adf858d8f4c685764a2b01e8754bb" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" -- cgit v1.2.3 From 6d15b58b0ca85a2a7ffcc064f4516847a2bb6098 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 4 Feb 2021 20:30:50 +0000 Subject: ipmi-blob-tool: srcrev bump bae76647e7..92a4a62c69 Patrick Venture (1): drop default internal sys parameter Change-Id: Id0b5da6396c974bc6bf13d510cf4b8afe2b25d0d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index 23f14eb63..388465fd4 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -14,4 +14,4 @@ EXTRA_OECONF = "--disable-tests" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ipmi-blob-tool" -SRCREV = "bae76647e7e5967a9e1a9729d7a74148f4b4a9ac" +SRCREV = "92a4a62c69924476c2dcfa28c940afca6defdb4d" -- cgit v1.2.3 From 914fbb3e6dbc326e08a96340ed38c022255d1ae0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 4 Feb 2021 23:00:30 +0000 Subject: openpower-hw-diags: srcrev bump dc5b0ff1d6..8f60a621c7 Zane Shelley (3): Generic binary file stream support (big-endian) refactor __captureSignatureList() with new BinFileWriter class Add register capture data FFDC to PEL Change-Id: Ib9f7212d97e5c31e3dc08c0417fb8315c42b88be Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 446bc8272..98636e621 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/openbmc/openpower-hw-diags" SYSTEMD_SERVICE_${PN} = "attn_handler.service" PV = "0.1+git${SRCPV}" -SRCREV = "dc5b0ff1d62ffbf232bde9753d1c071e2ff64069" +SRCREV = "8f60a621c72bcb134459e4bc5d2cf8b3fa3b41d8" S = "${WORKDIR}/git" -- cgit v1.2.3 From cb05a0fdb7d6fc0e6fec9e2b7a396498e11b4916 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 4 Feb 2021 23:20:34 +0000 Subject: gpioplus: srcrev bump 2f8444ce2d..6797f8a0f7 William A. Kennington III (1): subprojects: Bump to HEAD Change-Id: I1627828b409b9f1a3b49737832e8ac54df375cd6 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb index cedae50c9..8213fd7f4 100644 --- a/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb +++ b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb @@ -14,6 +14,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/gpioplus" -SRCREV = "2f8444ce2dfb265bc6dcd45cae0484d68f08dd91" +SRCREV = "6797f8a0f7862c3bb44b1629ba90811fb0f7ffd4" S = "${WORKDIR}/git" -- cgit v1.2.3 From 4974036b36e747e0deaced541ff2b6048458096c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 4 Feb 2021 23:40:37 +0000 Subject: sdeventplus: srcrev bump 921758b9da..159a35604a William A. Kennington III (1): subprojects: Update to HEAD Change-Id: Ifad7117d4ee61208762ada1e260fda04fa3d1826 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb index 1c8b6c8f5..98680382d 100644 --- a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb +++ b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb @@ -20,6 +20,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/sdeventplus" -SRCREV = "921758b9daeb3a96b9545ece2b7c9de3a8f79ba9" +SRCREV = "159a35604ab9f5d90264837b5681b0acee68b32c" S = "${WORKDIR}/git" -- cgit v1.2.3 From a3d9b88a1a1582983b64bee09dd7af681c14795b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 5 Feb 2021 17:50:50 +0000 Subject: entity-manager: srcrev bump 0836ce053c..2a96708200 Vijay Khemka (2): FruDevice: Verify offset overlap FruDevice: Check for language code Change-Id: I86d7a31488820fb56c4fc691b0d3ac1be96dfaba Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 4b83098a0..d78808b69 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "0836ce053c2ce94fb1d56eed37ad78514de7934e" +SRCREV = "2a9670820094a9a1847770597b713bf6fb3c08ba" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From ad05e271a7777e9e072033b8ec27258723cb61fc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 5 Feb 2021 21:30:46 +0000 Subject: phosphor-pid-control: srcrev bump ca791156e2..258530af96 Ed Tanous (1): Add Ed as a maintainer Patrick Venture (1): MAINTAINERS: Venture: M->R Change-Id: I7fc6fd2d006b3a61ca7150487961b631a7a69ea8 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index 082f3f117..d6d549f62 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -13,7 +13,7 @@ inherit systemd S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "ca791156e2594ce7d25b42793a0a1b60d922fefd" +SRCREV = "258530af96c8e729383e94716c0c4d275ab065f4" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if -- cgit v1.2.3 From ed230d98494adba1eb36a3a5dd168af512bfbc19 Mon Sep 17 00:00:00 2001 From: "Anton D. Kachalov" Date: Thu, 4 Feb 2021 15:27:09 +0100 Subject: meta-nuvoton: fix npcm750-evb build Signed-off-by: Anton D. Kachalov Change-Id: I02bfeccf158c8278034fec8642c00fe12fa89d23 --- meta-nuvoton/conf/machine/evb-npcm750.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-nuvoton/conf/machine/evb-npcm750.conf b/meta-nuvoton/conf/machine/evb-npcm750.conf index 38c02ed19..74f70adbc 100644 --- a/meta-nuvoton/conf/machine/evb-npcm750.conf +++ b/meta-nuvoton/conf/machine/evb-npcm750.conf @@ -2,12 +2,11 @@ KMACHINE = "nuvoton" KERNEL_DEVICETREE = "${KMACHINE}-npcm750-evb.dtb" UBOOT_MACHINE = "PolegSVB_config" +IGPS_MACHINE = "EB" FLASH_SIZE = "32768" require conf/machine/include/npcm7xx.inc require conf/machine/include/obmc-bsp-common.inc -# Don't generate MTD flash images until we're able to include the primary -# bootloader and the Linux MTD driver is ready. -IMAGE_FSTYPES = "cpio.${INITRAMFS_CTYPE}.u-boot" +IMAGE_FSTYPES = "cpio.${INITRAMFS_CTYPE}.u-boot mtd-static" -- cgit v1.2.3 From 9595dd46e111e101f666db4e7f8666bd1443a069 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 5 Feb 2021 16:28:42 +1030 Subject: linux-aspeed: Everest DTS and max31785 driver Eddie James (1): ARM: dts: aspeed: Add Everest BMC machine Matthew Barth (1): hwmon: (pmbus/max31785) Support revision "B" Change-Id: Ib12ae5c49b5245ae7b1574f723b52e9181cb7437 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index cd761b738..901195c97 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.8" LINUX_VERSION ?= "5.8.17" -SRCREV="3cc95ae40716e56f81b69615781f54c78079042d" +SRCREV="599d7f997930829f13e05d332e3e7fccd89d340d" require linux-aspeed.inc -- cgit v1.2.3 From 25aecade21909e0b18b501ae01dd10740d7253b2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 8 Feb 2021 17:20:46 +0000 Subject: bmcweb: srcrev bump d830ff5aa4..5e34b67a3e Ed Tanous (4): Remove management console special check Add chrono include to http/utility.hpp Number the common errors Re-enable dead code elimination Jonathan Doman (1): Remove unnecessary error responses for LDAP certs Change-Id: Ide6c6d1c17f21c6b98ad16e1d4dcf05df503ecae Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index a51a25d46..b8fc9181b 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "d830ff5aa48b2c39aac411162873239b235b0858" +SRCREV = "5e34b67a3e6708f0643a1d5af6ce7945b2481643" S = "${WORKDIR}/git" -- cgit v1.2.3 From 83362b9317ca90ae110e033c3532bb63008b2de8 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 8 Feb 2021 03:41:42 +0000 Subject: webui-vue: srcrev bump dada89cf0c..157d2ffe61 Dixsie Wolmers (1): Add DHCP enable to Network Settings page Sandeepa Singh (1): Add test hook for overview page Change-Id: Ifb5f52d6804d1f274862f2a91fc3d4eb4bfff632 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 2bca5e543..da2adaf37 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "dada89cf0c79a7daa7fb943f8f83455a61ad1ecd" +SRCREV = "157d2ffe6175e5849c7137dabdb05dd5b50ed372" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 89ddb26c5ab39f50f40ec5340e22264c120e5e2f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sun, 7 Feb 2021 04:50:26 +0000 Subject: phosphor-networkd: srcrev bump 86f659e671..1b5ec9c536 Manojkiran Eda (1): Make the Individual tests linkable for meson Change-Id: Ia7fd8649fa0ccfbb660febae8a93f5b73c99a67f Signed-off-by: Andrew Geissler --- meta-phosphor/classes/phosphor-networkd-rev.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass index 9a2f75a38..14746b3b5 100644 --- a/meta-phosphor/classes/phosphor-networkd-rev.bbclass +++ b/meta-phosphor/classes/phosphor-networkd-rev.bbclass @@ -1,2 +1,2 @@ SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "86f659e671ffae08b52de7a19728297661b7271a" +SRCREV = "1b5ec9c5367947d19bdf6efd08251eeb55dd90f4" -- cgit v1.2.3 From e01aceba3231ad4fd788fac29880738776ca3762 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 5 Feb 2021 17:41:08 +0000 Subject: dbus-sensors: srcrev bump feb19ef095..3a18b860ec Update the psusensor's PACKAGECONFIG to match the dbus-sensors' change. Lei YU (1): meson: Fix psusensor Change-Id: Ie23c08c70689fef4708fcd85f746f7485f960d2e Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index aaae804c6..215c1c4c8 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "feb19ef095c4ab9ec037b2f23ab6318f59a96eab" +SRCREV = "3a18b860ec24e63ab98159abc46713dcf5acea49" PV = "0.1+git${SRCPV}" @@ -30,7 +30,7 @@ PACKAGECONFIG[hwmontempsensor] = "-Dhwmon-temp=enabled, -Dhwmon-temp=disabled" PACKAGECONFIG[intrusionsensor] = "-Dintrusion=enabled, -Dintrusion=disabled" PACKAGECONFIG[ipmbsensor] = "-Dipmb=enabled, -Dipmb=disabled" PACKAGECONFIG[mcutempsensor] = "-Dmcu=enabled, -Dmcu=disabled" -PACKAGECONFIG[psusensor] = "-Dpsu-temp=enabled, -Dpsu-temp=disabled" +PACKAGECONFIG[psusensor] = "-Dpsu=enabled, -Dpsu=disabled" PACKAGECONFIG[nvmesensor] = "-Dnvme=enabled, -Dnvme=disabled" PACKAGECONFIG[external] = "-Dexternal=enabled, -Dexternal=disabled" -- cgit v1.2.3 From 9e4ec2e36c66560e64a264b2af5b2f0d1b530605 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Sat, 6 Feb 2021 17:02:01 -0600 Subject: meta-phosphor: remove duplicate boost-url Upstream now has an identical recipe at: meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb Signed-off-by: Patrick Williams Change-Id: I99636ef4eb317e39af5fc053b5c8e61d4af6ce3d --- .../recipes-support/boost-url/boost-url_git.bb | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 meta-phosphor/recipes-support/boost-url/boost-url_git.bb diff --git a/meta-phosphor/recipes-support/boost-url/boost-url_git.bb b/meta-phosphor/recipes-support/boost-url/boost-url_git.bb deleted file mode 100644 index 6d4635b66..000000000 --- a/meta-phosphor/recipes-support/boost-url/boost-url_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Boost.URL is a library for manipulating Uniform Resource Identifiers (URI) and Locators (URL)" -HOMEPAGE = "https://github.com/CPPAlliance/url" -SECTION = "libs" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" - -SRC_URI = "git://github.com/CPPAlliance/url.git" - -SRCREV = "a56ae0df6d3078319755fbaa67822b4fa7fd352b" - -S = "${WORKDIR}/git" - -inherit cmake - -DEPENDS = "boost" - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3 From 111b57c119533e0fc87cb654daecaa36b233b9e4 Mon Sep 17 00:00:00 2001 From: moyan_yyb Date: Wed, 3 Feb 2021 16:55:13 +0800 Subject: thor: initial machine creation Signed-off-by: yongbing yang Change-Id: Ic0248e729ac47d692c059648fcf60b297de2ae3d --- meta-alibaba/OWNERS | 2 + meta-alibaba/conf/layer.conf | 7 + .../packagegroups/packagegroup-alibaba-apps.bb | 32 +++ meta-alibaba/meta-thor/conf/bblayers.conf.sample | 27 ++ meta-alibaba/meta-thor/conf/conf-notes.txt | 2 + .../meta-thor/conf/distro/alibaba-openbmc.conf | 1 + meta-alibaba/meta-thor/conf/layer.conf | 9 + meta-alibaba/meta-thor/conf/local.conf.sample | 199 ++++++++++++++ meta-alibaba/meta-thor/conf/machine/thor.conf | 14 + .../recipes-bsp/linux/linux-aspeed/alibaba.cfg | 1 + .../linux/linux-aspeed/aspeed-alibaba-thor.dts | 292 +++++++++++++++++++++ .../recipes-bsp/linux/linux-aspeed_%.bbappend | 17 ++ 12 files changed, 603 insertions(+) create mode 100644 meta-alibaba/OWNERS create mode 100644 meta-alibaba/conf/layer.conf create mode 100644 meta-alibaba/meta-comm-oem/recipes-phosphor/packagegroups/packagegroup-alibaba-apps.bb create mode 100644 meta-alibaba/meta-thor/conf/bblayers.conf.sample create mode 100644 meta-alibaba/meta-thor/conf/conf-notes.txt create mode 100644 meta-alibaba/meta-thor/conf/distro/alibaba-openbmc.conf create mode 100644 meta-alibaba/meta-thor/conf/layer.conf create mode 100644 meta-alibaba/meta-thor/conf/local.conf.sample create mode 100644 meta-alibaba/meta-thor/conf/machine/thor.conf create mode 100644 meta-alibaba/meta-thor/recipes-bsp/linux/linux-aspeed/alibaba.cfg create mode 100644 meta-alibaba/meta-thor/recipes-bsp/linux/linux-aspeed/aspeed-alibaba-thor.dts create mode 100644 meta-alibaba/meta-thor/recipes-bsp/linux/linux-aspeed_%.bbappend diff --git a/meta-alibaba/OWNERS b/meta-alibaba/OWNERS new file mode 100644 index 000000000..d8b39a308 --- /dev/null +++ b/meta-alibaba/OWNERS @@ -0,0 +1,2 @@ +owners: +- SnowYang@linux.alibaba.com diff --git a/meta-alibaba/conf/layer.conf b/meta-alibaba/conf/layer.conf new file mode 100644 index 000000000..430ef5e37 --- /dev/null +++ b/meta-alibaba/conf/layer.conf @@ -0,0 +1,7 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" +# We have recipes-* directories, add to BBFILES + +BBFILE_COLLECTIONS += "alibaba-layer" +BBFILE_PATTERN_alibaba-layer = "^${LAYERDIR}/" +LAYERSERIES_COMPAT_alibaba-layer = "dunfell gatesgarth" diff --git a/meta-alibaba/meta-comm-oem/recipes-phosphor/packagegroups/packagegroup-alibaba-apps.bb b/meta-alibaba/meta-comm-oem/recipes-phosphor/packagegroups/packagegroup-alibaba-apps.bb new file mode 100644 index 000000000..ac6f99b40 --- /dev/null +++ b/meta-alibaba/meta-comm-oem/recipes-phosphor/packagegroups/packagegroup-alibaba-apps.bb @@ -0,0 +1,32 @@ +SUMMARY = "OpenBMC for Alibaba - Applications" +PR = "r1" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = " \ + ${PN}-system \ + ${PN}-tools \ + " + +PROVIDES += "virtual/obmc-system-mgmt" +RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" + +SUMMARY_${PN}-system = "Alibaba System" +RDEPENDS_${PN}-system = " \ + entity-manager \ + dbus-sensors \ + phosphor-ipmi-ipmb \ + phosphor-hostlogger \ + phosphor-sel-logger \ + phosphor-post-code-manager \ + phosphor-host-postd \ + " +PROVIDES += "virtual/obmc-tools-mgmt" +RPROVIDES_${PN}-tools += "virtual-obmc-tools-mgmt" + +SUMMARY_${PN}-tools = "Alibaba Tools" +RDEPENDS_${PN}-tools = " \ + ipmitool \ + " + diff --git a/meta-alibaba/meta-thor/conf/bblayers.conf.sample b/meta-alibaba/meta-thor/conf/bblayers.conf.sample new file mode 100644 index 000000000..50cc08f71 --- /dev/null +++ b/meta-alibaba/meta-thor/conf/bblayers.conf.sample @@ -0,0 +1,27 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" +BBPATH = "${TOPDIR}" +BBFILES ?= "" +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-alibaba \ + ##OEROOT##/meta-alibaba/meta-thor \ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-alibaba \ + ##OEROOT##/meta-alibaba/meta-thor \ + " diff --git a/meta-alibaba/meta-thor/conf/conf-notes.txt b/meta-alibaba/meta-thor/conf/conf-notes.txt new file mode 100644 index 000000000..9b3c01a55 --- /dev/null +++ b/meta-alibaba/meta-thor/conf/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-alibaba/meta-thor/conf/distro/alibaba-openbmc.conf b/meta-alibaba/meta-thor/conf/distro/alibaba-openbmc.conf new file mode 100644 index 000000000..de15fbcc6 --- /dev/null +++ b/meta-alibaba/meta-thor/conf/distro/alibaba-openbmc.conf @@ -0,0 +1 @@ +require conf/distro/include/phosphor-base.inc diff --git a/meta-alibaba/meta-thor/conf/layer.conf b/meta-alibaba/meta-thor/conf/layer.conf new file mode 100644 index 000000000..149bdf8fd --- /dev/null +++ b/meta-alibaba/meta-thor/conf/layer.conf @@ -0,0 +1,9 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "" +BBFILE_PATTERN := "^${LAYERDIR}/" +LAYERSERIES_COMPAT = "dunfell gatesgarth" diff --git a/meta-alibaba/meta-thor/conf/local.conf.sample b/meta-alibaba/meta-thor/conf/local.conf.sample new file mode 100644 index 000000000..09c441fee --- /dev/null +++ b/meta-alibaba/meta-thor/conf/local.conf.sample @@ -0,0 +1,199 @@ +# +# This file is your local configuration file and is where all local user settings +# are placed. The comments in this file give some guide to the options a new user +# to the system might want to change but pretty much any configuration option can +# be set in this file. +# +# Lines starting with the '#' character are commented out and in some cases the +# default values are provided as comments to show people example syntax. Enabling +# the option is a question of removing the # character and making any change to the +# variable as required. +# +# Machine Selection +# +MACHINE ??= "template" +# +# Where to place downloads +# +# During a first build the system will download many different source code tarballs +# from various upstream projects. This can take a while, particularly if your network +# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you +# can preserve this directory to speed up this part of subsequent builds. This directory +# is safe to share between multiple builds on the same machine too. +# +# The default is a downloads directory under TOPDIR which is the build directory. +# +DL_DIR ?= "${TOPDIR}/../downloads" +# +# Where to place shared-state files +# +# BitBake has the capability to accelerate builds based on previously built output. +# This is done using "shared state" files which can be thought of as cache objects +# and this option determines where those files are placed. +# +# You can wipe out TMPDIR leaving this directory intact and the build would regenerate +# from these files if no changes were made to the configuration. If changes were made +# to the configuration, only shared state files where the state was still valid would +# be used (done using checksums). +# +# The default is a sstate-cache directory under TOPDIR. +# +#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" +# +# Where to place the build output +# +# This option specifies where the bulk of the building work should be done and +# where BitBake should place its temporary files and output. Keep in mind that +# this includes the extraction and compilation of many applications and the toolchain +# which can use Gigabytes of hard disk space. +# +# The default is a tmp directory under TOPDIR. +# +#TMPDIR = "${TOPDIR}/tmp" +# +# Default policy config +# +# The distribution setting controls which policy settings are used as defaults. +# The default value is fine for general Yocto project use, at least initially. +# Ultimately when creating custom policy, people will likely end up subclassing +# these defaults. +# +DISTRO ?= "alibaba-openbmc" +# As an example of a subclass there is a "bleeding" edge policy configuration +# where many versions are set to the absolute latest code from the upstream +# source control systems. This is just mentioned here as an example, its not +# useful to most new users. +# DISTRO ?= "poky-bleeding" +# +# Package Management configuration +# +# This variable lists which packaging formats to enable. Multiple package backends +# can be enabled at once and the first item listed in the variable will be used +# to generate the root filesystems. +# Options are: +# - 'package_deb' for debian style deb files +# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) +# - 'package_rpm' for rpm style packages +# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" +# We default to rpm: +PACKAGE_CLASSES ?= "package_rpm" +# +# SDK/ADT target architecture +# +# This variable specifies the architecture to build SDK/ADT items for and means +# you can build the SDK packages for architectures other than the machine you are +# running the build on (i.e. building i686 packages on an x86_64 host). +# Supported values are i686 and x86_64 +#SDKMACHINE ?= "i686" +SANITY_TESTED_DISTROS_append ?= " *" +# +# Extra image configuration defaults +# +# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated +# images. Some of these options are added to certain image types automatically. The +# variable can contain the following options: +# "dbg-pkgs" - add -dbg packages for all installed packages +# (adds symbol information for debugging/profiling) +# "dev-pkgs" - add -dev packages for all installed packages +# (useful if you want to develop against libs in the image) +# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages +# (useful if you want to run the package test suites) +# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) +# "tools-debug" - add debugging tools (gdb, strace) +# "eclipse-debug" - add Eclipse remote debugging support +# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) +# "debug-tweaks" - make an image suitable for development +# e.g. ssh root access has a blank password +# 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" +# +# Additional image features +# +# The following is a list of additional classes to use when building images which +# enable extra features. Some available options which can be included in this variable +# are: +# - 'buildstats' collect build statistics +# - 'image-mklibs' to reduce shared library files size for an image +# - 'image-prelink' in order to prelink the filesystem image +# - 'image-swab' to perform host system intrusion detection +# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink +# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +USER_CLASSES ?= "buildstats image-mklibs image-prelink" +# +# Runtime testing of images +# +# The build system can test booting virtual machine images under qemu (an emulator) +# after any root filesystems are created and run tests against those images. To +# enable this uncomment this line. See classes/testimage(-auto).bbclass for +# further details. +#TEST_IMAGE = "1" +# +# Interactive shell configuration +# +# Under certain circumstances the system may need input from you and to do this it +# can launch an interactive shell. It needs to do this since the build is +# multithreaded and needs to be able to handle the case where more than one parallel +# process may require the user's attention. The default is iterate over the available +# terminal types to find one that works. +# +# Examples of the occasions this may happen are when resolving patches which cannot +# be applied, to use the devshell or the kernel menuconfig +# +# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none +# Note: currently, Konsole support only works for KDE 3.x due to the way +# newer Konsole versions behave +#OE_TERMINAL = "auto" +# By default disable interactive patch resolution (tasks will just fail instead): +PATCHRESOLVE = "noop" +# +# Disk Space Monitoring during the build +# +# Monitor the disk space during the build. If there is less that 1GB of space or less +# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully +# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# of the build. The reason for this is that running completely out of space can corrupt +# files and damages the build in ways which may not be easily recoverable. +# It's necessary to monitor /tmp, if there is no space left the build will fail +# with very exotic errors. +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" +# +# Shared-state files from other locations +# +# As mentioned above, shared state files are prebuilt cache data objects which can +# used to accelerate build time. This variable can be used to configure the system +# to search other mirror locations for these objects before it builds the data itself. +# +# This can be a filesystem directory, or a remote url such as http or ftp. These +# would contain the sstate-cache results from previous builds (possibly from other +# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the +# cache locations to check for the shared objects. +# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH +# at the end as shown in the examples below. This will be substituted with the +# correct path within the directory structure. +#SSTATE_MIRRORS ?= "\ +#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* file:///some/local/dir/sstate/PATH" +# +# Qemu configuration +# +# By default qemu will build with a builtin VNC server where graphical output can be +# seen. The two lines below enable the SDL backend too. This assumes there is a +# libsdl library available on your build system. +#PACKAGECONFIG_append_pn-qemu-native = " sdl" +#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +#ASSUME_PROVIDED += "libsdl-native" +# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to +# track the version of this file when it was generated. This can safely be ignored if +# this doesn't mean anything to you. +CONF_VERSION = "1" diff --git a/meta-alibaba/meta-thor/conf/machine/thor.conf b/meta-alibaba/meta-thor/conf/machine/thor.conf new file mode 100644 index 000000000..e20a2c741 --- /dev/null +++ b/meta-alibaba/meta-thor/conf/machine/thor.conf @@ -0,0 +1,14 @@ +KERNEL_DEVICETREE = "${KMACHINE}-alibaba-${MACHINE}.dtb" +KMACHINE = "aspeed" +require conf/machine/include/ast2500.inc + + +UBOOT_MACHINE = "ast_g5_phy_config" +FLASH_SIZE = "32768" + +# below contents will be gathered by macro 'MACHINE_FEATURES' which defined in phosphor-base.inc file +OBMC_MACHINE_FEATURES += "\ + " +VIRTUAL-RUNTIME_skeleton_workbook = "alibaba-ast2500-config" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-alibaba-apps" +PREFERRED_PROVIDER_virtual/obmc-tools-mgmt = "packagegroup-alibaba-apps" diff --git a/meta-alibaba/meta-thor/recipes-bsp/linux/linux-aspeed/alibaba.cfg b/meta-alibaba/meta-thor/recipes-bsp/linux/linux-aspeed/alibaba.cfg new file mode 100644 index 000000000..174a3f203 --- /dev/null +++ b/meta-alibaba/meta-thor/recipes-bsp/linux/linux-aspeed/alibaba.cfg @@ -0,0 +1 @@ +CONFIG_DEVMEM=y diff --git a/meta-alibaba/meta-thor/recipes-bsp/linux/linux-aspeed/aspeed-alibaba-thor.dts b/meta-alibaba/meta-thor/recipes-bsp/linux/linux-aspeed/aspeed-alibaba-thor.dts new file mode 100644 index 000000000..c05075d05 --- /dev/null +++ b/meta-alibaba/meta-thor/recipes-bsp/linux/linux-aspeed/aspeed-alibaba-thor.dts @@ -0,0 +1,292 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; +#include "aspeed-g5.dtsi" +#include +/ { + model = "Alibaba AST2500 BMC"; + compatible = "alibaba,thor", "aspeed,ast2500"; + aliases { + serial4 = &uart5; + spi2 = &spi2; + }; + chosen { + stdout-path = &uart5; + bootargs = "console=tty0 console=ttyS4,115200 earlyprintk"; + }; + memory@80000000 { + device_type = "memory"; + reg = <0x80000000 0x20000000>; + }; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + vga_memory: framebuffer@9f000000 { + no-map; + reg = <0x9f000000 0x01000000>; /* 16M */ + }; + lpc_memory: region@98000000 { + no-map; + reg = <0x98000000 0x02000000>; /* 32M */ + }; + pci_memory: region@9A000000 { + no-map; + reg = <0x9A000000 0x00010000>; /* 64K */ + }; + video_engine_memory: jpegbuffer { + size = <0x02800000>; /* 40M */ + alignment = <0x01000000>; + compatible = "shared-dma-pool"; + reusable; + }; + gfx_memory: framebuffer { + size = <0x01000000>; + alignment = <0x01000000>; + compatible = "shared-dma-pool"; + reusable; + }; + }; +}; +&fmc { + status = "okay"; + flash@0 { + status = "okay"; + m25p,fast-read; + label = "bmc"; + spi-max-frequency = <50000000>; + }; +}; +&spi1 { + status = "disabled"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default>; + flash@0 { + status = "okay"; + m25p,fast-read; + label = "pnor"; + spi-max-frequency = <100000000>; + }; +}; +&spi2 { + compatible = "aspeed,spi-dev"; + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi2ck_default + &pinctrl_spi2cs0_default + &pinctrl_spi2cs1_default + &pinctrl_spi2miso_default + &pinctrl_spi2mosi_default>; + flash@0 { + compatible = "rohm,dh2228fv"; + status = "okay"; + spi-max-frequency = <25000000>; + }; +}; +&espi { + status = "okay"; +}; +&kcs3 { + kcs_addr = <0xca2>; + status = "okay"; +}; +&lpc_ctrl { + status = "okay"; + memory-region = <&lpc_memory>; + flash = <&spi1>; +}; +&p2a { + status = "okay"; + memory-region = <&pci_memory>; +}; +&mbox { + status = "okay"; +}; +&uart1 { + /* Rear RS-232 connector */ + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_txd1_default + &pinctrl_rxd1_default + &pinctrl_nrts1_default + &pinctrl_ndtr1_default + &pinctrl_ndsr1_default + &pinctrl_ncts1_default + &pinctrl_ndcd1_default + &pinctrl_nri1_default>; +}; +&uart2 { + /* Rear RS-232 connector */ + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_txd2_default + &pinctrl_rxd2_default + &pinctrl_nrts2_default + &pinctrl_ndtr2_default + &pinctrl_ndsr2_default + &pinctrl_ncts2_default + &pinctrl_ndcd2_default + &pinctrl_nri2_default>; +}; +&uart4 { + status = "okay"; +}; +&uart5 { + status = "okay"; +}; +&mac0 { + status = "okay"; + use-ncsi; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rmii1_default>; +}; +&mac1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; +}; +&adc { + status = "okay"; +}; +&i2c0 { + status = "okay"; +}; +&i2c1 { + status = "okay"; +}; +&i2c2 { + status = "okay"; +}; +&i2c3 { + status = "okay"; +}; +&i2c4 { + status = "okay"; +}; +&i2c5 { + status = "okay"; +}; +&i2c6 { + status = "okay"; +}; +&i2c7 { + status = "okay"; +}; +&i2c8 { + status = "okay"; +}; +&i2c9 { + status = "okay"; +}; +&i2c10 { + status = "okay"; +}; +&i2c11 { + status = "okay"; +}; +&i2c12 { + status = "okay"; +}; +&i2c13 { + status = "okay"; +}; +&vuart { + status = "disabled"; +}; +&gfx { + status = "okay"; +}; +&pinctrl { + aspeed,external-nodes = <&gfx &lhc>; +}; +&pwm_tacho { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_default + &pinctrl_pwm1_default + &pinctrl_pwm2_default + &pinctrl_pwm3_default + &pinctrl_pwm4_default + &pinctrl_pwm5_default + &pinctrl_pwm6_default + &pinctrl_pwm7_default>; + fan@0 { + reg = <0x00>; + aspeed,fan-tach-ch = /bits/ 8 <0x00 0x01>; + }; + fan@1 { + reg = <0x01>; + aspeed,fan-tach-ch = /bits/ 8 <0x02 0x03>; + }; + fan@2 { + reg = <0x02>; + aspeed,fan-tach-ch = /bits/ 8 <0x04 0x05>; + }; + fan@3 { + reg = <0x03>; + aspeed,fan-tach-ch = /bits/ 8 <0x06 0x07>; + }; + fan@4 { + reg = <0x04>; + aspeed,fan-tach-ch = /bits/ 8 <0x08 0x09>; + }; + fan@5 { + reg = <0x05>; + aspeed,fan-tach-ch = /bits/ 8 <0x0a 0x0b>; + }; + fan@6 { + reg = <0x06>; + aspeed,fan-tach-ch = /bits/ 8 <0x0c 0x0d>; + }; + fan@7 { + reg = <0x07>; + aspeed,fan-tach-ch = /bits/ 8 <0x0e 0x0f>; + }; +}; +&lpc_uart { + status = "okay"; +}; +&ibt { + status = "disabled"; +}; +&lpc_snoop { + status = "okay"; + snoop-ports = <0x80>; +}; +&sdmmc { + status = "okay"; +}; +&sdhci1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sd2_default>; +}; +/* + * Enable port A as device (via the virtual hub) and port B as + * host by default on the eval board. This can be easily changed + * by replacing the override below with &ehci0 { ... } to enable + * host on both ports. + */ +&vhub { + status = "okay"; +}; +&ehci1 { + status = "okay"; +}; +&uhci { + status = "okay"; +}; +&video { + status = "okay"; + memory-region = <&video_engine_memory>; +}; +&gfx { + status = "okay"; + memory-region = <&gfx_memory>; +}; +&peci0 { + status = "okay"; +}; +&rtc { + status = "okay"; +}; + diff --git a/meta-alibaba/meta-thor/recipes-bsp/linux/linux-aspeed_%.bbappend b/meta-alibaba/meta-thor/recipes-bsp/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..18de4ac11 --- /dev/null +++ b/meta-alibaba/meta-thor/recipes-bsp/linux/linux-aspeed_%.bbappend @@ -0,0 +1,17 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +KERNEL_VERSION_SANITY_SKIP="1" +SRC_URI += "\ + file://aspeed-alibaba-thor.dts \ + file://alibaba.cfg \ + " + +do_patch_append(){ + for DTB in "${KERNEL_DEVICETREE}"; do + DT=`basename ${DTB} .dtb` + if [ -r "${WORKDIR}/${DT}.dts" ]; then + echo "debug: ${STAGING_KERNEL_DIR}" + cp ${WORKDIR}/aspeed-alibaba-thor.dts \ + ${STAGING_KERNEL_DIR}/arch/${ARCH}/boot/dts + fi + done +} -- cgit v1.2.3 From 38e84136d5ea0f52126d7c2a1c629e0eb3653039 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Fri, 5 Feb 2021 14:38:50 +0000 Subject: meta-ampere: mtjade: support FRU inventory Support to parse the Mt.Jade FRU device, map FRU data with inventory information and report FRU content via IPMI. Tested: 1. Run IPMI fru print command: root@mtjade:~# ipmitool fru print FRU Device Description : Builtin FRU Device (ID 0) Chassis Type : Rack Mount Chassis Chassis Serial : A1A1-A000-0000000000123 Board Mfg Date : Fri Feb 5 00:00:00 2021 UTC Board Mfg : WIWYNN Board Product : Mt.Jade Motherboard Board Serial : B8103010002500900019J0LB Board Part Number : B81.03010.0026 Product Manufacturer : WIWYNN Product Name : Mt.Jade Server System Product Part Number : B81.03001.0009 Product Version : EVT2 Product Serial : B810300100050130002DN0SD 2. Check FRU inventory reoirt from REST /xyz/openbmc_project/inventory/system/chassis/motherboard Signed-off-by: Thang Q. Nguyen Change-Id: I231d5766b2f89a535d850eb437d63a9db84fb846 --- .../configuration/mtjade-yaml-config.bb | 27 +++++++ .../mtjade-ipmi-fru-properties.yaml | 23 ++++++ .../mtjade-yaml-config/mtjade-ipmi-fru.yaml | 85 ++++++++++++++++++++++ .../obmc/eeproms/system/chassis/motherboard | 2 + .../ipmi/phosphor-ipmi-fru_%.bbappend | 26 +++++++ .../ipmi/phosphor-ipmi-host_%.bbappend | 14 ++++ 6 files changed, 177 insertions(+) create mode 100644 meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb create mode 100644 meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml create mode 100644 meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml create mode 100644 meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard create mode 100644 meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend create mode 100644 meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb new file mode 100644 index 000000000..66238dcf3 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb @@ -0,0 +1,27 @@ +SUMMARY = "YAML configuration for Mt.Jade" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +inherit allarch + +SRC_URI = " \ + file://mtjade-ipmi-fru.yaml \ + file://mtjade-ipmi-fru-properties.yaml \ + " + +S = "${WORKDIR}" + +do_install() { + cat mtjade-ipmi-fru.yaml > fru-read.yaml + install -m 0644 -D mtjade-ipmi-fru-properties.yaml \ + ${D}${datadir}/${BPN}/ipmi-extra-properties.yaml + install -m 0644 -D fru-read.yaml \ + ${D}${datadir}/${BPN}/ipmi-fru-read.yaml +} + +FILES_${PN}-dev = " \ + ${datadir}/${BPN}/ipmi-extra-properties.yaml \ + ${datadir}/${BPN}/ipmi-fru-read.yaml \ + " + +ALLOW_EMPTY_${PN} = "1" diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml new file mode 100644 index 000000000..db8de9f40 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml @@ -0,0 +1,23 @@ +/system/chassis/motherboard: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' + +/system/chassis: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' + +/system: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml new file mode 100644 index 000000000..80bcce434 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml @@ -0,0 +1,85 @@ +0x00: + /system/chassis/motherboard: + entityID: 7 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item.NetworkInterface: + MACAddress: + IPMIFruProperty: Custom Field 1 + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.VendorInformation: + CustomField1: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board + xyz.openbmc_project.Common.UUID: + UUID: + IPMIFruProperty: UUID + IPMIFruSection: MultiRecord + /system/chassis: + entityID: 23 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Chassis + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Chassis + Model: + IPMIFruProperty: Type + IPMIFruSection: Chassis + xyz.openbmc_project.Inventory.Decorator.VendorInformation: + CustomField2: + IPMIFruProperty: Custom Field 1 + IPMIFruSection: Chassis + /system: + entityID: 7 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Asset: + PartNumber: + IPMIFruProperty: Model Number + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.AssetTag: + AssetTag: + IPMIFruProperty: Asset Tag + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.VendorInformation: + CustomField1: + IPMIFruProperty: FRU File ID + IPMIFruSection: Product + CustomField2: + IPMIFruProperty: Custom Field 1 + IPMIFruSection: Product diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard new file mode 100644 index 000000000..f0498347b --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/3-0050/eeprom +FRUID=0 diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..be3e7fe5e --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,26 @@ +inherit obmc-phosphor-systemd + +DEPENDS_append_mtjade = " mtjade-yaml-config" + +EXTRA_OECONF_mtjade = " \ + YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \ + PROP_YAML=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-extra-properties.yaml \ + " +FILESEXTRAPATHS_prepend_mtjade := "${THISDIR}/${PN}:" + +EEPROM_NAMES = "motherboard" + +EEPROMFMT = "system/chassis/{0}" +EEPROM_ESCAPEDFMT = "system-chassis-{0}" +EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" +EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" + +ENVFMT = "obmc/eeproms/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}" + +TMPL = "obmc-read-eeprom@.service" +TGT = "multi-user.target" +INSTFMT = "obmc-read-eeprom@{0}.service" +FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" + +SYSTEMD_LINK_${PN}_append_mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 000000000..980746ede --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,14 @@ +FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:" + +DEPENDS_append_mtjade = " mtjade-yaml-config" + +RRECOMMENDS_${PN} += "ipmitool" + +EXTRA_OECONF_mtjade = " \ + FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \ + " + +do_install_append_mtjade(){ + install -d ${D}${includedir}/phosphor-ipmi-host + install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host +} -- cgit v1.2.3 From 72eb151aeec4b22bba618db928eed6c401e021af Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Sat, 6 Feb 2021 01:22:45 +0000 Subject: meta-ampere: Set BMC MAC Address from FRU inventory Support to get BMC MAC address from FRU over the FRU inventory information (/xyz/openbmc_project/inventory/system/chassis/motherboard) and update to the eth0 Ethernet interface and set the eth1addr u-boot variable. Tested: 1. Boot to u-boot, clear the eth1addr variable, save and reboot. 2. Boot to Linux: - Check if the eth0 interface uses the MAC address in FRU. root@mtjade:~# ip addr show dev eth0 2: eth0: mtu 1500 qdisc pfifo_fast qlen 1000 link/ether 70:e2:84:86:76:ba brd ff:ff:ff:ff:ff:ff - Check if the eth1addr u-boot variable uses the MAC address in FRU root@mtjade:~# fw_printenv eth1addr eth1addr=70:E2:84:86:76:BA Signed-off-by: Chanh Nguyen Signed-off-by: Thang Q. Nguyen Change-Id: Ifb7eefbb17257545d026005f859d37ef562289b7 --- .../recipes-ac01/mac/ampere-mac-update.bb | 26 +++++++++++++ .../ampere-mac-update/ampere_update_mac.service | 12 ++++++ .../mac/ampere-mac-update/ampere_update_mac.sh | 43 ++++++++++++++++++++++ meta-ampere/meta-jade/conf/machine/mtjade.conf | 1 + 4 files changed, 82 insertions(+) create mode 100644 meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update.bb create mode 100644 meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.service create mode 100644 meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.sh diff --git a/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update.bb b/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update.bb new file mode 100644 index 000000000..3e18ad71e --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update.bb @@ -0,0 +1,26 @@ +SUMMARY = "Ampere Computing LLC Update MAC Address from FRU Inventory Information" +DESCRIPTION = "Update MAC Address from FRU Inventory Information for Ampere systems" +PR = "r1" + +LICENSE = "Apache-2.0" + +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd +inherit obmc-phosphor-systemd + +DEPENDS = "systemd" +RDEPENDS_${PN} = "bash" + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://ampere_update_mac.sh \ + " + +SYSTEMD_SERVICE_${PN} = "ampere_update_mac.service" + +do_install_append() { + install -d ${D}/${sbindir} + install -m 755 ${WORKDIR}/ampere_update_mac.sh ${D}/${sbindir} +} diff --git a/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.service b/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.service new file mode 100644 index 000000000..86f7a0346 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.service @@ -0,0 +1,12 @@ +[Unit] +Description=Updating MAC Address Service From FRU inventory +After=xyz.openbmc_project.Inventory.Manager.service + +[Service] +ExecStart=/usr/sbin/ampere_update_mac.sh +SyslogIdentifier=ampere_update_mac.sh +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.sh b/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.sh new file mode 100644 index 000000000..5dbdde771 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.sh @@ -0,0 +1,43 @@ +#!/bin/bash +# +# This script is used to get the MAC Address from FRU Inventory information + +ETHERNET_INTERFACE="eth0" +ENV_ETH="eth1addr" +ENV_MAC_ADDR=`fw_printenv` + +# Check if BMC MAC address is exported +if [[ $ENV_MAC_ADDR =~ $ENV_ETH ]]; then + echo "WARNING: BMC MAC address already exist!" + exit 0 +fi + +# Read FRU Board Custom Field 1 to get the MAC address +CUSTOM_FIELD_1=`busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard xyz.openbmc_project.Inventory.Item.NetworkInterface MACAddress` +MAC_ADDR=`echo $CUSTOM_FIELD_1 | cut -d "\"" -f 2` + +# Check if BMC MAC address is exported +if [ -z "${MAC_ADDR}" ]; then + echo "ERROR: No BMC MAC address is detected from FRU Inventory information!" + # Return 1 so that systemd knows the service failed to start + exit 1 +fi + +# Request to update the MAC address +fw_setenv ${ENV_ETH} ${MAC_ADDR} + +if [[ $? -ne 0 ]]; then + echo "ERROR: Fail to set MAC address to ${ENV_ETH}" + exit 1 +fi + +# Request to restart the service +ifconfig ${ETHERNET_INTERFACE} down +ifconfig ${ETHERNET_INTERFACE} hw ether ${MAC_ADDR} +if [[ $? -ne 0 ]]; then + echo "ERROR: Can not update MAC ADDR to ${ETHERNET_INTERFACE}" + exit 1 +fi +ifconfig ${ETHERNET_INTERFACE} up + +echo "Successfully update the MAC address ${MAC_ADDR} to ${ENV_ETH} and ${ETHERNET_INTERFACE}" diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 218018953..ec6e27f17 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -18,6 +18,7 @@ VOLATILE_LOG_DIR = "no" OBMC_IMAGE_EXTRA_INSTALL_append = "\ ampere-usbnet \ ampere-flash-utils \ + ampere-mac-update \ " PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" -- cgit v1.2.3 From c472176ad6c41cd1579ae106d92270cb1a63d447 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 8 Feb 2021 17:50:01 -0800 Subject: meta-google: Add NCSId at 7d6fa42 Google-Bug-Id: 179618497 Change-Id: I1af1d4269e5473302b7741c4c74dcb7c130ff01e Signed-off-by: William A. Kennington III --- meta-google/recipes-google/ncsi/ncsid_git.bb | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 meta-google/recipes-google/ncsi/ncsid_git.bb diff --git a/meta-google/recipes-google/ncsi/ncsid_git.bb b/meta-google/recipes-google/ncsi/ncsid_git.bb new file mode 100644 index 000000000..94278feb7 --- /dev/null +++ b/meta-google/recipes-google/ncsi/ncsid_git.bb @@ -0,0 +1,40 @@ +SUMMARY = "Google NCSI daemon" +DESCRIPTION = "Google NCSI daemon." +HOMEPAGE = "http://github.com/openbmc/google-misc" +PR = "r1" +PV = "1.0+git${SRCPV}" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +SRC_URI += "git://github.com/openbmc/google-misc" +SRCREV = "7d6fa42fd19cf708de1257414bb375d5a552b722" +S = "${WORKDIR}/git/ncsid" + +inherit meson systemd + +SYSTEMD_SERVICE_${PN} += " \ + dhcp4@.service \ + dhcp6@.service \ + ncsid@.service \ + nic-hostful@.target \ + nic-hostless@.target \ + update-static-neighbors@.service \ + update-static-neighbors@.timer \ +" + +DEPENDS += " \ + fmt \ + sdbusplus \ + stdplus \ +" + +RDEPENDS_${PN} += " \ + bash \ + busybox \ + iputils-arping \ + jq \ + ndisc6-ndisc6 \ + ndisc6-rdisc6 \ + systemd \ +" -- cgit v1.2.3 From 24bf30d24bb81c52b23b1eba9ac410ab7e90bcb7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 8 Feb 2021 18:46:45 -0800 Subject: meta-google: Add ncsid-config package Google-Bug-Id: 179618497 Change-Id: Id0ba358215054159e1d9a2329ae2393b5b9eeabf Signed-off-by: William A. Kennington III --- meta-google/recipes-google/ncsi/ncsid-config.bb | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 meta-google/recipes-google/ncsi/ncsid-config.bb diff --git a/meta-google/recipes-google/ncsi/ncsid-config.bb b/meta-google/recipes-google/ncsi/ncsid-config.bb new file mode 100644 index 000000000..339ce2f34 --- /dev/null +++ b/meta-google/recipes-google/ncsi/ncsid-config.bb @@ -0,0 +1,39 @@ +SUMMARY = "Configures ncsid for a gBMC system" +PR = "r1" +LICENSE = "CLOSED" + +inherit systemd + +SRC_URI += "file://50-ncsi.rules.in" + +S = "${WORKDIR}" + +RDEPENDS_${PN} += "ncsid" + +FILES_${PN} += "${systemd_unitdir}" + +do_install_append() { + install -d -m0755 ${D}${sysconfdir}/sysctl.d + echo "net.ipv6.conf.${NCSID_IF_NAME}.accept_dad=0" \ + >>${D}${sysconfdir}/sysctl.d/25-nodad.conf + echo "net.ipv6.conf.${NCSID_IF_NAME}.dad_transmits=0" \ + >>${D}${sysconfdir}/sysctl.d/25-nodad.conf + + netdir=${D}${systemd_unitdir}/network/00-bmc-${NCSID_IF_NAME}.network.d + install -d -m0755 "$netdir" + echo '[Network]' >>"$netdir"/ncsi.conf + echo 'DHCP=false' >>"$netdir"/ncsi.conf + echo 'IPv6AcceptRA=false' >>"$netdir"/ncsi.conf + echo 'LLMNR=false' >>"$netdir"/ncsi.conf + echo 'MulticastDNS=false' >>"$netdir"/ncsi.conf + echo 'LinkLocalAddressing=ipv6' >>"$netdir"/ncsi.conf + + nftdir=${D}${sysconfdir}/nftables + install -d -m0755 "$nftdir" + sed "s,@NCSI_IF@,${NCSID_IF_NAME}," ${WORKDIR}/50-ncsi.rules.in \ + >"$nftdir"/50-ncsi.rules + + wantdir=${D}${systemd_system_unitdir}/multi-user.target.wants + install -d -m0755 "$wantdir" + ln -sv ../ncsid@.service "$wantdir"/ncsid@${NCSID_IF_NAME}.service +} -- cgit v1.2.3 From afe167d4f144e51e9275b2c861e6317c1a7fc80d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 8 Feb 2021 20:07:49 -0800 Subject: meta-google: ncsid-config: Fixup recipe The license was mistakenly set to closed and it was missing an included rules file. Google-Bug-Id: 179618497 Change-Id: I8b9b01f7b53f03e6caa079de36e096db1a875955 Signed-off-by: William A. Kennington III --- meta-google/recipes-google/ncsi/files/50-ncsi.rules.in | 14 ++++++++++++++ meta-google/recipes-google/ncsi/ncsid-config.bb | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 meta-google/recipes-google/ncsi/files/50-ncsi.rules.in diff --git a/meta-google/recipes-google/ncsi/files/50-ncsi.rules.in b/meta-google/recipes-google/ncsi/files/50-ncsi.rules.in new file mode 100644 index 000000000..33031f0db --- /dev/null +++ b/meta-google/recipes-google/ncsi/files/50-ncsi.rules.in @@ -0,0 +1,14 @@ +table inet filter { + chain ncsi_input { + type filter hook input priority 0; policy drop; + iifname != @NCSI_IF@ accept + ct state established accept + tcp dport 3959 accept + udp dport 3959 accept + tcp dport 3967 accept + udp dport 3967 accept + icmpv6 type nd-neighbor-advert accept + icmpv6 type nd-neighbor-solicit accept + icmpv6 type nd-router-advert accept + } +} diff --git a/meta-google/recipes-google/ncsi/ncsid-config.bb b/meta-google/recipes-google/ncsi/ncsid-config.bb index 339ce2f34..17a88f17c 100644 --- a/meta-google/recipes-google/ncsi/ncsid-config.bb +++ b/meta-google/recipes-google/ncsi/ncsid-config.bb @@ -1,6 +1,7 @@ -SUMMARY = "Configures ncsid for a gBMC system" +SUMMARY = "Configures ncsid for a system" PR = "r1" -LICENSE = "CLOSED" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit systemd -- cgit v1.2.3 From 94a72bbce6f61365712bf21f75d958a8d944179b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 9 Feb 2021 10:10:22 +0000 Subject: pfr-manager: srcrev bump ffc5538235..f88197083c Chalapathi Venkataramashetty (1): pfr-manager: add ufmSupport property to PFR.Attributes interface. Change-Id: I872c7b78e8a2c0d955860b6341212c731a3bb401 Signed-off-by: Andrew Geissler --- meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb index 8e81541b7..8b6a885c1 100644 --- a/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb @@ -8,7 +8,7 @@ inherit cmake systemd SRC_URI = "git://github.com/openbmc/pfr-manager" PV = "0.1+git${SRCPV}" -SRCREV = "ffc55382359ea9bc788c377c145fbad896873b3a" +SRCREV = "f88197083c3372cfb9167347b3cf9cc26d488a4d" S = "${WORKDIR}/git" -- cgit v1.2.3 From a1196258609150471b657df24e61934f28977380 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 8 Feb 2021 20:13:19 -0800 Subject: meta-google: ncsid-config: Error for missing interface Change-Id: Ifeb48720421e13f9313f056f8c15232982824daa Signed-off-by: William A. Kennington III --- meta-google/recipes-google/ncsi/ncsid-config.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-google/recipes-google/ncsi/ncsid-config.bb b/meta-google/recipes-google/ncsi/ncsid-config.bb index 17a88f17c..e5d77761a 100644 --- a/meta-google/recipes-google/ncsi/ncsid-config.bb +++ b/meta-google/recipes-google/ncsi/ncsid-config.bb @@ -14,6 +14,11 @@ RDEPENDS_${PN} += "ncsid" FILES_${PN} += "${systemd_unitdir}" do_install_append() { + if [ -z "${NCSID_IF_NAME}" ]; then + echo "Missing NCSID_IF_NAME" >&2 + exit 1 + fi + install -d -m0755 ${D}${sysconfdir}/sysctl.d echo "net.ipv6.conf.${NCSID_IF_NAME}.accept_dad=0" \ >>${D}${sysconfdir}/sysctl.d/25-nodad.conf -- cgit v1.2.3 From b1e568eb3b219f9f3af5780bfdf75d7df45e0922 Mon Sep 17 00:00:00 2001 From: Chirag Sharma Date: Mon, 8 Feb 2021 01:23:47 -0600 Subject: dump: Adding workaround for jffs2 file system Change: Incase of jffs2 the jffs-workaround flag will be enabled and will watch IN_CLOSE_WRITE event during core file creation. For rest of the file systems(ubifs, ext4 etc) the flag will be disabled and will watch for IN_CREATE event. For more details please refer to "openbmc/openbmc#2240" and "openbmc/openbmc#2287" issues. Signed-off-by: Chirag Sharma Change-Id: I4c43473ae557f3fe45a583e0206d52b318773c88 --- .../recipes-phosphor/dump/phosphor-debug-collector.inc | 2 +- .../recipes-phosphor/dump/phosphor-debug-collector_git.bb | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index e6548ae22..18ff3f5eb 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "24e0c5910af87fac22c08dd61d2315cd98c56fcd" +SRCREV = "e22aca712e024a8989d4d0f2c6235513abb06d13" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index cca5d629e..9854f05bc 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -174,12 +174,10 @@ python install_dreport_user_scripts() { install_dreport_user_script(srcname, d) } -#Enable ubifs-workaround by DISTRO_FEATURE obmc-ubi-fs. -PACKAGECONFIG_append_df-obmc-ubi-fs = " ubifs-workaround" -PACKAGECONFIG[ubifs-workaround] = " \ - -Dubifs-workaround=enabled, \ - -Dubifs-workaround=disabled \ -" +PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', \ + 'obmc-ubi-fs phosphor-mmc', '', 'jffs-workaround', d)}" +PACKAGECONFIG[jffs-workaround] = "-Djffs-workaround=enabled, \ + -Djffs-workaround=disabled" PACKAGECONFIG[host-dump-transport-pldm] = " \ -Dhost-transport=pldm,, \ -- cgit v1.2.3 From d35004fcfe2640008d134d38ddb9b48c42cce140 Mon Sep 17 00:00:00 2001 From: Benjamin Fair Date: Wed, 3 Feb 2021 09:53:33 -0800 Subject: meta-phosphor: phosphor-ipmi-ssif: set version to git Rename the recipe file to add "_git" as a suffix. This sets the package version to "git" and is standard for recipes built from git without a specific version. Also set the PV variable to the conventional value. Change-Id: Ib1159bced76aae33df3eaa4308e8627e1527c4e4 Signed-off-by: Benjamin Fair --- .../recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb | 24 --------------------- .../ipmi/phosphor-ipmi-ssif_git.bb | 25 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb create mode 100644 meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb deleted file mode 100644 index 117d65afc..000000000 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Phosphor OpenBMC SSIF to DBUS" -DESCRIPTION = "Phosphor OpenBMC SSIF to DBUS." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit meson pkgconfig -inherit systemd - -SYSTEMD_SERVICE_${PN} = "ssifbridge.service" - -PROVIDES += "virtual/obmc-host-ipmi-hw" -RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" -RRECOMMENDS_${PN} += "phosphor-ipmi-host" - -DEPENDS += "systemd" -DEPENDS += "phosphor-logging" -DEPENDS += "sdbusplus" -DEPENDS += "cli11" - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/ssifbridge.git;protocol=git;branch=master" -SRCREV= "b26a9b6aea6c578fa71274bed14466607b0d8426" - diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb new file mode 100644 index 000000000..a0055b97e --- /dev/null +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb @@ -0,0 +1,25 @@ +SUMMARY = "Phosphor OpenBMC SSIF to DBUS" +DESCRIPTION = "Phosphor OpenBMC SSIF to DBUS." +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit meson pkgconfig +inherit systemd + +SYSTEMD_SERVICE_${PN} = "ssifbridge.service" + +PROVIDES += "virtual/obmc-host-ipmi-hw" +RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" +RRECOMMENDS_${PN} += "phosphor-ipmi-host" + +DEPENDS += "systemd" +DEPENDS += "phosphor-logging" +DEPENDS += "sdbusplus" +DEPENDS += "cli11" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/openbmc/ssifbridge.git;protocol=git;branch=master" +SRCREV= "b26a9b6aea6c578fa71274bed14466607b0d8426" + -- cgit v1.2.3 From 14c44a7b58c819ae550dda6fd298115503820a7e Mon Sep 17 00:00:00 2001 From: Chanh Nguyen Date: Fri, 29 Jan 2021 14:40:58 +0700 Subject: os-release: add EXTENDED_VERSION to /etc/os-release This adds a new OS identification parameter (EXTENDED_VERSION) to the /etc/os-release file in the generated OpenBMC image to indicate the extended version of the OpenBMC image. Note the extended version is typically set in the openbmc/meta-*/meta-MACHINE/conf/local.conf.sample file (This is where TEMPLATECONF points to.) by "EXTENDED_VERSION" variable. Tested: On the build system, `cat $IMAGE_ROOTFS/etc/os-release` shows the correct value. Signed-off-by: Chanh Nguyen Change-Id: I34d52e3799d83902e12be95d12f4036b70d721cd --- meta-phosphor/recipes-core/os-release/os-release.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend index 4c9e157a2..15852327f 100644 --- a/meta-phosphor/recipes-core/os-release/os-release.bbappend +++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend @@ -21,7 +21,7 @@ VERSION = "${@'-'.join(d.getVar('VERSION_ID').split('-')[0:2])}" BUILD_ID := "${@run_git(d, 'describe --abbrev=0')}" OPENBMC_TARGET_MACHINE = "${MACHINE}" -OS_RELEASE_FIELDS_append = " BUILD_ID OPENBMC_TARGET_MACHINE" +OS_RELEASE_FIELDS_append = " BUILD_ID OPENBMC_TARGET_MACHINE EXTENDED_VERSION" # Ensure the git commands run every time bitbake is invoked. BB_DONT_CACHE = "1" -- cgit v1.2.3 From 0b7e3d6e2382f6836f151ae9a7a956b9b177608e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 4 Feb 2021 14:27:57 -0600 Subject: power-restore: define new one_time property IBM has a use case where it wishes to utilize the power-restore functionality for a firmware update path. A firmware update is initiated through the host operating system. Once it has completed writing the BMC flash, the host wants to initiated a power off of the system, a reboot of the BMC, and then an automatic power on of the host. Instead of writing special software to handle this automatic boot of the host after the BMC has rebooted, lets utilize a one_time setting within the power-restore logic. Signed-off-by: Andrew Geissler Change-Id: I4964004e3b1827853ff00437172196e4fbbfcc46 --- .../settings/phosphor-settings-defaults/defaults.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml index f2df02d32..32b32e840 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml @@ -58,6 +58,12 @@ PowerRestorePolicy: Default: RestorePolicy::Policy::AlwaysOff +/xyz/openbmc_project/control/host0/power_restore_policy/one_time: + - Interface: xyz.openbmc_project.Control.Power.RestorePolicy + Properties: + PowerRestorePolicy: + Default: RestorePolicy::Policy::AlwaysOff + /xyz/openbmc_project/time/sync_method: - Interface: xyz.openbmc_project.Time.Synchronization Properties: -- cgit v1.2.3 From 6539353fecfb720249360a5fcad1d2a40474af0c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 28 Jan 2021 13:17:12 -0600 Subject: sched-host-tran: enable in ibm images The plan on IBM systems is that the host software will communicate via PLDM which will utilize the D-Bus properties provided by this function. Note that the new D-Bus interfaces provided by this function could also be supported via Redfish. The PowerOnDelaySeconds and PowerOffDelaySeconds properties within the ComputerSystem object would map to what's provided here. There are no plans currently to do this though as IBM's only use case is controlling this function via the in-band PLDM interface. Tested: - Verified the generated image had scheduling service and function worked as expected scheduling a power on then power off Signed-off-by: Andrew Geissler Change-Id: I781dfba0871853feafed49faa72bf1c05f657d85 --- meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend index a982e12b1..075cddab2 100644 --- a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1 +1,6 @@ EXTRA_OEMESON_witherspoon += "-Dwarm-reboot=disabled" + +# The scheduled-host-transition package provides support to +# schedule power on and off operations for the host at some +# time in the future. IBM systems will utilize this feature +RRECOMMENDS_${PN}-host += "${PN}-scheduled-host-transition" -- cgit v1.2.3 From 552636db916ef3f870c23058c056b9a225e5acc7 Mon Sep 17 00:00:00 2001 From: Brandon Kim Date: Tue, 9 Feb 2021 15:52:04 -0800 Subject: MAINTAINERS: OWNERS: Add Brandon Kim Change-Id: I2f3d0dfd3ab97f0da0f179769598cb3dca66a134 Signed-off-by: Brandon Kim --- meta-google/MAINTAINERS | 1 + meta-google/OWNERS | 1 + 2 files changed, 2 insertions(+) diff --git a/meta-google/MAINTAINERS b/meta-google/MAINTAINERS index b58705432..7b9b8f033 100644 --- a/meta-google/MAINTAINERS +++ b/meta-google/MAINTAINERS @@ -46,3 +46,4 @@ M: Nancy Yuen M: William Kennington M: Benjamin Fair M: Ed Tanous +M: Brandon Kim diff --git a/meta-google/OWNERS b/meta-google/OWNERS index 1e2108aee..6608f2e5b 100644 --- a/meta-google/OWNERS +++ b/meta-google/OWNERS @@ -3,3 +3,4 @@ owners: - wak@google.com - benjaminfair@google.com - edtanous@google.com +- brandonkim@google.com -- cgit v1.2.3 From df6e9ec1863ee609647991bce764005ae7741085 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 10 Feb 2021 13:00:40 +0000 Subject: phosphor-dbus-interfaces and phosphor-logging bump phosphor-dbus-interfaces: srcrev bump 1b4a98af49..9969a5b401 Adriana Kobylak (1): Entry: Add GetEntry method Wludzik, Jozef (1): Changed array of sensor to single sensor in Telemetry.Report phosphor-logging: srcrev bump b50c705c3b..eb5d3f2fbc Adriana Kobylak (1): elog_entry: Implement getEntry method Change-Id: I34a6bc8227f73c53e8a19644d02b1555a76ba7c1 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 +- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index d266d1c99..bfecfb95e 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "1b4a98af49059da61695c41469e4b7b134c1bf68" +SRCREV = "9969a5b4016bc8ae62e5f23aad476c6352dfac86" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 5a1ffd5eb..7ec34b3a5 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -55,7 +55,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "b50c705c3bb3738673f98cd371b408a5b48e629a" +SRCREV = "eb5d3f2fbcf584a28dc7aeaed050243ba0a038ea" S = "${WORKDIR}/git" -- cgit v1.2.3 From d1d753ae3a2989fd4180382b2a59f70e9fae8440 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 9 Feb 2021 19:50:50 +0000 Subject: bmcweb: srcrev bump 5e34b67a3e..2b3da45876 Ed Tanous (1): Add OWNERS file to repo Wludzik, Jozef (2): Redfish TelemetryService schema implementation Remove LogService from TelemetryService Change-Id: I3fb8e6ce8e8e9b252f8ad891fd950593265775bf Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index b8fc9181b..b5ebe96b5 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "5e34b67a3e6708f0643a1d5af6ce7945b2481643" +SRCREV = "2b3da45876aac57a36d3093379a992d699e7e396" S = "${WORKDIR}/git" -- cgit v1.2.3 From 8ff0bfc568611cf93cf11c1420791136f4080443 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 10 Feb 2021 12:21:54 +0000 Subject: telemetry: srcrev bump 1ac4d54784..405c1e4bf8 Krzysztof Grobelny (1): Changed dbus add report interface Wludzik, Jozef (1): Add simple Redfish tests Change-Id: Ieee72a8f9bc6a3b2f50d98d55d5cbd6ff470e417 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 8946d41c5..2ed09dd7d 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "1ac4d547845d70f987a7bf43bb65405be92727d8" +SRCREV = "405c1e4bf8b993cb3800adead546e91b030ecb9b" S = "${WORKDIR}/git" -- cgit v1.2.3 From c562b25a1edd309bf55490fede5d9f7c7321fe06 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 9 Feb 2021 22:11:25 +0000 Subject: phosphor-power: srcrev bump 3cd2b40713..45907cc7de Shawn McCarney (2): regulators: Add VPD service regulators: Complete compare_vpd action Change-Id: I3c941403b1b253c79e07cff459d3e9d1987956d3 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 8a648bec1..c33bf0a90 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "3cd2b407131b5f0111c3a1c50383f34f84f6f27f" +SRCREV = "45907cc7de953482fa896c8601a66a9d2ebd7495" -- cgit v1.2.3 From d55537c587aad70c98354811f3522f92f030acd2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 9 Feb 2021 22:10:28 +0000 Subject: openpower-hw-diags: srcrev bump 8f60a621c7..188f1096e8 Ben Tyner (3): Attn: Add TI info additional data to pel ffdc Attn: Fix non-null-terminated string in ti handler Attn: Refactor dbus calls for pel handling Change-Id: I53f5a067837a61d99b4d4de66bc82b8a011b1394 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 98636e621..85cd143ac 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/openbmc/openpower-hw-diags" SYSTEMD_SERVICE_${PN} = "attn_handler.service" PV = "0.1+git${SRCPV}" -SRCREV = "8f60a621c72bcb134459e4bc5d2cf8b3fa3b41d8" +SRCREV = "188f1096e8b8bafb03e3b614062dd4d4412d1feb" S = "${WORKDIR}/git" -- cgit v1.2.3 From b61d51d625506bc473144f5e0d58f28f34f220f1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 10 Feb 2021 07:20:32 +0000 Subject: openpower-vpd-parser: srcrev bump 9094d4f645..cfd7a75ab4 Alpana Kumari (1): Set Presence as False for all the FRUs Change-Id: I92c0b096a08896c3aacdeb0453868ba35ce617be Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 64a621e11..f73ea457f 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "9094d4f6453ca8fcca2d6d62967631cb8bedbcc6" +SRCREV = "cfd7a75ab49d18abbba4585c392ca12d295e7775" -- cgit v1.2.3 From 2f996b049f0e687e83959039a645205300bf93c1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 8 Feb 2021 22:11:00 +0000 Subject: dbus-sensors: srcrev bump 3a18b860ec..4958558616 Gaurav Gandhi (1): PSUSensor: Add support for MAX20710, ISL68223, ISL69243 Yong Zhao (1): Fan: Optimize the pwm sensor creation Change-Id: Iba77ff32ba6cfb325ee8e77bbf505637afd18c58 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 215c1c4c8..a9330fbb9 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "3a18b860ec24e63ab98159abc46713dcf5acea49" +SRCREV = "495855861648f082a73d4ba4afe23262d6fb0ad0" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 48152e073bcc88de20ace910a9768f323fbae217 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 10 Feb 2021 15:10:50 +0000 Subject: phosphor-fan-presence: srcrev bump ac37297dd3..871bfeaeb3 Matt Spinler (6): sensor-mon: Create sensor-monitor application sensor-mon: Handle propertiesChanged sensor-mon: Start timers and shutdown sensor-mon: Persist timer start times sensor-mon: Create event logs sensor-mon: Add a readme Change-Id: I34dbcb0b12c79a4cf4d75cb8bf90ee8c36b544e8 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index c761e978c..ae6093086 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "ac37297dd327028f8ac41e4459eeb539144292a6" +SRCREV = "871bfeaeb3eb651c3c2d0bd3ed9bb67c753ca824" -- cgit v1.2.3 From 7354cf7e664c248eb0b043138657ff8739cc456b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 9 Feb 2021 04:20:12 +0000 Subject: google-misc: srcrev bump 7d6fa42fd1..a65b7b8174 William A. Kennington III (1): Add missing googletest subproject Change-Id: I19603616da8f40104a86ef7367e8d8e7e2400494 Signed-off-by: Andrew Geissler --- meta-google/recipes-google/ncsi/ncsid_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-google/recipes-google/ncsi/ncsid_git.bb b/meta-google/recipes-google/ncsi/ncsid_git.bb index 94278feb7..96833b885 100644 --- a/meta-google/recipes-google/ncsi/ncsid_git.bb +++ b/meta-google/recipes-google/ncsi/ncsid_git.bb @@ -8,7 +8,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://../LICENSE;md5=34400b68072d710fecd0a2940a0d1658" SRC_URI += "git://github.com/openbmc/google-misc" -SRCREV = "7d6fa42fd19cf708de1257414bb375d5a552b722" +SRCREV = "a65b7b8174de2720b3abe97ebc95a4619bc1bd73" S = "${WORKDIR}/git/ncsid" inherit meson systemd -- cgit v1.2.3 From 0d84c227694b49723552cd5e57e9168c61121d82 Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Tue, 9 Feb 2021 16:27:00 -0800 Subject: meta-google: recipes-core: busybox: Import from gBMC Initial recipes-core/busybox code from gBMC. Google-Bug-Id: 179618494 Upstream: 8ac594bdf054082ca6dbe35c4345759fe4c31669 Change-Id: Iab31d541d0130e9c1da7b7289383ecd66353f30c Signed-off-by: Willy Tu --- meta-google/recipes-core/busybox/busybox_%.bbappend | 6 ++++++ meta-google/recipes-core/busybox/files/ip.cfg | 1 + meta-google/recipes-core/busybox/files/ls.cfg | 1 + meta-google/recipes-core/busybox/files/udhcpc6.cfg | 6 ++++++ 4 files changed, 14 insertions(+) create mode 100644 meta-google/recipes-core/busybox/busybox_%.bbappend create mode 100644 meta-google/recipes-core/busybox/files/ip.cfg create mode 100644 meta-google/recipes-core/busybox/files/ls.cfg create mode 100644 meta-google/recipes-core/busybox/files/udhcpc6.cfg diff --git a/meta-google/recipes-core/busybox/busybox_%.bbappend b/meta-google/recipes-core/busybox/busybox_%.bbappend new file mode 100644 index 000000000..38863ec45 --- /dev/null +++ b/meta-google/recipes-core/busybox/busybox_%.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/files:" +SRC_URI_append_gbmc = " \ + file://udhcpc6.cfg \ + file://ip.cfg \ + file://ls.cfg \ +" diff --git a/meta-google/recipes-core/busybox/files/ip.cfg b/meta-google/recipes-core/busybox/files/ip.cfg new file mode 100644 index 000000000..f9357715e --- /dev/null +++ b/meta-google/recipes-core/busybox/files/ip.cfg @@ -0,0 +1 @@ +CONFIG_IPNEIGH=y diff --git a/meta-google/recipes-core/busybox/files/ls.cfg b/meta-google/recipes-core/busybox/files/ls.cfg new file mode 100644 index 000000000..a302cb8b1 --- /dev/null +++ b/meta-google/recipes-core/busybox/files/ls.cfg @@ -0,0 +1 @@ +CONFIG_LSOF=y diff --git a/meta-google/recipes-core/busybox/files/udhcpc6.cfg b/meta-google/recipes-core/busybox/files/udhcpc6.cfg new file mode 100644 index 000000000..1c2766fda --- /dev/null +++ b/meta-google/recipes-core/busybox/files/udhcpc6.cfg @@ -0,0 +1,6 @@ +CONFIG_FEATURE_IPV6=y +CONFIG_UDHCPC6=y +CONFIG_FEATURE_UDHCPC6_RFC3646=y +CONFIG_FEATURE_UDHCPC6_RFC4704=y +CONFIG_FEATURE_UDHCPC6_RFC4833=y +CONFIG_FEATURE_UDHCPC6_RFC5970=y -- cgit v1.2.3 From f3823ad3d166dc19c373e67ab871d5480bcaf4da Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Mon, 30 Nov 2020 15:31:36 +1030 Subject: linux-openbmc: Move to Linux 5.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This moves the OpenBMC kernel to a v5.10 base for both Aspeed and Nuvoton. There are 125 patches in the tree, with 80 of those patches not yet queued for merging in v5.11. Notably the PECI patchset has been dropped as the author, Intel, has elected to develop it out of tree instead of submitting it for mainline inclusion. The remaining out of tree patches: Alexander Amelkin (1): mtd: spi-nor: fix options for mx66l51235f Andrew Geissler (1): ARM: dts: tacoma: Add KCS node for LPC MCTP Andrew Jeffery (9): dt-bindings: hwmon: pmbus: Add Maxim MAX31785 documentation pmbus (max31785): Add support for devicetree configuration pmbus (core): Use driver callbacks in pmbus_get_fan_rate() pmbus (core): One-shot retries for failure to set page pmbus (max31785): Wrap all I2C accessors in one-shot failure handlers ARM: dts: aspeed: witherspoon: Update max31785 node misc: Add ASPEED KCS driver for MCTP purposes ARM: dts: witherspoon: Add KCS node for LPC MCTP ARM: dts: aspeed: rainier: Don't shout addresses Brad Bishop (3): ipmi: aspeed-g6: Add compatible strings reset: simple: Add AST2600 compatibility string eeprom: at25: Split reads into chunks and cap write size Cédric Le Goater (19): mtd: spi-nor: aspeed: use command mode for reads mtd: spi-nor: aspeed: add support for SPI dual IO read mode mtd: spi-nor: aspeed: link controller with the ahb clock mtd: spi-nor: aspeed: optimize read mode mtd: spi-nor: aspeed: limit the maximum SPI frequency mtd: spi-nor: aspeed: introduce a aspeed_smc_default_read() helper mtd: spi-nor: aspeed: clarify 4BYTE address mode mask mtd: spi-nor: aspeed: use memcpy_fromio() to capture the optimization buffer mtd: spi-nor: aspeed: add support for the 4B opcodes mtd: spi-nor: Add support for w25q512jv mtd: spi-nor: aspeed: Introduce a field for the AHB physical address mtd: spi-nor: aspeed: Introduce segment operations mtd: spi-nor: aspeed: add initial support for ast2600 mtd: spi-nor: aspeed: Check for disabled segments on the AST2600 mtd: spi-nor: aspeed: Introduce training operations per platform mtd: spi-nor: aspeed: Introduce a HCLK mask for training mtd: spi-nor: aspeed: check upper freq limit when doing training mtd: spi-nor: aspeed: add support for AST2600 training /dev/mem: add a devmem kernel parameter to activate the device Dan Carpenter (1): soc: aspeed: xdma: Return -EFAULT if copy_from_user() fails Eddie James (9): ARM: dts: rainier: Add KCS node for LPC MCTP ARM: dts: aspeed: Add witherspoon-128 machine dt-bindings: fsi: Add P10 OCC device documentation fsi: occ: Add support for P10 hwmon: (occ) Add new temperature sensor type dt-bindings: input: Add documentation for IBM Operation Panel input: misc: Add IBM Operation Panel driver ARM: dts: aspeed: rainier: Mark FSI SPI controllers as restricted ARM: dts: aspeed: Add Everest BMC machine Fran Hsu (2): ARM: dts: nuvoton: npcm730: Add UDC device ARM: dts: nuvoton: gsj: Add non-mainline nodes George Hung (2): dt-binding: edac: add NPCM ECC documentation edac: npcm: Add Nuvoton NPCM7xx EDAC driver George Liu (2): ARM: dts: aspeed: inspur-fp5280g2: Add GPIO line names ARM: dts: aspeed: inspur-fp5280g2: Add ipsps1 driver Jae Hyun Yoo (1): clk: ast2600: enable BCLK for PCI/PCIe bus always Joel Stanley (4): ARM: dts: aspeed: ast2600evb: Add MAC0 drm/aspeed: Add sysfs for output settings net: ftgmac100: Ensure tx descriptor updates are visible ARM: configs: aspeed: Update defconfigs Quan Nguyen (1): ARM: dts: aspeed: Add device tree for Ampere's Mt. Jade BMC Ryan Sie (1): ARM: dts: aspeed: Add Supermicro x11spi BMC machine Tomer Maimon (21): dt-binding: bmc: Add NPCM7xx LPC BPC documentation misc: npcm7xx-lpc-bpc: add NPCM7xx BIOS post code driver dt-binding: bmc: add npcm7xx pci mailbox document misc: mbox: add npcm7xx pci mailbox driver dt-binding: net: document NPCM7xx EMC DT bindings net: npcm: add NPCM7xx Ethernet MAC controller ARM: dts: npcm7xx: Add out of tree nodes ARM: dts: olympus: Add non-mainline nodes ARM: dts: npcm750: Add fuse regmap support node ARM: dts: npcm7xx: Link fuse syscon to adc and wdt clk: npcm7xx: add read only flag to divider clocks iio: adc: Add calibration support to npcm ADC watchdog: npcm: Add DT restart priority and reset type support pinctrl: npcm7xx: Add HGPIO pin support to NPCM7xx pinctrl driver pinctrl: pinconf: add pin persist configuration pinctrl: npcm7xx: Add pin persist configuration support spi: npcm-pspi: Add full duplex support dt-binding: bmc: add NPCM7XX JTAG master documentation misc: Add NPCM7xx JTAG master driver watchdog: npcm: Modify get reset status function ARM: configs: add defconfig for Nuvoton NPCM7xx BMC Troy Lee (3): dt-bindings: edac: aspeed-sdram-edac: Add ast2400/ast2600 support ARM: dts: aspeed: Add AST2600 edac into common devicetree edac: Supporting AST2400 and AST2600 edac driver Change-Id: I455ad0dfa67f7224f07b3999b7e3b50755490653 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 6 +++--- meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 901195c97..ed4a10f02 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ -KBRANCH ?= "dev-5.8" -LINUX_VERSION ?= "5.8.17" +KBRANCH ?= "dev-5.10" +LINUX_VERSION ?= "5.10.14" -SRCREV="599d7f997930829f13e05d332e3e7fccd89d340d" +SRCREV="56621ca6dcf8c20fc7bc72771df00cd3d59c153b" require linux-aspeed.inc diff --git a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb index 22bc2cfbf..3f63d4e01 100644 --- a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb +++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb @@ -1,6 +1,6 @@ -KBRANCH ?= "dev-5.8" -LINUX_VERSION ?= "5.8.17" +KBRANCH ?= "dev-5.10" +LINUX_VERSION ?= "5.10.14" -SRCREV="7ee2d5b4d43403537df38d43c29f2a1bcb4dbce4" +SRCREV="56621ca6dcf8c20fc7bc72771df00cd3d59c153b" require linux-nuvoton.inc -- cgit v1.2.3 From 8a83a1deab11b0e8b71b3b1827408a787e883056 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 10 Feb 2021 19:10:25 +0000 Subject: openpower-hw-diags: srcrev bump 188f1096e8..9d4f91cd8a Ben Tyner (6): Attn: Cleanup trace messages Attn: Fix CI complaint of unused-results Attn: Provide default TI info for hypervisor TI Attn: Add some sanity checking for TI info pointer Attn: Cleanup trace messages 2 Attn: Treat HB primary src as hex not ascii Change-Id: I05a8929c6b15848a9fec3763aa590a7ba28916a1 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 85cd143ac..f76eedad7 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/openbmc/openpower-hw-diags" SYSTEMD_SERVICE_${PN} = "attn_handler.service" PV = "0.1+git${SRCPV}" -SRCREV = "188f1096e8b8bafb03e3b614062dd4d4412d1feb" +SRCREV = "9d4f91cd8ab2b8622ab8ff5b6df8d4cbc16e14d6" S = "${WORKDIR}/git" -- cgit v1.2.3 From 35266f0c49d376c4e91b35d60c8b6ed53a40318f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 10 Feb 2021 18:22:04 +0000 Subject: webui-vue: srcrev bump 157d2ffe61..391f94921b SurenNeware (1): Correct client sessions displayed data Yoshie Muranaka (1): Update FormFile component button style Change-Id: I416496ab0a526e95185715983198410cc4b8be5f Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index da2adaf37..378050287 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "157d2ffe6175e5849c7137dabdb05dd5b50ed372" +SRCREV = "391f94921bffb243d1eb3d72a49402a930b42160" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 42b4f703699d7f63b139cf888c2a715b228234ef Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 10 Feb 2021 20:00:51 +0000 Subject: phosphor-ipmi-flash: srcrev bump 43344a1b9f..99b5455933 Patrick Venture (2): MAINTAINERS: Add William to maintainers MAINTAINERS: M->R for Venture Change-Id: I1a89bff4ac58ce13b10af983f4943b61a2bbe529 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index ced05bc7b..c2ae08c20 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -46,7 +46,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "43344a1b9fc0ef493059c7a1b0155330f0db43a1" +SRCREV = "99b5455933de4963ecd8d9ccaba18465d4ac5a27" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ -- cgit v1.2.3 From 08c0d9e69346face3c7cb708dd60ec73ec377f45 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 10 Feb 2021 19:40:58 +0000 Subject: phosphor-logging: srcrev bump eb5d3f2fbc..6b3490ac23 Matt Spinler (1): PEL: Add ambient temp PEL registry entries Change-Id: Ib73f56f0590310ecaf1969df18c4370ae0d1723c Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 7ec34b3a5..f81ec1c41 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -55,7 +55,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "eb5d3f2fbcf584a28dc7aeaed050243ba0a038ea" +SRCREV = "6b3490ac23e251238d3cee0d9c4425778954c940" S = "${WORKDIR}/git" -- cgit v1.2.3 From d3f8874803fe606381d4d461f37b7a32db0843ad Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 10 Feb 2021 20:11:37 +0000 Subject: phosphor-dbus-interfaces: srcrev bump 9969a5b401..4461e14097 Andrew Geissler (2): clarify quiesce use cases for host introduce standby state for host interface Change-Id: I47ef4bf064322d8fde2a4a04b18871898885fa2d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index bfecfb95e..944b3ef3f 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "9969a5b4016bc8ae62e5f23aad476c6352dfac86" +SRCREV = "4461e14097547ca2b85945e371c260c40a5d6d86" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true -- cgit v1.2.3 From 2c943520ca6553e10a41b1ed5fd0860b4fea6a44 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 9 Feb 2021 17:41:40 -0800 Subject: meta-google: libconfig: Add native bbclass Needed to build a native conf2struct, ultimately packaging sslh Google-Bug-Id: 179618161 Upstream: 8ac594bdf054082ca6dbe35c4345759fe4c31669 Change-Id: I19f37ed554c9c37f90993fc4d972d9f18d622416 Signed-off-by: William A. Kennington III --- meta-google/recipes-extended/libconfig/libconfig_%.bbappend | 1 + 1 file changed, 1 insertion(+) create mode 100644 meta-google/recipes-extended/libconfig/libconfig_%.bbappend diff --git a/meta-google/recipes-extended/libconfig/libconfig_%.bbappend b/meta-google/recipes-extended/libconfig/libconfig_%.bbappend new file mode 100644 index 000000000..d6f586995 --- /dev/null +++ b/meta-google/recipes-extended/libconfig/libconfig_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND += "native" -- cgit v1.2.3 From 2d656b42b4966e206c207117aef024760e7bee10 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 9 Feb 2021 17:44:32 -0800 Subject: meta-google: libconfig-perl: Add 0.100 Google-Bug-Id: 179618161 Upstream: 8ac594bdf054082ca6dbe35c4345759fe4c31669 Change-Id: Ie0017d9febe92fd968ef7c71ef24ce2aaed526e1 Signed-off-by: William A. Kennington III --- .../recipes-extended/libconfig/libconfig-perl_0.100.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 meta-google/recipes-extended/libconfig/libconfig-perl_0.100.bb diff --git a/meta-google/recipes-extended/libconfig/libconfig-perl_0.100.bb b/meta-google/recipes-extended/libconfig/libconfig-perl_0.100.bb new file mode 100644 index 000000000..2f4656d4e --- /dev/null +++ b/meta-google/recipes-extended/libconfig/libconfig-perl_0.100.bb @@ -0,0 +1,16 @@ +HOMEPAGE = "https://metacpan.org/pod/Conf::Libconfig" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb" + +SRC_URI = "https://cpan.metacpan.org/authors/id/C/CN/CNANGEL/Conf-Libconfig-${PV}.tar.gz" +SRC_URI[sha256sum] = "2f13d926a6e51fd549da9ea4ed01277a99748d75236c2a1b5f26f57a1abebe61" + +S = "${WORKDIR}/Conf-Libconfig-${PV}" + +DEPENDS += "libconfig" + +EXTRA_PERLFLAGS = "-I ${PERLHOSTLIB}" + +inherit cpan + +BBCLASSEXTEND += "native" -- cgit v1.2.3 From b2c5306a488d7add62654d4c1d794b12cc2519ef Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 9 Feb 2021 17:48:19 -0800 Subject: meta-google: conf2struct-native: Add package Google-Bug-Id: 179618161 Upstream: 8ac594bdf054082ca6dbe35c4345759fe4c31669 Change-Id: I1f86406891528241295455c6498f2a488d5b1b78 Signed-off-by: William A. Kennington III --- .../libconfig/conf2struct-native_git.bb | 32 ++++++++++++++++++++ .../0001-conf2struct-Use-the-right-perl.patch | 23 +++++++++++++++ .../files/0001-makefile-Add-missing-LDFLAGS.patch | 34 ++++++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 meta-google/recipes-extended/libconfig/conf2struct-native_git.bb create mode 100644 meta-google/recipes-extended/libconfig/files/0001-conf2struct-Use-the-right-perl.patch create mode 100644 meta-google/recipes-extended/libconfig/files/0001-makefile-Add-missing-LDFLAGS.patch diff --git a/meta-google/recipes-extended/libconfig/conf2struct-native_git.bb b/meta-google/recipes-extended/libconfig/conf2struct-native_git.bb new file mode 100644 index 000000000..1a77f4de1 --- /dev/null +++ b/meta-google/recipes-extended/libconfig/conf2struct-native_git.bb @@ -0,0 +1,32 @@ +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=1b886630cdc9a17c26250934beda407d" + +PV = "0.1+git${SRCPV}" +SRC_URI = "git://github.com/yrutschle/conf2struct" +SRCREV = "e8468017b27211b1c452f8df0afe6f19e97035a4" +S = "${WORKDIR}/git" + +SRC_URI += " \ + file://0001-makefile-Add-missing-LDFLAGS.patch \ + file://0001-conf2struct-Use-the-right-perl.patch \ + " + +inherit native + +DEPENDS += " \ + libconfig-native \ + libconfig-perl-native \ + " + +EXTRA_OEMAKE += " \ + DESTDIR=${D} \ + prefix=${prefix} \ + " + +do_compile() { + oe_runmake checker +} + +do_install() { + oe_runmake install +} diff --git a/meta-google/recipes-extended/libconfig/files/0001-conf2struct-Use-the-right-perl.patch b/meta-google/recipes-extended/libconfig/files/0001-conf2struct-Use-the-right-perl.patch new file mode 100644 index 000000000..83402698e --- /dev/null +++ b/meta-google/recipes-extended/libconfig/files/0001-conf2struct-Use-the-right-perl.patch @@ -0,0 +1,23 @@ +From b44f0d3dbcadb20396dc83a2aa307d54490388ea Mon Sep 17 00:00:00 2001 +From: "William A. Kennington III" +Date: Thu, 28 May 2020 23:07:58 -0700 +Subject: [PATCH] conf2struct: Use the right perl + +--- + conf2struct | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/conf2struct b/conf2struct +index 8d68741..b88a9b7 100755 +--- a/conf2struct ++++ b/conf2struct +@@ -1,4 +1,5 @@ +-#! /usr/bin/perl -w ++#!/usr/bin/env perl ++use warnings; + + my $license = < +Date: Thu, 28 May 2020 22:51:47 -0700 +Subject: [PATCH] makefile: Add missing LDFLAGS + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index a4d5f10..4976726 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ all: example checker + CFLAGS=-g + + checker: confcheck.o +- $(CC) $(CFLAGS) -o confcheck confcheck.o -lconfig ++ $(CC) $(CFLAGS) -o confcheck confcheck.o $(LDFLAGS) -lconfig + + + install: +@@ -19,7 +19,7 @@ uninstall: + + EG_OBJ=example.o parser.o argtable3.o + example: $(EG_OBJ) +- $(CC) $(CFLAGS) -o example $(EG_OBJ) -lconfig ++ $(CC) $(CFLAGS) -o example $(EG_OBJ) $(LDFLAGS) -lconfig + + example.c: eg_conf.cfg + ./conf2struct eg_conf.cfg +-- +2.27.0.rc0.183.gde8f92d652-goog + -- cgit v1.2.3 From e48e307ae3912f633ffbd717f5a2b507fb4c67a5 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 11 Feb 2021 05:21:49 +0000 Subject: phosphor-power: srcrev bump 45907cc7de..de0fd44f76 Shawn McCarney (1): regulators: Improve docs for compare_vpd Change-Id: I11c5c0d1b574f3323e3d84c2010e9f18456e7b01 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index c33bf0a90..cd405e83a 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "45907cc7de953482fa896c8601a66a9d2ebd7495" +SRCREV = "de0fd44f76c7cd1ae63ec39e708b352a3a7ab0a9" -- cgit v1.2.3 From 309fc2dbadaa1e3661566cd51d4296a4b5230133 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 11 Feb 2021 13:00:24 +0000 Subject: openpower-vpd-parser: srcrev bump cfd7a75ab4..81671f6d52 Alpana Kumari (1): Change ND1 to ND0 for expanded LocationCode Change-Id: I05294d4670f3323766c7ee412d0946379206f225 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index f73ea457f..325fd6fb7 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "cfd7a75ab49d18abbba4585c392ca12d295e7775" +SRCREV = "81671f6d52da047aa487d8e08c4435505e3fe61b" -- cgit v1.2.3 From c14f82609123232f8e1e5fb7d1521f42cd688dd4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 11 Feb 2021 13:50:38 +0000 Subject: phosphor-dbus-interfaces: srcrev bump 4461e14097..b2bbac7e29 Wludzik, Jozef (1): Add Trigger and TriggerManager interfaces Change-Id: Id6666f3ce2d3ed3059098e9c800c03b7c844b26f Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 944b3ef3f..066f2f2a0 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "4461e14097547ca2b85945e371c260c40a5d6d86" +SRCREV = "b2bbac7e2986decf1ed5d102e79f1872ddd84881" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true -- cgit v1.2.3 From 98120a8d82d81b2f88cf8cd201207e34824f5b4a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 11 Feb 2021 19:30:24 +0000 Subject: openpower-hw-diags: srcrev bump 9d4f91cd8a..b3eba29929 Ben Tyner (1): Attn: Added INFO level trace to test case code Change-Id: Ib03cf96df4dbcad9e0a0ad40d478e7f9ba158ae9 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index f76eedad7..02bcb7598 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/openbmc/openpower-hw-diags" SYSTEMD_SERVICE_${PN} = "attn_handler.service" PV = "0.1+git${SRCPV}" -SRCREV = "9d4f91cd8ab2b8622ab8ff5b6df8d4cbc16e14d6" +SRCREV = "b3eba2992926f9fc55a836d2baab85adfdf9bc5d" S = "${WORKDIR}/git" -- cgit v1.2.3 From 32ab91eb32bc982aab7f41bed9523e01d2d27381 Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Tue, 9 Feb 2021 18:07:30 -0800 Subject: meta-google: recipes-core: systemd: Import from gBMC Initial recipes-core/systemd code from gBMC. Google-Bug-Id: 179618484 Upstream: 8ac594bdf054082ca6dbe35c4345759fe4c31669 Change-Id: Ibe874e7558461485f2fbf74a2c4d1bbe222d809e Signed-off-by: Willy Tu --- meta-google/recipes-core/systemd/systemd_%.bbappend | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 meta-google/recipes-core/systemd/systemd_%.bbappend diff --git a/meta-google/recipes-core/systemd/systemd_%.bbappend b/meta-google/recipes-core/systemd/systemd_%.bbappend new file mode 100644 index 000000000..88065e2e0 --- /dev/null +++ b/meta-google/recipes-core/systemd/systemd_%.bbappend @@ -0,0 +1,5 @@ +# We want to be able to manage our coredumps +PACKAGECONFIG_append_gbmc = " coredump" + +# Disable timesync as we don't use it and it makes rebooting much slower +PACKAGECONFIG_remove_gbmc = "timesyncd" -- cgit v1.2.3 From f1316a4fc9610a5982bf99cb248509d70abc6c39 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 12 Feb 2021 09:14:34 -0600 Subject: nuvoton: add srcrev for npcm7xx-bootblock recipe We appeared to be getting away with gsj machine build by utilizing sstate caches. A fresh build of gsj does not compile with the errors documented in openbmc/openbmc#3761. Resolves openbmc/openbmc#3761 Signed-off-by: Andrew Geissler Change-Id: Id51643a6d341e9f079b33de66a8cee7f49b01225 --- meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.16.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.16.bb b/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.16.bb index 77285dc36..10d5dd108 100644 --- a/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.16.bb +++ b/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.16.bb @@ -8,6 +8,7 @@ FILENAME = "Poleg_bootblock_${PV}.bin" S = "${WORKDIR}" +SRCREV = "7bfef99f7a0354395519c4975f96d66cdda1fb67" SRC_URI = " \ https://raw.githubusercontent.com/Nuvoton-Israel/bootblock/${SRCREV}/LICENSE;name=lic \ https://github.com/Nuvoton-Israel/bootblock/releases/download/BootBlock_${PV}/Poleg_bootblock_basic.bin;downloadfilename=${FILENAME};name=bin \ -- cgit v1.2.3 From c598f1a45f7cffa554a23615916da5772c954fc0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 11 Feb 2021 19:41:12 +0000 Subject: webui-vue: srcrev bump 391f94921b..0736d2afc5 Sandeepa Singh (2): Added a test hook for sensors page Added test hook for client session page Yoshie Muranaka (1): Remove i18n module import from Profile settings Change-Id: Ifdbba8424dec5d57e97fe4f311523988cfa9c99c Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 378050287..c92e7b6c9 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "391f94921bffb243d1eb3d72a49402a930b42160" +SRCREV = "0736d2afc54c944a1cb5efc3986996615914a059" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 24ee6ac03bdd6d9f94599019c9b4a0605d5ad885 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 11 Feb 2021 16:31:13 +0000 Subject: phosphor-logging: srcrev bump 6b3490ac23..bc0c6190c2 Adriana Kobylak (1): test/Makefile: Add sdbeventplus to LDFLAGS Change-Id: Ia92b8fdaad774eaa956f80c3f76ee7ac4812b5af Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index f81ec1c41..7c76d4c12 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -55,7 +55,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "6b3490ac23e251238d3cee0d9c4425778954c940" +SRCREV = "bc0c6190c2ddf840201722b7b0b12b305c479ee4" S = "${WORKDIR}/git" -- cgit v1.2.3 From d85b1d955dfd4c7315eda608fc086632f52b7711 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 11 Feb 2021 23:30:51 +0000 Subject: phosphor-host-ipmid: srcrev bump 8a7236ae93..da06d15cab Hao Jiang (1): Add definition of SDR type 3. Change-Id: Ib6a8a26701a58316c945b75c0d7d81866aed9f47 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 57867af39..ca71ae1ab 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "8a7236ae9309a413cec0644baf9e69f3f9a80160" +SRCREV = "da06d15cab1dd116d3279d66f70966f95afdf676" -- cgit v1.2.3 From 6d6dbee3ca28598755fcd09da29f083955223a38 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 12 Feb 2021 02:40:25 +0000 Subject: openpower-proc-control: srcrev bump ea0fb6fc4c..99ee5ca9c3 Andrew Geissler (1): fix dependency issue between mpreboot and stop instr Change-Id: Ie02e730fd3f611dd69bae8877e4bf624a1ab2c0a Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 8bb12b88a..abb5a31fb 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit autotools obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "ea0fb6fc4cc843122809c21f9f41048f394b40e3" +SRCREV = "99ee5ca9c36ff8d80d683337cf81241480b2a200" DEPENDS += " \ autoconf-archive-native \ -- cgit v1.2.3 From b7830133ac2c1b0dcd272f29ce4084ee2417ff0c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 12 Feb 2021 11:00:46 +0000 Subject: phosphor-debug-collector: srcrev bump e22aca712e..2f8e276c0b Dhruvaraj Subhashchandran (1): Move emit_object_added to respective dump entry classes Change-Id: Ib3172819933ebddfb0e035579511eb3a8731d802 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index 18ff3f5eb..6e6bcf3f4 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "e22aca712e024a8989d4d0f2c6235513abb06d13" +SRCREV = "2f8e276c0b61f39f0fc197acef778149476fbd89" -- cgit v1.2.3 From 8a791040f622e14f02f20a3942aa566d0001ed28 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 12 Feb 2021 13:40:24 +0000 Subject: openpower-vpd-parser: srcrev bump 81671f6d52..6ee637aa43 PriyangaRamasamy (1): VPD Tool: Fix for silencing unused variable warning Santosh Puranik (1): Fix Bad VPD Handling Change-Id: Ibfd633f6be10c11213e26b942cd6c6f0a374ae42 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 325fd6fb7..b53ccdc86 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "81671f6d52da047aa487d8e08c4435505e3fe61b" +SRCREV = "6ee637aa430c1c08cd56310b1298f96620e9dd69" -- cgit v1.2.3 From bb26a1029e2021db68a312921107c4346cd9bd4f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 12 Feb 2021 17:51:42 +0000 Subject: dbus-sensors: srcrev bump 4958558616..49d12d8955 Ed Tanous (1): Fix mcu option Change-Id: Id5708828f4659ae1dcd2d6d78deb378b80948875 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index a9330fbb9..015a6e76c 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "495855861648f082a73d4ba4afe23262d6fb0ad0" +SRCREV = "49d12d8955495d4091b4520605c9e4510fcd743b" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 1fe95d5c751eb29fb5a522a6b888c400a3cf37c2 Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Tue, 9 Feb 2021 12:41:44 -0800 Subject: meta-google: recipes-google: networking: iperf3: Import from gBMC Initial recipes-google/networking iperf3 code from gBMC. Google-Bug-Id: 179617830 Upstream: 8ac594bdf054082ca6dbe35c4345759fe4c31669 Signed-off-by: Willy Tu Change-Id: I686a3debd6b6647ce215253c555f208d2a5e46f2 --- .../recipes-google/networking/files/iperf3.service | 21 +++++++++++++++++++++ .../recipes-google/networking/gbmc-iperf3.bb | 18 ++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 meta-google/recipes-google/networking/files/iperf3.service create mode 100644 meta-google/recipes-google/networking/gbmc-iperf3.bb diff --git a/meta-google/recipes-google/networking/files/iperf3.service b/meta-google/recipes-google/networking/files/iperf3.service new file mode 100644 index 000000000..f2d9586e1 --- /dev/null +++ b/meta-google/recipes-google/networking/files/iperf3.service @@ -0,0 +1,21 @@ +[Unit] +Description=IPERF3 Server + +[Service] +ExecStart=/usr/bin/iperf3 -s +#Hardening +PrivateTmp=true +ProtectSystem=strict +ProtectHome=true +ProtectKernelModules=true +ProtectKernelTunables=true +ProtectControlGroups=true +MountFlags=private +NoNewPrivileges=true +PrivateDevices=true +RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX +MemoryDenyWriteExecute=true +DynamicUser=true + +[Install] +WantedBy=multi-user.target diff --git a/meta-google/recipes-google/networking/gbmc-iperf3.bb b/meta-google/recipes-google/networking/gbmc-iperf3.bb new file mode 100644 index 000000000..f1a88b459 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-iperf3.bb @@ -0,0 +1,18 @@ +PR = "r1" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd + +RDEPENDS_${PN} += "iperf3" + +SRC_URI += "file://iperf3.service" + +SYSTEMD_SERVICE_${PN} += "iperf3.service" + +do_install() { + # Install service definitions + install -d -m 0755 ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/iperf3.service ${D}${systemd_system_unitdir} +} -- cgit v1.2.3 From e7844b4c35efd02aebdc82b3c89821458eb25baa Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 12 Feb 2021 11:19:27 -0800 Subject: meta-google: avahi: Restrict settings to machine interface We don't want this to run on external interfaces, so we limit avahi to the internal interface only. Google-Bug-Id: 166192295 Change-Id: Ifc056baab670d3c09aaba7256041777aa7bff6e3 Signed-off-by: William A. Kennington III --- meta-google/recipes-connectivity/avahi/avahi_%.bbappend | 5 +++++ meta-google/recipes-connectivity/avahi/files/avahi-daemon.conf | 8 ++++++++ 2 files changed, 13 insertions(+) create mode 100644 meta-google/recipes-connectivity/avahi/avahi_%.bbappend create mode 100644 meta-google/recipes-connectivity/avahi/files/avahi-daemon.conf diff --git a/meta-google/recipes-connectivity/avahi/avahi_%.bbappend b/meta-google/recipes-connectivity/avahi/avahi_%.bbappend new file mode 100644 index 000000000..8fb53d3f5 --- /dev/null +++ b/meta-google/recipes-connectivity/avahi/avahi_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/files:" +SRC_URI_append_gbmc = " file://avahi-daemon.conf" +do_install_append_gbmc() { + install -m0644 ${WORKDIR}/avahi-daemon.conf ${D}${sysconfdir}/avahi/ +} diff --git a/meta-google/recipes-connectivity/avahi/files/avahi-daemon.conf b/meta-google/recipes-connectivity/avahi/files/avahi-daemon.conf new file mode 100644 index 000000000..9688ffb39 --- /dev/null +++ b/meta-google/recipes-connectivity/avahi/files/avahi-daemon.conf @@ -0,0 +1,8 @@ +[server] +allow-interfaces=mgmt + +[publish] +disable-user-service-publishing=yes +add-service-cookie=yes +publish-hinfo=no +publish-workstation=no -- cgit v1.2.3 From dba908308d3388a7301572b83745f0eab44e1db8 Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Wed, 10 Feb 2021 11:55:58 -0800 Subject: meta-google: recipes-google: systemd: Import from gBMC Initial recipes-google/systemd code from gBMC. Google-Bug-Id: 179618486 Upstream: 8ac594bdf054082ca6dbe35c4345759fe4c31669 Signed-off-by: Willy Tu Change-Id: I3c1b9678049e9f5384482af366d0dd104740a207 --- .../systemd/files/firmware-updates-pre.target | 2 + .../systemd/files/firmware-updates.target | 6 +++ .../recipes-google/systemd/gbmc-systemd-config.bb | 49 ++++++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 meta-google/recipes-google/systemd/files/firmware-updates-pre.target create mode 100644 meta-google/recipes-google/systemd/files/firmware-updates.target create mode 100644 meta-google/recipes-google/systemd/gbmc-systemd-config.bb diff --git a/meta-google/recipes-google/systemd/files/firmware-updates-pre.target b/meta-google/recipes-google/systemd/files/firmware-updates-pre.target new file mode 100644 index 000000000..5e6c8e93a --- /dev/null +++ b/meta-google/recipes-google/systemd/files/firmware-updates-pre.target @@ -0,0 +1,2 @@ +[Unit] +Description=Firmware Update Preconditions diff --git a/meta-google/recipes-google/systemd/files/firmware-updates.target b/meta-google/recipes-google/systemd/files/firmware-updates.target new file mode 100644 index 000000000..e41fe25f6 --- /dev/null +++ b/meta-google/recipes-google/systemd/files/firmware-updates.target @@ -0,0 +1,6 @@ +[Unit] +Description=Firmware Updates and Configuration +Wants=firmware-updates-pre.target + +[Install] +WantedBy=multi-user.target diff --git a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb new file mode 100644 index 000000000..011b62edc --- /dev/null +++ b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb @@ -0,0 +1,49 @@ +SUMMARY = "Configures systemd settings for gBMC" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd + +S = "${WORKDIR}" + +SRC_URI_append = " \ + file://firmware-updates.target \ + file://firmware-updates-pre.target \ + " + +FILES_${PN}_append = " \ + ${systemd_unitdir}/coredump.conf.d/40-gbmc-coredump.conf \ + ${systemd_unitdir}/resolved.conf.d/40-gbmc-nomdns.conf \ + " + +FILES_${PN}_append_dev = " \ + ${libdir}/sysctl.d/40-gbmc-debug.conf \ + " + +SYSTEMD_SERVICE_${PN}_append = " \ + firmware-updates.target \ + firmware-updates-pre.target \ + " + +# Put coredumps in the journal to ensure they stay in ram +do_install() { + install -d -m 0755 ${D}${systemd_unitdir}/coredump.conf.d + printf "[Coredump]\nStorage=journal\n" \ + >${D}${systemd_unitdir}/coredump.conf.d/40-gbmc-coredump.conf + + install -d -m 0755 ${D}${systemd_unitdir}/resolved.conf.d + printf "[Resolve]\nLLMNR=no\nMulticastDNS=resolve\n" \ + >${D}${systemd_unitdir}/resolved.conf.d/40-gbmc-nomdns.conf + + install -d -m 0755 ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/firmware-updates.target ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/firmware-updates-pre.target ${D}${systemd_system_unitdir}/ +} + +do_install_append_dev() { + install -d -m 0755 ${D}${libdir}/sysctl.d + printf "kernel.sysrq = 1\n" \ + >${D}${libdir}/sysctl.d/40-gbmc-debug.conf + +} -- cgit v1.2.3 From 44e756d6cabc014ffca8007b200216e92f6ba29e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 12 Feb 2021 19:10:46 +0000 Subject: bmcweb: srcrev bump 2b3da45876..ae6595ef53 Adriana Kobylak (1): log_services: Improve error handling for DBus Log Entry Ed Tanous (1): Add 404 handling to COMMON_ERRORS.md Change-Id: I1475edfe0b79e51c6ae60e92b2521ade473db6ab Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index b5ebe96b5..a926dd3ca 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "2b3da45876aac57a36d3093379a992d699e7e396" +SRCREV = "ae6595ef5349a290bd36d5da967190aa4a461355" S = "${WORKDIR}/git" -- cgit v1.2.3 From adf08c51fac4ae0aacaf92fdc5b432d29fd68800 Mon Sep 17 00:00:00 2001 From: Manojkiran Eda Date: Wed, 27 Jan 2021 08:50:48 +0530 Subject: Remove bios configurations from meta-layer & bump - The intent behind this commit is to enable & set OEM specific options to pldm recipe via the meta-ibm layer. - pldm in its current state, has a configurations folder which contains all the configurations that are consumed by the daemon at runtime. - pldm also has an oem folder(s) that can contain the vendor specific configuration files. - So, removing these files from the meta-layer as they are obsolete. Signed-off-by: Manojkiran Eda Change-Id: I91d23c37abff45f3da18676269be843610b6a9d1 --- meta-ibm/recipes-phosphor/pldm/pldm/11.json | 28 ----------- .../recipes-phosphor/pldm/pldm/enum_attrs.json | 54 ---------------------- meta-ibm/recipes-phosphor/pldm/pldm/fileTable.json | 10 ---- meta-ibm/recipes-phosphor/pldm/pldm/host_eid | 1 - meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend | 16 +------ meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 6 files changed, 2 insertions(+), 109 deletions(-) delete mode 100644 meta-ibm/recipes-phosphor/pldm/pldm/11.json delete mode 100755 meta-ibm/recipes-phosphor/pldm/pldm/enum_attrs.json delete mode 100755 meta-ibm/recipes-phosphor/pldm/pldm/fileTable.json delete mode 100644 meta-ibm/recipes-phosphor/pldm/pldm/host_eid diff --git a/meta-ibm/recipes-phosphor/pldm/pldm/11.json b/meta-ibm/recipes-phosphor/pldm/pldm/11.json deleted file mode 100644 index 26fdf5c09..000000000 --- a/meta-ibm/recipes-phosphor/pldm/pldm/11.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "entries" : [{ - "type" : 33, - "instance" : 0, - "container" : 0, - "effecters" : [{ - "set" : { - "id" : 196, - "size" : 1, - "states" : [1,2] - }, - "dbus" : "/xyz/openbmc_project/state/host0" - }] - }, - { - "type" : 45, - "instance" : 0, - "container" : 0, - "effecters" : [{ - "set" : { - "id" : 260, - "size" : 2, - "states" : [9] - }, - "dbus" : "/xyz/openbmc_project/state/chassis0" - }] - }] -} diff --git a/meta-ibm/recipes-phosphor/pldm/pldm/enum_attrs.json b/meta-ibm/recipes-phosphor/pldm/pldm/enum_attrs.json deleted file mode 100755 index cf20e3e31..000000000 --- a/meta-ibm/recipes-phosphor/pldm/pldm/enum_attrs.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "entries":[ - { - "attribute_name":"pvm-fw-boot-side", - "possible_values":[ - "Perm", - "Temp" - ], - "default_values":[ - "Perm" - ] - }, - { - "attribute_name":"pvm-os-boot-side", - "possible_values":[ - "Perm", - "Temp" - ], - "default_values":[ - "Perm" - ] - }, - { - "attribute_name":"pvm-inband-code-update", - "possible_values":[ - "Allowed", - "Not Allowed" - ], - "default_values":[ - "Allowed" - ] - }, - { - "attribute_name":"pvm-surveillance", - "possible_values":[ - "Disabled", - "Enabled" - ], - "default_values":[ - "Enabled" - ] - }, - { - "attribute_name":"pvm-pcie-error-inject", - "possible_values":[ - "Disabled", - "Enabled" - ], - "default_values":[ - "Enabled" - ] - } - ] -} diff --git a/meta-ibm/recipes-phosphor/pldm/pldm/fileTable.json b/meta-ibm/recipes-phosphor/pldm/pldm/fileTable.json deleted file mode 100755 index 9d9750a58..000000000 --- a/meta-ibm/recipes-phosphor/pldm/pldm/fileTable.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "path":"/var/lib/pldm/PHYP-NVRAM", - "file_traits":1 - }, - { - "path":"/var/lib/pldm/PHYP-NVRAM-CKSUM", - "file_traits":4 - } -] diff --git a/meta-ibm/recipes-phosphor/pldm/pldm/host_eid b/meta-ibm/recipes-phosphor/pldm/pldm/host_eid deleted file mode 100644 index ec635144f..000000000 --- a/meta-ibm/recipes-phosphor/pldm/pldm/host_eid +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend index 1d6042027..32809764b 100644 --- a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend +++ b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend @@ -1,18 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - PACKAGECONFIG += "oem-ibm" PACKAGECONFIG[oem-ibm] = "-Doem-ibm=enabled, -Doem-ibm=disabled, , squashfs-tools" -SRC_URI += "file://fileTable.json" -SRC_URI += "file://enum_attrs.json" -SRC_URI += "file://11.json" -SRC_URI += "file://host_eid" - -do_install_append() { - install -d ${D}${datadir}/pldm/bios/ - install -d ${D}${datadir}/pldm/pdr/ - install -m 0644 ${WORKDIR}/fileTable.json ${D}${datadir}/pldm/ - install -m 0644 ${WORKDIR}/enum_attrs.json ${D}${datadir}/pldm/bios/ - install -m 0644 ${WORKDIR}/11.json ${D}${datadir}/pldm/pdr/ - install -m 0644 ${WORKDIR}/host_eid ${D}${datadir}/pldm/ -} +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'oem-ibm', 'pldm-create-phyp-nvram.service pldm-create-phyp-nvram-cksum.service', '', d)}" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 3a73f291d..ad31863c8 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "5b5fa4362bdfb38ffb8254f9471f41c224be281a" +SRCREV = "fec5d59b0081de6d7050265c181221336e2ffcc7" -- cgit v1.2.3 From 72a9b771c6f66dfde3906b783dec28326a671bc7 Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Tue, 9 Feb 2021 15:32:01 -0800 Subject: meta-google: recipes-extended: networking: sslh: Import from gBMC Initial recipes-extended/networking sslh code from gBMC. Google-Bug-Id: 179618485 Upstream: 8ac594bdf054082ca6dbe35c4345759fe4c31669 Change-Id: Iaf34ac877ad922970290bf398a5e86ad22011336 Signed-off-by: Willy Tu --- .../recipes-extended/networking/sslh_git.bb | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 meta-google/recipes-extended/networking/sslh_git.bb diff --git a/meta-google/recipes-extended/networking/sslh_git.bb b/meta-google/recipes-extended/networking/sslh_git.bb new file mode 100644 index 000000000..c874f4420 --- /dev/null +++ b/meta-google/recipes-extended/networking/sslh_git.bb @@ -0,0 +1,31 @@ +PR = "r1" +PV = "0.1+git${SRCPV}" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/yrutschle/sslh" +SRCREV = "de8e5725c27ba6941f47254e6fcb485e94f2de35" +S = "${WORKDIR}/git" + +inherit perlnative + +DEPENDS += "conf2struct-native" +DEPENDS += "libbsd" +DEPENDS += "libcap" +DEPENDS += "libconfig" +DEPENDS += "systemd" +DEPENDS += "pcre" + +EXTRA_OEMAKE += "DESTDIR=${D}" +EXTRA_OEMAKE += "PREFIX=${prefix}" +EXTRA_OEMAKE += "USELIBCAP=1" +EXTRA_OEMAKE += "USELIBBSD=1" +EXTRA_OEMAKE += "USESYSTEMD=1" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install +} -- cgit v1.2.3 From 74a3a8aef4287dddc77c11d70c0c19401c461991 Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Wed, 10 Feb 2021 09:52:53 -0800 Subject: meta-google: recipes-google: networking: gbmc-sslh: Import from gBMC Initial recipes-google/networking gbmc-sslh code from gBMC. Google-Bug-Id: 179617830 Upstream: 8ac594bdf054082ca6dbe35c4345759fe4c31669 Change-Id: I9d7cdcad8a816dd878cdbb2e30272ac7f223d49e Signed-off-by: Willy Tu --- .../recipes-google/networking/files/sslh.service | 20 +++++++++++++++++++ .../recipes-google/networking/files/sslh.socket | 8 ++++++++ meta-google/recipes-google/networking/gbmc-sslh.bb | 23 ++++++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 meta-google/recipes-google/networking/files/sslh.service create mode 100644 meta-google/recipes-google/networking/files/sslh.socket create mode 100644 meta-google/recipes-google/networking/gbmc-sslh.bb diff --git a/meta-google/recipes-google/networking/files/sslh.service b/meta-google/recipes-google/networking/files/sslh.service new file mode 100644 index 000000000..b6bc04a4c --- /dev/null +++ b/meta-google/recipes-google/networking/files/sslh.service @@ -0,0 +1,20 @@ +[Unit] +Description=SSL/SSH multiplexer +Requires=sslh.socket + +[Service] +ExecStart=/usr/sbin/sslh -n -f --ssh [::1]:22 --http [::1]:80 --tls [::1]:443 +KillMode=process +#Hardening +PrivateTmp=true +ProtectSystem=strict +ProtectHome=true +ProtectKernelModules=true +ProtectKernelTunables=true +ProtectControlGroups=true +MountFlags=private +NoNewPrivileges=true +PrivateDevices=true +RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX +MemoryDenyWriteExecute=true +DynamicUser=true diff --git a/meta-google/recipes-google/networking/files/sslh.socket b/meta-google/recipes-google/networking/files/sslh.socket new file mode 100644 index 000000000..2540e5961 --- /dev/null +++ b/meta-google/recipes-google/networking/files/sslh.socket @@ -0,0 +1,8 @@ +[Unit] +Before=sslh.service + +[Socket] +ListenStream=3967 + +[Install] +WantedBy=sockets.target diff --git a/meta-google/recipes-google/networking/gbmc-sslh.bb b/meta-google/recipes-google/networking/gbmc-sslh.bb new file mode 100644 index 000000000..ec16f078f --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-sslh.bb @@ -0,0 +1,23 @@ +PR = "r1" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd + +RDEPENDS_${PN} += "sslh" + +SRC_URI_append = " \ + file://sslh.service \ + file://sslh.socket \ +" + +SYSTEMD_SERVICE_${PN} += "sslh.service" +SYSTEMD_SERVICE_${PN} += "sslh.socket" + +do_install() { + # Install service definitions + install -d -m 0755 ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/sslh.service ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/sslh.socket ${D}${systemd_system_unitdir} +} -- cgit v1.2.3 From 89505a05d9c00836e3f7834901528f4f63edc289 Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Fri, 12 Feb 2021 12:16:25 -0800 Subject: meta-google: recipes-extended: networking: mstpd: Import from gBMC Initial recipes-extended/networking mstpd code from gBMC. Google-Bug-Id: 179618485 Upstream: 8ac594bdf054082ca6dbe35c4345759fe4c31669 Change-Id: Ia8a39b1f502283c9b0e1273bc28d9b7046a34164 Signed-off-by: Willy Tu --- .../recipes-extended/networking/files/bridge-stp | 31 ++++++++++++++++++++++ .../networking/files/mstpd.service | 12 +++++++++ .../recipes-extended/networking/mstpd_git.bb | 29 ++++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 meta-google/recipes-extended/networking/files/bridge-stp create mode 100644 meta-google/recipes-extended/networking/files/mstpd.service create mode 100644 meta-google/recipes-extended/networking/mstpd_git.bb diff --git a/meta-google/recipes-extended/networking/files/bridge-stp b/meta-google/recipes-extended/networking/files/bridge-stp new file mode 100644 index 000000000..c874f4420 --- /dev/null +++ b/meta-google/recipes-extended/networking/files/bridge-stp @@ -0,0 +1,31 @@ +PR = "r1" +PV = "0.1+git${SRCPV}" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/yrutschle/sslh" +SRCREV = "de8e5725c27ba6941f47254e6fcb485e94f2de35" +S = "${WORKDIR}/git" + +inherit perlnative + +DEPENDS += "conf2struct-native" +DEPENDS += "libbsd" +DEPENDS += "libcap" +DEPENDS += "libconfig" +DEPENDS += "systemd" +DEPENDS += "pcre" + +EXTRA_OEMAKE += "DESTDIR=${D}" +EXTRA_OEMAKE += "PREFIX=${prefix}" +EXTRA_OEMAKE += "USELIBCAP=1" +EXTRA_OEMAKE += "USELIBBSD=1" +EXTRA_OEMAKE += "USESYSTEMD=1" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install +} diff --git a/meta-google/recipes-extended/networking/files/mstpd.service b/meta-google/recipes-extended/networking/files/mstpd.service new file mode 100644 index 000000000..ef8303416 --- /dev/null +++ b/meta-google/recipes-extended/networking/files/mstpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Multiple Spanning Tree Protocol Daemon +Before=network-pre.target +Wants=network-pre.target + +[Service] +Restart=always +Type=simple +ExecStart=/usr/sbin/mstpd -d -v 3 + +[Install] +WantedBy=multi-user.target diff --git a/meta-google/recipes-extended/networking/mstpd_git.bb b/meta-google/recipes-extended/networking/mstpd_git.bb new file mode 100644 index 000000000..4c3f4abc2 --- /dev/null +++ b/meta-google/recipes-extended/networking/mstpd_git.bb @@ -0,0 +1,29 @@ +PR = "r1" +PV = "0.1+git${SRCPV}" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4325afd396febcb659c36b49533135d4" + +SRC_URI = "git://github.com/mstpd/mstpd" +SRCREV = "973c403c79f3d419d9e93a242766ddf0099d1299" +S = "${WORKDIR}/git" + +SRC_URI += "file://bridge-stp" +SRC_URI += "file://mstpd.service" + +inherit autotools pkgconfig systemd + +PACKAGES =+ "${PN}-mstpd" +FILES_${PN}-mstpd = "${sbindir}/mstpd ${sbindir}/mstpctl /sbin/bridge-stp" + +SYSTEMD_PACKAGES = "${PN}-mstpd" +SYSTEMD_SERVICE_${PN}-mstpd = "mstpd.service" + +do_install_append() { + rm -r ${D}${libexecdir} + + install -d -m 0755 ${D}/sbin + install -m 0755 ${WORKDIR}/bridge-stp ${D}/sbin + + install -d -m 0755 ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/mstpd.service ${D}${systemd_system_unitdir}/ +} -- cgit v1.2.3 From 5538c16344d49fab1fdce60c7c74d490753fc7dd Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Wed, 10 Feb 2021 11:44:57 -0800 Subject: meta-google: recipes-google: nftables: Import from gBMC Initial recipes-google/nftables code from gBMC. Google-Bug-Id: 179618498 Upstream: 8ac594bdf054082ca6dbe35c4345759fe4c31669 Signed-off-by: Willy Tu Change-Id: Ic768cd1ffeec5831063c9a0f5cdbc8fdcd36a862 --- .../recipes-google/nftables/files/nftables.service | 11 +++++++++++ meta-google/recipes-google/nftables/nftables-systemd.bb | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 meta-google/recipes-google/nftables/files/nftables.service create mode 100644 meta-google/recipes-google/nftables/nftables-systemd.bb diff --git a/meta-google/recipes-google/nftables/files/nftables.service b/meta-google/recipes-google/nftables/files/nftables.service new file mode 100644 index 000000000..7130dea93 --- /dev/null +++ b/meta-google/recipes-google/nftables/files/nftables.service @@ -0,0 +1,11 @@ +[Unit] +Before=network-pre.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/bin/bash -c 'echo /etc/nftables/*.rules | xargs -n 1 nft -f' +ExecStop=/bin/bash -c 'nft flush ruleset' + +[Install] +WantedBy=multi-user.target diff --git a/meta-google/recipes-google/nftables/nftables-systemd.bb b/meta-google/recipes-google/nftables/nftables-systemd.bb new file mode 100644 index 000000000..24d3e821b --- /dev/null +++ b/meta-google/recipes-google/nftables/nftables-systemd.bb @@ -0,0 +1,17 @@ +SUMMARY = "nftables systemd wrapper" +DESCRIPTION = "nftables systemd wrapper" +PR = "r1" +PV = "1.0" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd + +SRC_URI += "file://nftables.service" +SYSTEMD_SERVICE_${PN} += "nftables.service" + +do_install() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/nftables.service ${D}${systemd_system_unitdir} +} -- cgit v1.2.3 From 4a2b9eba19ccd88a899d93bbcde88f612142821c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 16 Feb 2021 14:38:36 -0800 Subject: meta-google: nftables-systemd: Fix for missing rules We need nftables-systemd to execute correctly even if the machine has no rules installed. Change-Id: I20d58b721381a2829eaa2baedd5d79e8e0a10fd0 Signed-off-by: William A. Kennington III --- meta-google/recipes-google/nftables/files/nftables.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-google/recipes-google/nftables/files/nftables.service b/meta-google/recipes-google/nftables/files/nftables.service index 7130dea93..3830988eb 100644 --- a/meta-google/recipes-google/nftables/files/nftables.service +++ b/meta-google/recipes-google/nftables/files/nftables.service @@ -4,7 +4,7 @@ Before=network-pre.target [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/bin/bash -c 'echo /etc/nftables/*.rules | xargs -n 1 nft -f' +ExecStart=/bin/bash -c 'shopt -s nullglob; echo /etc/nftables/*.rules | xargs -r -n 1 nft -f' ExecStop=/bin/bash -c 'nft flush ruleset' [Install] -- cgit v1.2.3 From c7935077ae30c63bb0a16f54e85a6ae5bc440373 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 12 Feb 2021 21:40:47 +0000 Subject: ipmi-blob-tool: srcrev bump 92a4a62c69..f9ee95f52b Patrick Venture (1): splits sys interface into its own file Change-Id: I74bdf2b5ad94afa01404da5010ea2ffda5b66c3b Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index 388465fd4..f07a14586 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -14,4 +14,4 @@ EXTRA_OECONF = "--disable-tests" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ipmi-blob-tool" -SRCREV = "92a4a62c69924476c2dcfa28c940afca6defdb4d" +SRCREV = "f9ee95f52be13be8ed11cba0bfec79da6375113a" -- cgit v1.2.3 From 74efe3dbbf50a0cfe73241bf653e0b5dec972bfd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sun, 14 Feb 2021 16:50:44 +0000 Subject: bmcweb: srcrev bump ae6595ef53..086d32c5a6 Andrew Geissler (1): hypervisor: rename source file to be more general Ed Tanous (1): Bind dev server to ipv4 only Sunitha Harish (3): Validate the path during ConfigFile upload IBM Management Console: Replacing crow::Response with bmcweb::AsyncResp IBM ConfigFile upload : Fix content-type validation Change-Id: I9afcc1b9bf1c5cee7343bc5036d7499d44fc4235 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index a926dd3ca..59deaf4a4 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "ae6595ef5349a290bd36d5da967190aa4a461355" +SRCREV = "086d32c5a61a29e92ac441e66fd4a53df4f2c8ec" S = "${WORKDIR}/git" -- cgit v1.2.3 From dcf955ce97bbe01d60ef32328178c1de92173f52 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 12 Feb 2021 23:21:10 +0000 Subject: peci-pcie: srcrev bump 9fa54b52f8..0b79f3e485 Andrei Kartashev (1): Update vendors database Change-Id: I9c9b89013b462a361bef8e94b6f0b08e1c922b0a Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb index 619af7801..af643b743 100644 --- a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb +++ b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/openbmc/peci-pcie" DEPENDS = "boost sdbusplus libpeci" PV = "0.1+git${SRCPV}" -SRCREV = "9fa54b52f83c00fd713085e6849d3f261672d008" +SRCREV = "0b79f3e485554957a4b24d5f0cefc5bc577ad301" S = "${WORKDIR}/git" -- cgit v1.2.3 From aa99b0afccaa5e7a927067f2f1c83345a1fdfcf8 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 12 Feb 2021 23:41:17 +0000 Subject: x86-power-control: srcrev bump 047bcb569b..7c8d19cbcd Jason M. Bills (1): Don't check for warm reset on reset button press Change-Id: I7cd23e85468d60bc24005bd5a504c15863ab51a3 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb index 037d943d9..3713ff733 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Chassis Power Control service for Intel based platforms" DESCRIPTION = "Chassis Power Control service for Intel based platforms" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "047bcb569b9c8baaa6184350a1628ec6e4008252" +SRCREV = "7c8d19cbcd2f444f112c4a78ac4ea7c64d000ee6" PV = "1.0+git${SRCPV}" -- cgit v1.2.3 From c90443d6d72870d5233ab73f374369c4c4ff3ebe Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 13 Feb 2021 01:20:37 +0000 Subject: phosphor-dbus-interfaces: srcrev bump b2bbac7e29..257c17da48 Jonathan Doman (1): Reduce Common.Device error messages Change-Id: I3f74cce449002368220bd2ef2f30f83a90f11712 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 066f2f2a0..fbaa3f220 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "b2bbac7e2986decf1ed5d102e79f1872ddd84881" +SRCREV = "257c17da484244ae81b98d4bb12a052187d2c57e" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true -- cgit v1.2.3 From bd539217dfcf44bfb1f78cd5ab4707ca0384c6f6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 15 Feb 2021 10:00:55 +0000 Subject: phosphor-led-manager: srcrev bump 19c48e17a0..b00e56c26e Vishwanatha Subbanna (1): config: Add rainier-2u and rainier-4u group configuration json Change-Id: Ic0ab72ee979f93861e1de75a09154bded2263d5b Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 5b3edc699..48de97a07 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-led-manager" -SRCREV = "19c48e17a089379edeb61aeb5b560fa18bd6eb83" +SRCREV = "b00e56c26e9bf0563e6f40a1ed62219fdd72c382" -- cgit v1.2.3 From 09ae4a3a7bf4639747ed1ed46a8adae07bc30f4f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 15 Feb 2021 10:10:23 +0000 Subject: openpower-vpd-parser: srcrev bump 6ee637aa43..640004f136 Alexander Filippov (1): Fix build for hardware with one ethernet interface Change-Id: Ia465d98de2095be8b2415c7c433c39903deeb4fa Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index b53ccdc86..e3c835b43 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "6ee637aa430c1c08cd56310b1298f96620e9dd69" +SRCREV = "640004f1367267476c6fef6069d9b0ff19f46152" -- cgit v1.2.3 From a3d9d7295b0d3e5292c3bf8cbf75a4a6369ca4b7 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 15 Feb 2021 16:31:02 +0000 Subject: phosphor-fan-presence: srcrev bump 871bfeaeb3..fcb0dbcb14 Matthew Barth (1): monitor: Trust group cancel/start monitoring Change-Id: I2d5d31a7768009dfd51f93cdd24d3c26e8b0f6f1 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index ae6093086..9bf731592 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "871bfeaeb3eb651c3c2d0bd3ed9bb67c753ca824" +SRCREV = "fcb0dbcb144020606780da9dd2e2be517ef7cf6d" -- cgit v1.2.3 From 3f2beb852f4812a033727ede18d068beac0c6639 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 16 Feb 2021 21:31:20 +0000 Subject: webui-vue: srcrev bump 0736d2afc5..8026797012 Derick Montague (1): Fix skip link 404 error on refresh bug Dixsie Wolmers (1): Unit testing docs typo fix MichalX Szopinski (1): Hide SNMP Settings tab on Intel environment SurenNeware (1): Add test hooks to security settings page Yoshie Muranaka (5): Update single file firmware upload page Add enhancements to BVToastMixin Add documentation for BVToastMixin enhancements Update single file firmware page alerts Update single file firmware TFTP upload option Change-Id: I76338e18c07b4bc2bb7f06d34d5ccc4da0c612c2 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index c92e7b6c9..b7d6a269a 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "0736d2afc54c944a1cb5efc3986996615914a059" +SRCREV = "8026797012a0cbdce357a5c47304134fec9eca73" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From a2e11c66042bf6d528fce935f12f4621d3808921 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 16 Feb 2021 16:41:33 +0000 Subject: telemetry: srcrev bump 405c1e4bf8..9f14591205 Wludzik, Jozef (1): Match DBus Trigger with phosphor-dbus-interfaces Change-Id: I339d53e49276a59325d1aecdf155eca301d95567 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 2ed09dd7d..f44eacc35 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "405c1e4bf8b993cb3800adead546e91b030ecb9b" +SRCREV = "9f14591205aa47cf3e99c44cc8a0469cb87ed8da" S = "${WORKDIR}/git" -- cgit v1.2.3 From a2cef03c90baff749797cade7fbfa3c490496c11 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 16 Feb 2021 19:00:55 +0000 Subject: phosphor-ipmi-flash: srcrev bump 99b5455933..7d39eb04ac Patrick Venture (1): bmc/ver.../test/.close_unittest: add missing header Change-Id: I8a3ec9ad1668bd6db67c8d7335b3cdb23eb397a7 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index c2ae08c20..f96f4b17a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -46,7 +46,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "99b5455933de4963ecd8d9ccaba18465d4ac5a27" +SRCREV = "7d39eb04acdc6e654019adabda589bcbe0d91971" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ -- cgit v1.2.3 From 91dd8078a5855ee7369c0d60dc405511c4941def Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 16 Feb 2021 19:51:09 +0000 Subject: phosphor-power: srcrev bump de0fd44f76..10d9405574 Jay Meyer (1): Capture PSU STATUS_MFR_SPECIFIC during analysis Change-Id: Ifd8b0e4b7dd2cd43f3e861e27d52ba03034a4d22 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index cd405e83a..b4fc7cea0 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "de0fd44f76c7cd1ae63ec39e708b352a3a7ab0a9" +SRCREV = "10d9405574bc9ae4b7253e145e999202c47f6b99" -- cgit v1.2.3 From c0263ac8ac029de5e7651a22cc864c4b3aaea5c3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 17 Feb 2021 00:51:19 +0000 Subject: phosphor-sel-logger: srcrev bump 7d8a3003fb..dbd77b9200 Charles Hsu (1): Add watchdog event monitor Change-Id: I08d375e006e560c573896349562ca53e3162d628 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb index 375323497..df7bb83cf 100644 --- a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb +++ b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS += "systemd sdbusplus boost phosphor-ipmi-host" SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=git" -SRCREV = "7d8a3003fb8038291f5e678cbfd74344ec6e62d2" +SRCREV = "dbd77b9200c27d129443a7c567ec5a58e55bfeac" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From f19a8381cec954bc1e0e440e2e60c9ea3c58d324 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 16 Feb 2021 14:16:47 -0800 Subject: meta-google: gbmc-ncsi-config: Rename from ncsid-config Make it clear this is a gbmc style configuration, similar to gbmc-systemd-config or gbmc-iperf3. Change-Id: Icd9a2f45f5b399ecb3f8ab1a63d1f0344342ab3a Signed-off-by: William A. Kennington III --- .../ncsi/files/50-gbmc-ncsi.rules.in | 14 ++++++ .../recipes-google/ncsi/files/50-ncsi.rules.in | 14 ------ .../recipes-google/ncsi/gbmc-ncsi-config.bb | 50 ++++++++++++++++++++++ meta-google/recipes-google/ncsi/ncsid-config.bb | 45 ------------------- 4 files changed, 64 insertions(+), 59 deletions(-) create mode 100644 meta-google/recipes-google/ncsi/files/50-gbmc-ncsi.rules.in delete mode 100644 meta-google/recipes-google/ncsi/files/50-ncsi.rules.in create mode 100644 meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb delete mode 100644 meta-google/recipes-google/ncsi/ncsid-config.bb diff --git a/meta-google/recipes-google/ncsi/files/50-gbmc-ncsi.rules.in b/meta-google/recipes-google/ncsi/files/50-gbmc-ncsi.rules.in new file mode 100644 index 000000000..33031f0db --- /dev/null +++ b/meta-google/recipes-google/ncsi/files/50-gbmc-ncsi.rules.in @@ -0,0 +1,14 @@ +table inet filter { + chain ncsi_input { + type filter hook input priority 0; policy drop; + iifname != @NCSI_IF@ accept + ct state established accept + tcp dport 3959 accept + udp dport 3959 accept + tcp dport 3967 accept + udp dport 3967 accept + icmpv6 type nd-neighbor-advert accept + icmpv6 type nd-neighbor-solicit accept + icmpv6 type nd-router-advert accept + } +} diff --git a/meta-google/recipes-google/ncsi/files/50-ncsi.rules.in b/meta-google/recipes-google/ncsi/files/50-ncsi.rules.in deleted file mode 100644 index 33031f0db..000000000 --- a/meta-google/recipes-google/ncsi/files/50-ncsi.rules.in +++ /dev/null @@ -1,14 +0,0 @@ -table inet filter { - chain ncsi_input { - type filter hook input priority 0; policy drop; - iifname != @NCSI_IF@ accept - ct state established accept - tcp dport 3959 accept - udp dport 3959 accept - tcp dport 3967 accept - udp dport 3967 accept - icmpv6 type nd-neighbor-advert accept - icmpv6 type nd-neighbor-solicit accept - icmpv6 type nd-router-advert accept - } -} diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb new file mode 100644 index 000000000..848ab842e --- /dev/null +++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb @@ -0,0 +1,50 @@ +SUMMARY = "Configures ncsi for a gBMC system" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd + +SRC_URI += "file://50-gbmc-ncsi.rules.in" + +S = "${WORKDIR}" + +RDEPENDS_${PN} += "ncsid" + +FILES_${PN} += "${systemd_unitdir}" + +RPROVIDES_${PN} += "ncsid-config" + +do_install_append() { + if_name='${GBMC_NCSI_IF_NAME}' + test -z "$if_name" && if_name='${NCSID_IF_NAME}' + test -z "$if_name" && if_name='${GOOGLE_NCSI_IF_NAME}' + if [ -z "$if_name" ]; then + echo "Missing if_name" >&2 + exit 1 + fi + + install -d -m0755 ${D}${sysconfdir}/sysctl.d + echo "net.ipv6.conf.$if_name.accept_dad=0" \ + >>${D}${sysconfdir}/sysctl.d/25-gbmc-ncsi.conf + echo "net.ipv6.conf.$if_name.dad_transmits=0" \ + >>${D}${sysconfdir}/sysctl.d/25-gbmc-ncsi.conf + + netdir=${D}${systemd_unitdir}/network/00-bmc-$if_name.network.d + install -d -m0755 "$netdir" + echo '[Network]' >>"$netdir"/gbmc-ncsi.conf + echo 'DHCP=false' >>"$netdir"/gbmc-ncsi.conf + echo 'IPv6AcceptRA=false' >>"$netdir"/gbmc-ncsi.conf + echo 'LLMNR=false' >>"$netdir"/gbmc-ncsi.conf + echo 'MulticastDNS=false' >>"$netdir"/gbmc-ncsi.conf + echo 'LinkLocalAddressing=ipv6' >>"$netdir"/gbmc-ncsi.conf + + nftdir=${D}${sysconfdir}/nftables + install -d -m0755 "$nftdir" + sed "s,@NCSI_IF@,$if_name," ${WORKDIR}/50-gbmc-ncsi.rules.in \ + >"$nftdir"/50-gbmc-ncsi.rules + + wantdir=${D}${systemd_system_unitdir}/multi-user.target.wants + install -d -m0755 "$wantdir" + ln -sv ../ncsid@.service "$wantdir"/ncsid@$if_name.service +} diff --git a/meta-google/recipes-google/ncsi/ncsid-config.bb b/meta-google/recipes-google/ncsi/ncsid-config.bb deleted file mode 100644 index e5d77761a..000000000 --- a/meta-google/recipes-google/ncsi/ncsid-config.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Configures ncsid for a system" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit systemd - -SRC_URI += "file://50-ncsi.rules.in" - -S = "${WORKDIR}" - -RDEPENDS_${PN} += "ncsid" - -FILES_${PN} += "${systemd_unitdir}" - -do_install_append() { - if [ -z "${NCSID_IF_NAME}" ]; then - echo "Missing NCSID_IF_NAME" >&2 - exit 1 - fi - - install -d -m0755 ${D}${sysconfdir}/sysctl.d - echo "net.ipv6.conf.${NCSID_IF_NAME}.accept_dad=0" \ - >>${D}${sysconfdir}/sysctl.d/25-nodad.conf - echo "net.ipv6.conf.${NCSID_IF_NAME}.dad_transmits=0" \ - >>${D}${sysconfdir}/sysctl.d/25-nodad.conf - - netdir=${D}${systemd_unitdir}/network/00-bmc-${NCSID_IF_NAME}.network.d - install -d -m0755 "$netdir" - echo '[Network]' >>"$netdir"/ncsi.conf - echo 'DHCP=false' >>"$netdir"/ncsi.conf - echo 'IPv6AcceptRA=false' >>"$netdir"/ncsi.conf - echo 'LLMNR=false' >>"$netdir"/ncsi.conf - echo 'MulticastDNS=false' >>"$netdir"/ncsi.conf - echo 'LinkLocalAddressing=ipv6' >>"$netdir"/ncsi.conf - - nftdir=${D}${sysconfdir}/nftables - install -d -m0755 "$nftdir" - sed "s,@NCSI_IF@,${NCSID_IF_NAME}," ${WORKDIR}/50-ncsi.rules.in \ - >"$nftdir"/50-ncsi.rules - - wantdir=${D}${systemd_system_unitdir}/multi-user.target.wants - install -d -m0755 "$wantdir" - ln -sv ../ncsid@.service "$wantdir"/ncsid@${NCSID_IF_NAME}.service -} -- cgit v1.2.3 From d45e4b3403c5a844c93be4faa4cefce631f537d0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 16 Feb 2021 14:27:24 -0800 Subject: meta-google: gbmc-ncsi-config: Add missing runtime requirements We need sslh and nftables in order for our interface configuration to be useful. Change-Id: I7dffc66dadc1a0d758241344e3908017af304b6a Signed-off-by: William A. Kennington III --- meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb index 848ab842e..67388b247 100644 --- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb +++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb @@ -10,6 +10,8 @@ SRC_URI += "file://50-gbmc-ncsi.rules.in" S = "${WORKDIR}" RDEPENDS_${PN} += "ncsid" +RDEPENDS_${PN} += "nftables-systemd" +RDEPENDS_${PN} += "gbmc-sslh" FILES_${PN} += "${systemd_unitdir}" -- cgit v1.2.3 From 7f11d1ffd591a1cf63b7a6de87c7c257a6ed99ea Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 16 Feb 2021 14:57:41 -0800 Subject: meta-google: Fold gbmc-sslh into gbmc-ncsi-config Logically these packages belong together and don't make much sense without each other. Combine them to reduce package complexity for users. Change-Id: I3d3998f8d10cacbd01f6d883b0033a3260ff60df Signed-off-by: William A. Kennington III --- .../ncsi/files/gbmc-ncsi-sslh.service | 20 +++++++++++++++++++ .../ncsi/files/gbmc-ncsi-sslh.socket.in | 9 +++++++++ .../recipes-google/ncsi/gbmc-ncsi-config.bb | 23 ++++++++++++++++++---- .../recipes-google/networking/files/sslh.service | 20 ------------------- .../recipes-google/networking/files/sslh.socket | 8 -------- meta-google/recipes-google/networking/gbmc-sslh.bb | 23 ---------------------- 6 files changed, 48 insertions(+), 55 deletions(-) create mode 100644 meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service create mode 100644 meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in delete mode 100644 meta-google/recipes-google/networking/files/sslh.service delete mode 100644 meta-google/recipes-google/networking/files/sslh.socket delete mode 100644 meta-google/recipes-google/networking/gbmc-sslh.bb diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service new file mode 100644 index 000000000..b6bc04a4c --- /dev/null +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service @@ -0,0 +1,20 @@ +[Unit] +Description=SSL/SSH multiplexer +Requires=sslh.socket + +[Service] +ExecStart=/usr/sbin/sslh -n -f --ssh [::1]:22 --http [::1]:80 --tls [::1]:443 +KillMode=process +#Hardening +PrivateTmp=true +ProtectSystem=strict +ProtectHome=true +ProtectKernelModules=true +ProtectKernelTunables=true +ProtectControlGroups=true +MountFlags=private +NoNewPrivileges=true +PrivateDevices=true +RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX +MemoryDenyWriteExecute=true +DynamicUser=true diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in new file mode 100644 index 000000000..9e5f5949d --- /dev/null +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in @@ -0,0 +1,9 @@ +[Unit] +Before=sslh.service + +[Socket] +BindToDevice=@NCSI_IF@ +ListenStream=3967 + +[Install] +WantedBy=sockets.target diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb index 67388b247..41d697678 100644 --- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb +++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb @@ -5,18 +5,29 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd -SRC_URI += "file://50-gbmc-ncsi.rules.in" +SRC_URI += " \ + file://50-gbmc-ncsi.rules.in \ + file://gbmc-ncsi-sslh.socket.in \ + file://gbmc-ncsi-sslh.service \ + " S = "${WORKDIR}" -RDEPENDS_${PN} += "ncsid" -RDEPENDS_${PN} += "nftables-systemd" -RDEPENDS_${PN} += "gbmc-sslh" +RDEPENDS_${PN} += " \ + ncsid \ + nftables-systemd \ + sslh \ + " FILES_${PN} += "${systemd_unitdir}" RPROVIDES_${PN} += "ncsid-config" +SYSTEMD_SERVICE_${PN} += " \ + gbmc-ncsi-sslh.service \ + gbmc-ncsi-sslh.socket \ + " + do_install_append() { if_name='${GBMC_NCSI_IF_NAME}' test -z "$if_name" && if_name='${NCSID_IF_NAME}' @@ -49,4 +60,8 @@ do_install_append() { wantdir=${D}${systemd_system_unitdir}/multi-user.target.wants install -d -m0755 "$wantdir" ln -sv ../ncsid@.service "$wantdir"/ncsid@$if_name.service + + install -m 0644 ${WORKDIR}/gbmc-ncsi-sslh.service ${D}${systemd_system_unitdir} + sed "s,@NCSI_IF@,$if_name," ${WORKDIR}/gbmc-ncsi-sslh.socket.in \ + >${D}${systemd_system_unitdir}/gbmc-ncsi-sslh.socket } diff --git a/meta-google/recipes-google/networking/files/sslh.service b/meta-google/recipes-google/networking/files/sslh.service deleted file mode 100644 index b6bc04a4c..000000000 --- a/meta-google/recipes-google/networking/files/sslh.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=SSL/SSH multiplexer -Requires=sslh.socket - -[Service] -ExecStart=/usr/sbin/sslh -n -f --ssh [::1]:22 --http [::1]:80 --tls [::1]:443 -KillMode=process -#Hardening -PrivateTmp=true -ProtectSystem=strict -ProtectHome=true -ProtectKernelModules=true -ProtectKernelTunables=true -ProtectControlGroups=true -MountFlags=private -NoNewPrivileges=true -PrivateDevices=true -RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX -MemoryDenyWriteExecute=true -DynamicUser=true diff --git a/meta-google/recipes-google/networking/files/sslh.socket b/meta-google/recipes-google/networking/files/sslh.socket deleted file mode 100644 index 2540e5961..000000000 --- a/meta-google/recipes-google/networking/files/sslh.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Before=sslh.service - -[Socket] -ListenStream=3967 - -[Install] -WantedBy=sockets.target diff --git a/meta-google/recipes-google/networking/gbmc-sslh.bb b/meta-google/recipes-google/networking/gbmc-sslh.bb deleted file mode 100644 index ec16f078f..000000000 --- a/meta-google/recipes-google/networking/gbmc-sslh.bb +++ /dev/null @@ -1,23 +0,0 @@ -PR = "r1" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit systemd - -RDEPENDS_${PN} += "sslh" - -SRC_URI_append = " \ - file://sslh.service \ - file://sslh.socket \ -" - -SYSTEMD_SERVICE_${PN} += "sslh.service" -SYSTEMD_SERVICE_${PN} += "sslh.socket" - -do_install() { - # Install service definitions - install -d -m 0755 ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/sslh.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/sslh.socket ${D}${systemd_system_unitdir} -} -- cgit v1.2.3 From adad0b1b2d85e6eda9d3d018923fc9acdde097df Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 16 Feb 2021 13:24:02 -0800 Subject: meta-google: obmc-phosphor-image: Add systemd-config Change-Id: I37c82c2e7d494e7ae5581ee93ea34ac2908bedfb Signed-off-by: William A. Kennington III --- meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend index e755439be..08672196d 100644 --- a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -3,3 +3,5 @@ OBMC_IMAGE_EXTRA_INSTALL_append = " google-ipmi-i2c" OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-blobs" OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-ethstats" OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-flash" + +OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-systemd-config" -- cgit v1.2.3 From 161dad013542f79910064b2c083f0c12eafa7fea Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 16 Feb 2021 13:24:45 -0800 Subject: meta-google: obmc-phosphor-image: Add iperf3 Change-Id: I56abfee5270d63e8077314f548effa86596a148d Signed-off-by: William A. Kennington III --- meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend index 08672196d..917a03c7b 100644 --- a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -5,3 +5,4 @@ OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-ethstats" OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-flash" OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-systemd-config" +OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-iperf3" -- cgit v1.2.3 From 1be0a661fce2d8d1ea3b19c9ecfb649f43ce6f01 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 17 Feb 2021 14:07:00 -0800 Subject: meta-google: obmc-phosphor-image: Add NCSI when specified Change-Id: Id15f7bb08f08da3cfdef24c0c38a42caffdb70c0 Signed-off-by: William A. Kennington III --- meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend index 917a03c7b..37655b98f 100644 --- a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -6,3 +6,5 @@ OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-flash" OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-systemd-config" OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-iperf3" +OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = \ + '${@"" if not d.getVar("GBMC_NCSI_IF_NAME") else " gbmc-ncsi-config"}' -- cgit v1.2.3 From 6926f175f0a8099501ea2523f270db6be7049dcd Mon Sep 17 00:00:00 2001 From: "Anton D. Kachalov" Date: Thu, 4 Feb 2021 13:36:08 +0100 Subject: nuvoton: Enable seccomp support in kernel. Signed-off-by: Anton D. Kachalov Change-Id: I5f6ef36e374b4b1d6f2cb50d6f7344fa801aa12a --- meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig index 635db10b9..78f13fd48 100644 --- a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig +++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig @@ -142,3 +142,5 @@ CONFIG_ARM_CRYPTO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_USER_API_HASH=y +CONFIG_SECCOMP=y +CONFIG_OABI_COMPAT=n -- cgit v1.2.3 From 5c975090abd1f717d1a3b0919ede7875fcf1abda Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 17 Feb 2021 22:20:57 +0000 Subject: bmcweb: srcrev bump 086d32c5a6..65f7365901 Ed Tanous (1): Add back rtti George Liu (1): Replace rfind method in sensors.hpp SunnySrivastava1984 (2): Add additional Redfish Manager properties Add additional Redfish Processor properties Change-Id: I51882c6c1fc8783323351a3af11de8ab4969aefb Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 59deaf4a4..1ac3cc173 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "086d32c5a61a29e92ac441e66fd4a53df4f2c8ec" +SRCREV = "65f7365901fad2437456f4edcdac41e03f0ca259" S = "${WORKDIR}/git" -- cgit v1.2.3 From 857ccc500fc44edbe47272a3b21611ac8c6375b2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 17 Feb 2021 20:40:42 +0000 Subject: phosphor-fan-presence: srcrev bump fcb0dbcb14..05ae4fe471 Matt Spinler (3): presence: Add service file to repo sensor-mon: Add service file Add service files to .gitignore Change-Id: I307ce56691faa968a1900965b8ce478d404eb145 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 9bf731592..746ccd676 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "fcb0dbcb144020606780da9dd2e2be517ef7cf6d" +SRCREV = "05ae4fe47134223f8f543d50c1f3f7dd57997742" -- cgit v1.2.3 From 577d20f2e23e0e7cfcf8a1dff685537e19c330f7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 17 Feb 2021 14:33:38 -0800 Subject: meta-google: google-ipmi-sys: Add NCSI override Change-Id: Ib5d9e1d60194d71c433003669c16f896964729ad Signed-off-by: William A. Kennington III --- meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb index f8af0a04c..c27248700 100644 --- a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb +++ b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb @@ -30,6 +30,9 @@ HOSTIPMI_PROVIDER_LIBRARY += "libsyscmds.so" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "gbmc-psu-hardreset.target" +CXXFLAGS_append_gbmc = '${@"" if not d.getVar("GBMC_NCSI_IF_NAME") else \ + " -DNCSI_IPMI_CHANNEL=1 -DNCSI_IF_NAME=" + d.getVar("GBMC_NCSI_IF_NAME")}' + do_install_append() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${S}/gbmc-psu-hardreset.target ${D}${systemd_system_unitdir} -- cgit v1.2.3 From e57423e587640fa7fadad28bdda09daa240553df Mon Sep 17 00:00:00 2001 From: Brandon Kim Date: Tue, 16 Feb 2021 18:51:31 -0800 Subject: meta-google: Add gbmc distro Upstream our base distro Upstream: 1fe32412faa5dbe9691b977c100712d2baa89887 Google-Bug-Id: 179617826 Signed-off-by: Brandon Kim Change-Id: Ib0795ffb39ea8124c808f7ecb1d48808bce3e46e --- meta-google/conf/distro/gbmc.conf | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 meta-google/conf/distro/gbmc.conf diff --git a/meta-google/conf/distro/gbmc.conf b/meta-google/conf/distro/gbmc.conf new file mode 100644 index 000000000..354c93991 --- /dev/null +++ b/meta-google/conf/distro/gbmc.conf @@ -0,0 +1,18 @@ +require conf/distro/openbmc-phosphor.conf +require conf/distro/include/phosphor-isolation.inc + +GBMC_VERSION ?= "0.5.0.0" +DISTRO = "gbmc" +DISTRO_NAME = "gBMC (OpenBMC + Google customizations)" +DISTRO_VERSION = "gbmc-release-${GBMC_VERSION}" +DISTROOVERRIDES .= ":gbmc" + +DISTRO_FEATURES_remove = "ldap" +DISTRO_FEATURES_remove = "slp" + +# Required to get entity-manager to build with FruDevice service +DISTRO_FEATURES_append = " ipmi-fru" + +WATCHDOG_PKG ?= "watchdog" + +SANITY_TESTED_DISTROS_append = " Debian-rodete \n debian-rodete \n " -- cgit v1.2.3 From bcd9057773f8876a0b13398405847449f89aafa3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 17 Feb 2021 16:53:12 -0800 Subject: meta-google: gbmc-ncsi-config: Remove compatability We are now caught up enough that we don't need these compatability variables or provided packages anymore. Change-Id: I7dbfb1ffe447c97bb4baaba20a15be9187983b41 Signed-off-by: William A. Kennington III --- meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb index 41d697678..ecdda2cb6 100644 --- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb +++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb @@ -21,8 +21,6 @@ RDEPENDS_${PN} += " \ FILES_${PN} += "${systemd_unitdir}" -RPROVIDES_${PN} += "ncsid-config" - SYSTEMD_SERVICE_${PN} += " \ gbmc-ncsi-sslh.service \ gbmc-ncsi-sslh.socket \ @@ -30,8 +28,6 @@ SYSTEMD_SERVICE_${PN} += " \ do_install_append() { if_name='${GBMC_NCSI_IF_NAME}' - test -z "$if_name" && if_name='${NCSID_IF_NAME}' - test -z "$if_name" && if_name='${GOOGLE_NCSI_IF_NAME}' if [ -z "$if_name" ]; then echo "Missing if_name" >&2 exit 1 -- cgit v1.2.3 From 0a013943dc900a8a9109ac8161fa25c0e0e5f32a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 17 Feb 2021 22:50:20 +0000 Subject: intel-ipmi-oem: srcrev bump b910987a7d..09701efa93 Alex Qiu (1): sensorcommands: Cache sensor data at 60s interval when requested for SDR Change-Id: I859a371a2fd982ec1465e1c926ff58236c7d49c5 Signed-off-by: Andrew Geissler --- meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index a63a8241b..0273d61bf 100755 --- a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "b910987a7d832e38e9342f0946aeb555a48f9cb0" +SRCREV = "09701efa93f2e9b25b19c4560db60c1878ef8a9c" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From a52006f5cab2e03edc267fe0650f8cfe720c5a70 Mon Sep 17 00:00:00 2001 From: George Hung Date: Thu, 18 Feb 2021 08:37:57 +0800 Subject: meta-quanta: gbs: change to set CRITILO fan speed to 1800 RPM Change to set CRITILO fan speed to 1800 RPM for fan failsafe consideration according to the thermal team suggestion Signed-off-by: George Hung Change-Id: I2fef191d53b095bce6518583dea072700ff9a0e7 --- .../obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf index 66ae42206..bcca9a636 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf @@ -2,7 +2,7 @@ LABEL_fan1= "fan0" WARNHI_fan1= "19800" WARNLO_fan1= "3330" CRITHI_fan1= "19800" -CRITLO_fan1= "600" +CRITLO_fan1= "1800" MINVALUE_fan1 = "0" MAXVALUE_fan1 = "20775" PWM_TARGET_fan1 = 1 @@ -11,7 +11,7 @@ LABEL_fan2= "fan1" WARNHI_fan2= "19800" WARNLO_fan2= "3330" CRITHI_fan2= "19800" -CRITLO_fan2= "600" +CRITLO_fan2= "1800" MINVALUE_fan2 = "0" MAXVALUE_fan2 = "20775" PWM_TARGET_fan2 = 2 @@ -20,7 +20,7 @@ LABEL_fan3= "fb_fan0" WARNHI_fan3= "19800" WARNLO_fan3= "3330" CRITHI_fan3= "19800" -CRITLO_fan3= "600" +CRITLO_fan3= "1800" MINVALUE_fan3 = "0" MAXVALUE_fan3 = "20775" PWM_TARGET_fan3 = 3 @@ -29,7 +29,7 @@ LABEL_fan4= "fb_fan2" WARNHI_fan4= "19800" WARNLO_fan4= "3330" CRITHI_fan4= "19800" -CRITLO_fan4= "600" +CRITLO_fan4= "1800" MINVALUE_fan4 = "0" MAXVALUE_fan4 = "20775" PWM_TARGET_fan4 = 4 @@ -38,7 +38,7 @@ LABEL_fan5= "fb_fan1" WARNHI_fan5= "19800" WARNLO_fan5= "3330" CRITHI_fan5= "19800" -CRITLO_fan5= "600" +CRITLO_fan5= "1800" MINVALUE_fan5 = "0" MAXVALUE_fan5 = "20775" PWM_TARGET_fan5 = 5 -- cgit v1.2.3 From 7e80652b59e3bda97583bb27d1427d65d7e3b4d2 Mon Sep 17 00:00:00 2001 From: George Hung Date: Thu, 18 Feb 2021 08:52:29 +0800 Subject: meta-quanta: gbs: update thermal config to R04 Add the fleeting2 sensor for the hda temperature Signed-off-by: George Hung Change-Id: I5dd3ebfcedc07df15677bacdf0f029e009213adf --- .../gbs-yaml-config/gbs-ipmi-sensors.yaml | 6 ++++ .../fans/phosphor-pid-control/config-sku.json | 35 +++++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml index 746956e55..e0eb0e192 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml +++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml @@ -543,6 +543,12 @@ entityInstance: 0x2e path: /xyz/openbmc_project/sensors/temperature/hotswap +0x2E: + <<: *temperature + entityID: 0x1E + entityInstance: 0x02 + path: /xyz/openbmc_project/extsensors/margin/fleeting2 + # fan/pwm mapping # fan0/1 on Mobo, fb_fan0/1/2 on fan board # PWM0 => fan tach 0 diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config-sku.json b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config-sku.json index f2997efd0..e5040ca1c 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config-sku.json +++ b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config-sku.json @@ -1,5 +1,5 @@ { - "version": "R03", + "version": "R04", "sensors": [ { "name": "fan0", @@ -61,6 +61,16 @@ "ignoreDbusMinMax": true, "timeout": 0 }, + { + "name": "fleeting2", + "type": "margin", + "readPath": "/xyz/openbmc_project/extsensors/margin/fleeting2", + "writePath": "", + "min": 0, + "max": 0, + "ignoreDbusMinMax": true, + "timeout": 0 + }, { "name": "cputemp", "type": "margin", @@ -241,6 +251,29 @@ "positiveHysteresis": 0.0, "negativeHysteresis": 0.0 } + }, + { + "name": "fleeting2", + "type": "margin", + "inputs": [ + "fleeting2" + ], + "setpoint": 10.0, + "pid": { + "samplePeriod": 1.0, + "proportionalCoeff": 536.0, + "integralCoeff": 18.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": 2679.0, + "integralLimit_max": 18000.0, + "outLim_min": 2679.0, + "outLim_max": 18000.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0.0, + "negativeHysteresis": 0.0 + } } ] }, -- cgit v1.2.3 From 1c8613662c13552abd9a2612f9a8a1628844fdef Mon Sep 17 00:00:00 2001 From: "Anton D. Kachalov" Date: Thu, 18 Feb 2021 08:17:26 +0000 Subject: Revert "nuvoton: Enable seccomp support in kernel." This reverts commit 6926f175f0a8099501ea2523f270db6be7049dcd. Reason for revert: Seccomp being enabled by default. Change-Id: I6ad97ebf37b79acfdee70d5cbbce2dd11b8bc061 Signed-off-by: Anton D. Kachalov --- meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig index 78f13fd48..635db10b9 100644 --- a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig +++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig @@ -142,5 +142,3 @@ CONFIG_ARM_CRYPTO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_USER_API_HASH=y -CONFIG_SECCOMP=y -CONFIG_OABI_COMPAT=n -- cgit v1.2.3 From 01395f88b3249af629f6db2f644eb5be2d7d51e4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 18 Feb 2021 13:30:46 -0800 Subject: meta-google: gbmc-ncsi-config: Fix sslh The name of the unit files got updated, but the internal references did not. Change-Id: I772e5755ba45cc7f4b4fdd2469286f08032c0f9d Signed-off-by: William A. Kennington III --- meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service | 3 ++- meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service index b6bc04a4c..e9bbd1d9b 100644 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service @@ -1,6 +1,7 @@ [Unit] Description=SSL/SSH multiplexer -Requires=sslh.socket +Requires=gbmc-ncsi-sslh.socket +After=gbmc-ncsi-sslh.socket [Service] ExecStart=/usr/sbin/sslh -n -f --ssh [::1]:22 --http [::1]:80 --tls [::1]:443 diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in index 9e5f5949d..c0abbc2fd 100644 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in @@ -1,6 +1,3 @@ -[Unit] -Before=sslh.service - [Socket] BindToDevice=@NCSI_IF@ ListenStream=3967 -- cgit v1.2.3 From 80f4a5a72a58887865803102e63c8fbdada69eef Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 18 Feb 2021 16:30:58 +0000 Subject: pldm: srcrev bump fec5d59b00..38ce97cc59 Andrew Geissler (1): utilize hypervisor property for effecter Christian Geddes (1): Fix endian conversion for sensor_id in encode_sensor_event_data George Liu (4): Fix: Trigger the listenSensorEvent method Fix decode getStateSensorReadings resp command libpldmresponder: Create default D-Bus object when generate PDR Fix the getStateSensorReadings command Jayashankar Padath (1): oem-ibm: Resource dump support Manojkiran Eda (3): Set the ibm dma max size within the repo Bring back the dbus backend for bios attributes Fix Compilation with DebugMode in Yocto arm sdk Sridevi Ramesh (2): Add tracing when the BMC PLDM daemon issues GetPDR to host Implement pldmtool platfrom Getstatesensorreading Change-Id: Iec72a0621835e89749d0bb45dc4e0227187e3af2 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index ad31863c8..c69ee9158 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "fec5d59b0081de6d7050265c181221336e2ffcc7" +SRCREV = "38ce97cc5981d8011087a3153530edf7cda0094b" -- cgit v1.2.3 From 37e0309a5451576a9bd2543f0108524c9bd5d4c3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 18 Feb 2021 22:30:45 +0000 Subject: phosphor-fan-presence: srcrev bump 05ae4fe471..0b49fe7882 Matt Spinler (2): monitor: Support for running with power off monitor: Add service files to repo Matthew Barth (1): docs: Initial config details for each fan app Change-Id: I8d6c8133a4013707d40f68fdd00fb622673f9318 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 746ccd676..02195bbb5 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "05ae4fe47134223f8f543d50c1f3f7dd57997742" +SRCREV = "0b49fe78825366bd144cde9164bc222d46db905e" -- cgit v1.2.3 From fa639a264e58164bc4730c54bb69b0e342303090 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 18 Feb 2021 17:31:18 +0000 Subject: dbus-sensors: srcrev bump 49d12d8955..87bc67f7f5 Jeff Lin (2): meson: add external sensor to meson build HwmonTempSensor: Add PollRate attribute Change-Id: Ia4f88e292726656b497beb74f67a0dbfccaa7553 Signed-off-by: Andrew Geissler Signed-off-by: Ed Tanous --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 015a6e76c..f17db0661 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "49d12d8955495d4091b4520605c9e4510fcd743b" +SRCREV = "87bc67f7f526344a132aaacdaad3a49b43dda29d" PV = "0.1+git${SRCPV}" @@ -61,7 +61,7 @@ SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'mcutempsensor', SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'psusensor', \ 'xyz.openbmc_project.psusensor.service', \ '', d)}" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'externalsensor', \ +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'external', \ 'xyz.openbmc_project.externalsensor.service', \ '', d)}" -- cgit v1.2.3 From 4fb68c2f8a593dd0060003fa5be74670e389c8e0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 18 Feb 2021 17:30:23 +0000 Subject: openpower-hw-diags: srcrev bump b3eba29929..4ed4be5645 Zane Shelley (3): created Callout classes for various PEL callouts Created ServiceData class for hardware analysis Add ServiceData callout list to PEL Change-Id: I750f98c4ea5036a69f46407a2383f309e28a04ce Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 02bcb7598..37052d31a 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/openbmc/openpower-hw-diags" SYSTEMD_SERVICE_${PN} = "attn_handler.service" PV = "0.1+git${SRCPV}" -SRCREV = "b3eba2992926f9fc55a836d2baab85adfdf9bc5d" +SRCREV = "4ed4be5645dbadbe6c251012485a71a75ec9ae82" S = "${WORKDIR}/git" -- cgit v1.2.3 From 59917de4c3a93b3fa7000b9860c6249db38742e5 Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Thu, 11 Feb 2021 15:15:22 -0600 Subject: meta-ibm:rainier-2u: Remove inlet rotors from trust groups Fan monitoring should not need the inlet rotors included in the nonzero speed trust group. This causes the nonfunctional timer to start for these rotors and immediately stop since they are never actually taken into account in the determination of trust. Signed-off-by: Matthew Barth Change-Id: I043f1003319e84e3c93b59f80963525d9d7d4eac --- .../rainier/rainier-2u/config.json | 24 ---------------------- 1 file changed, 24 deletions(-) diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json index b15003a50..145e37f38 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json @@ -154,30 +154,6 @@ }, { "name": "fan5_1" - }, - { - "name": "fan0_0", - "in_trust": false - }, - { - "name": "fan1_0", - "in_trust": false - }, - { - "name": "fan2_0", - "in_trust": false - }, - { - "name": "fan3_0", - "in_trust": false - }, - { - "name": "fan4_0", - "in_trust": false - }, - { - "name": "fan5_0", - "in_trust": false } ] } -- cgit v1.2.3 From 36a3744b2cfd6beef9459e25d1999d5a8845b5f1 Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Thu, 11 Feb 2021 15:17:57 -0600 Subject: meta-ibm:everest: Remove inlet rotors from trust groups Fan monitoring should not need the inlet rotors included in the nonzero speed trust group. This causes the nonfunctional timer to start for these rotors and immediately stop since they are never actually taken into account in the determination of trust. Signed-off-by: Matthew Barth Change-Id: I411faab9dcd67fa2409f6be39be54969a0eb2520 --- .../rainier/everest/config.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json index 93d1bdc21..74bcfc425 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json @@ -96,22 +96,6 @@ }, { "name": "fan3_1" - }, - { - "name": "fan0_0", - "in_trust": false - }, - { - "name": "fan1_0", - "in_trust": false - }, - { - "name": "fan2_0", - "in_trust": false - }, - { - "name": "fan3_0", - "in_trust": false } ] } -- cgit v1.2.3 From a469a0ffe98eb48e976a23675fdb02cf7d8b75e3 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 19 Feb 2021 15:07:44 -0600 Subject: setup: tolerate `which` failures If this script is sourced in a shell that has something like `set -e`, then it fails if the column program does not exist because the `which columm` fails. Make a few changes to tolerate this and not fail: - Use $(...) rather than `...`. - Use `... || true` when appropriate to allow continuance. Signed-off-by: Patrick Williams Change-Id: I9008778e8aee4747faa4decff74a2fb361a206ed --- setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup b/setup index 57b3ded72..db9ede6ba 100755 --- a/setup +++ b/setup @@ -21,10 +21,10 @@ if [ -z "$ZSH_NAME" ] && [ "$(basename -- "$0")" = "setup" ]; then fi # Check if 'column' command is present -COLUMN=`which column` +COLUMN=$(which column || true) if [ -z "$COLUMN" ]; then # If it is not, use 'cat' - COLUMN=`which cat` + COLUMN=$(which cat) fi machine() { -- cgit v1.2.3 From d55589b9c1c931cd8be6c7e47bc18fe8c2406889 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 19 Feb 2021 17:13:35 -0600 Subject: romulus: remove empty distro indirection Most openpower machines use DISTRO="openbmc-openpower" but Romulus has a "openbmc-romulus" distro config file. This config file has nothing except an inclusion of the openpower one, so remove this useless indirection. Signed-off-by: Patrick Williams Change-Id: I371ce4137369e4964eed1529f8a8190e31721ecc --- meta-ibm/meta-romulus/conf/distro/openbmc-romulus.conf | 1 - meta-ibm/meta-romulus/conf/local.conf.sample | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 meta-ibm/meta-romulus/conf/distro/openbmc-romulus.conf diff --git a/meta-ibm/meta-romulus/conf/distro/openbmc-romulus.conf b/meta-ibm/meta-romulus/conf/distro/openbmc-romulus.conf deleted file mode 100644 index 2570a9a19..000000000 --- a/meta-ibm/meta-romulus/conf/distro/openbmc-romulus.conf +++ /dev/null @@ -1 +0,0 @@ -require conf/distro/openbmc-openpower.conf diff --git a/meta-ibm/meta-romulus/conf/local.conf.sample b/meta-ibm/meta-romulus/conf/local.conf.sample index 83a3f9b22..ef13391bf 100644 --- a/meta-ibm/meta-romulus/conf/local.conf.sample +++ b/meta-ibm/meta-romulus/conf/local.conf.sample @@ -63,9 +63,9 @@ MACHINE ??= "romulus" # Ultimately when creating custom policy, people will likely end up subclassing # these defaults. # -DISTRO ?= "openbmc-romulus" +DISTRO ?= "openbmc-openpower" # As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream +# where many versions are set to the absolute latest code from the upstream # source control systems. This is just mentioned here as an example, its not # useful to most new users. # DISTRO ?= "poky-bleeding" -- cgit v1.2.3 From 2f792172a5d898b2e31bfcba2d45ab899c0ff630 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 19 Feb 2021 19:33:52 -0600 Subject: meta-evb-aspeed: add symlinks for machine-conf for setup The 'setup' script looks for machine config files being present to know that the meta-layer contains a valid machine for OpenBMC. The aspeed EVBs are split between meta-aspeed for the base support and meta-evb-aspeed for "EVB on Phosphor" support. Add symlinks for the machine config files from meta-aspeed into meta-evb-aspeed so that setup recognizes them as valid machines, but using the phosphor layers. Signed-off-by: Patrick Williams Change-Id: I673756a3d837f61d7338b8fbb356c5234770ffca --- meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf | 1 + meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/machine/evb-ast2600.conf | 1 + 2 files changed, 2 insertions(+) create mode 120000 meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf create mode 120000 meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/machine/evb-ast2600.conf diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf new file mode 120000 index 000000000..be96d737d --- /dev/null +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf @@ -0,0 +1 @@ +../../../../../meta-aspeed/conf/machine/evb-ast2500.conf \ No newline at end of file diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/machine/evb-ast2600.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/machine/evb-ast2600.conf new file mode 120000 index 000000000..2f706843e --- /dev/null +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/machine/evb-ast2600.conf @@ -0,0 +1 @@ +../../../../../meta-aspeed/conf/machine/evb-ast2600.conf \ No newline at end of file -- cgit v1.2.3 From aef980975e4ed5f11b990decee6903178188a363 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 19 Feb 2021 19:45:05 -0600 Subject: setup: skip non-phosphor machines We already had logic to skip non-phosphor machines in the 'list' operation, but did not skip those machines when targeting them. Those machines are almost certain to not operate as expected and in some cases, such as EVB models, we have two meta-layers associated with the machine. Skipping non-phosphor machines ensures that the setup script picks the right configuration and does not attempt to target a machine that won't work. Signed-off-by: Patrick Williams Change-Id: If68c27e2a8675405672df497827dde6e86147108 --- setup | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/setup b/setup index db9ede6ba..976e8615f 100755 --- a/setup +++ b/setup @@ -47,6 +47,15 @@ machine() { name=${cfg##*/} name=${name%.conf} tmpl=${cfg%/machine/*.conf} + + # Skip any machines that don't support meta-phosphor. + if [ ! -e $tmpl/bblayers.conf.sample ]; then + continue + fi + if ! grep -q "##OEROOT##/meta-phosphor" $tmpl/bblayers.conf.sample; then + continue + fi + # If a target is specified, then check for a match, # otherwise just list what we've discovered if [ -n "$target" ]; then @@ -62,9 +71,7 @@ machine() { fi return fi - elif test -e $tmpl/bblayers.conf.sample && \ - grep -q "##OEROOT##/meta-phosphor" $tmpl/bblayers.conf.sample; - then + else echo "${name}" fi done -- cgit v1.2.3 From 6467f4ec9b3e83b8bf60fac2ab3bbed249b97fba Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 22 Feb 2021 16:52:29 +0000 Subject: dbus-sensors: srcrev bump 87bc67f7f5..a0683a889a Ed Tanous (2): add clang-tidy Fix bug in name escaping for PSUSensor Jeff Lin (3): Fix thresholds not found CPUSensor: update depth to find hwmonNamePaths PSUSensor: Add five supported devices Change-Id: I5a7af68a6d2232707d27635ddcb53027e1b2dfe0 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index f17db0661..4960f16d2 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "87bc67f7f526344a132aaacdaad3a49b43dda29d" +SRCREV = "a0683a889a12bf665595ccdcb349c5f4ab321eea" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From d43f8ba66e364b134a96f66fcfd94e43f113067a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 19 Feb 2021 16:01:00 +0000 Subject: phosphor-power: srcrev bump 10d9405574..a528a28156 Shawn McCarney (1): regulators: Enhance SystemdJournal::getMessages() Change-Id: I5cea75279e6367bf1958f95202cb3253cf51b78d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index b4fc7cea0..c357cc38a 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "10d9405574bc9ae4b7253e145e999202c47f6b99" +SRCREV = "a528a28156a129486a917ac6d9849223ecef15c8" -- cgit v1.2.3 From e6c4c7a0a6261dcfd80b346d53ac8f99cb3963d5 Mon Sep 17 00:00:00 2001 From: Vivekanand Veeracholan Date: Mon, 22 Feb 2021 12:56:43 -0800 Subject: meta-fii: Remove Xiao-Peng.Chen from owners file Xiao-Peng.Chen@fii-na.com does not have a gerrit account. Temporarily remove it till they have an account. Signed-off-by: Vivekanand Veeracholan Change-Id: I41e48ff9b178ecb7c6838031220063d2fb742032 --- meta-fii/OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-fii/OWNERS b/meta-fii/OWNERS index be8df7924..847f9142d 100644 --- a/meta-fii/OWNERS +++ b/meta-fii/OWNERS @@ -3,4 +3,4 @@ owners: - vveerach@google.com - lancelot.kao@fii-usa.com - Mohaimen.Alsamarai@fii-na.com -- Xiao-Peng.Chen@fii-na.com +# - Xiao-Peng.Chen@fii-na.com -- cgit v1.2.3 From 449ea7d2647236fb7a41203e80baa589a7ec16dd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 22 Feb 2021 16:41:02 +0000 Subject: bmcweb: srcrev bump 65f7365901..ee135e246d Ed Tanous (6): Start using sdbusplus::message::filename() Add issue templates Fix nlohmann::json::dump calls Fix compile issue on DISABLE_XSS_PREVENTION Remove permessage deflate from the build Change config file name to bmcweb_config.h Manojkiran Eda (1): Enable Parallel Linking for LTO builds SunnySrivastava1984 (1): Add additional Redfish Memory properties Change-Id: I6882ba320b1d0c9b208b14e9cdcfaecc05b2d912 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 1ac3cc173..83e5cf9d8 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "65f7365901fad2437456f4edcdac41e03f0ca259" +SRCREV = "ee135e246d8348048b5409b5ed0b81d9c1820c30" S = "${WORKDIR}/git" -- cgit v1.2.3 From 753681c6639d3cb9581ca652ce63ee48b0d2be8b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 22 Feb 2021 14:20:38 +0000 Subject: phosphor-dbus-interfaces: srcrev bump 257c17da48..f9d1af68ad Andrew Geissler (1): new unsupported request common error Igor Kononenko (1): sensors: Add enum value "CFM" to the Unit-property Konstantin Aladyshev (1): Add d-bus interface for BIOS boot type (EFI/Legacy) Patrick Williams (1): .gitignore: handle subprojects better Change-Id: I09a0f0314f1ca44bda3c134561cd497364ac4dcd Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index fbaa3f220..e7c71d274 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "257c17da484244ae81b98d4bb12a052187d2c57e" +SRCREV = "f9d1af68ad89d00a1ae74279cd8dbdf5455bda0e" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true -- cgit v1.2.3 From d0ee702cfd9690851e86dee30b88ddf622e9c2fc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sun, 21 Feb 2021 20:30:37 +0000 Subject: entity-manager: srcrev bump 2a96708200..8152a13918 Jim Wright (1): configurations: Add UCD90320 to Nisqually and Bellavista Change-Id: I8ad1e413dd76f907972db60d45f36e11d6a243fc Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index d78808b69..d7d057656 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "2a9670820094a9a1847770597b713bf6fb3c08ba" +SRCREV = "8152a1391854e3c736de7fd819ddfff7542297c3" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From 945711e6be5ffd05d4e2a5e3d4053668bd031e57 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 22 Feb 2021 16:42:03 +0000 Subject: pldm: srcrev bump 38ce97cc59..c0d4875908 Matt Spinler (1): Add thermal fault state sensor definition Change-Id: I49dead94790383f7ab8ed4bb94b11cace8f4ad7b Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index c69ee9158..c9f815444 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "38ce97cc5981d8011087a3153530edf7cda0094b" +SRCREV = "c0d487590894e5fb03eea48698b43a7c90697b38" -- cgit v1.2.3 From bf8aa66cb098e65f6bc1291218bd79a9dcd3868f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 22 Feb 2021 16:50:44 +0000 Subject: openpower-hw-diags: srcrev bump 4ed4be5645..7a0dd543c8 Ben Tyner (2): Attn: Limit trace length messages Attn: Procedure specific error codes in error logs Change-Id: I6c0761a119e289aaa925dad70e56852f73d3216f Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 37052d31a..d9df2a38a 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/openbmc/openpower-hw-diags" SYSTEMD_SERVICE_${PN} = "attn_handler.service" PV = "0.1+git${SRCPV}" -SRCREV = "4ed4be5645dbadbe6c251012485a71a75ec9ae82" +SRCREV = "7a0dd543c8fef050f7347dde760e6aff84b07122" S = "${WORKDIR}/git" -- cgit v1.2.3 From d1165d1bde0d5043d0b3f71360e979f9bffd3761 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 22 Feb 2021 17:01:01 +0000 Subject: phosphor-fan-presence: srcrev bump 0b49fe7882..49d45bcdd3 Matt Spinler (4): sensor-mon: Threshold alarm logger framework sensor-mon: Check for threshold alarms on startup sensor-mon: Handle propertiesChanged sensor-mon: Create event logs Matthew Barth (3): monitor: Add JSON configuration example presence: Format example JSON configuration docs:presence: Configuration content and syntax Change-Id: I998fe493443369c8271d44980d7cc9ad62801d00 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 02195bbb5..321184111 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "0b49fe78825366bd144cde9164bc222d46db905e" +SRCREV = "49d45bcdd3b7aef59d3a251e5a1302852cd23fdb" -- cgit v1.2.3 From 983ec41074988cf15d98bf8c929efee125682eeb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 22 Feb 2021 20:50:33 +0000 Subject: sdbusplus: srcrev bump 32ffb03dc8..4b646236df Patrick Williams (1): clang-format fixes for latest Change-Id: Id783782ca1c6bd2cb051f93df96553b6a2d4b442 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index 0e3aa9f7a..81be96641 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc @@ -3,4 +3,4 @@ PR = "r1" PV = "1.0+git${SRCPV}" SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "32ffb03dc854ba61747849246805ea7597e97130" +SRCREV = "4b646236df12b52205d2098ef985280190b358a7" -- cgit v1.2.3