diff options
1726 files changed, 22014 insertions, 19085 deletions
diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index ec6e27f17..2649c2e91 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -25,3 +25,4 @@ 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" +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "mtjade-led-manager-config-native" diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0004-aspeed-add-gpio-support.patch b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0004-aspeed-add-gpio-support.patch new file mode 100644 index 000000000..2f8ff45bd --- /dev/null +++ b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0004-aspeed-add-gpio-support.patch @@ -0,0 +1,518 @@ +From 7372552ae247e4870fb6dc80df7610f86d736a57 Mon Sep 17 00:00:00 2001 +From: Chanh Nguyen <chanh@os.amperecomputing.com> +Date: Tue, 9 Mar 2021 11:04:56 +0700 +Subject: [PATCH] aspeed: add gpio support + +This is an initial support for the parallel GPIO pins directly connected +to the AHB on the Aspeed 2400/2500. + +This brings the functions and a shell command to manipulate the GPIO +state. The GPIO value reading and writing work in non interrupt mode +only. + +This is back ported from the patch file from +meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0003-aspeed-add-gpio-support.patch +to support GPIO configuration + +Signed-off-by: Alexander Filippov <a.filippov@yadro.com> +Signed-off-by: Thang Q. Nguyen <thangqn@amperecomputing.com> +Signed-off-by: Chanh Nguyen <chanh@os.amperecomputing.com> +--- + arch/arm/include/asm/arch-aspeed/gpio.h | 65 ++++ + drivers/gpio/Makefile | 2 + + drivers/gpio/aspeed_gpio.c | 386 ++++++++++++++++++++++++ + include/configs/ast-g5-phy.h | 1 + + 4 files changed, 454 insertions(+) + create mode 100644 arch/arm/include/asm/arch-aspeed/gpio.h + create mode 100644 drivers/gpio/aspeed_gpio.c + +diff --git a/arch/arm/include/asm/arch-aspeed/gpio.h b/arch/arm/include/asm/arch-aspeed/gpio.h +new file mode 100644 +index 0000000000..c63987e917 +--- /dev/null ++++ b/arch/arm/include/asm/arch-aspeed/gpio.h +@@ -0,0 +1,65 @@ ++/* ++ * SPDX-License-Identifier: GPL-2.0+ ++ * Copyright (C) 2020 YADRO. ++ */ ++#ifndef _ASPEED_GPIO_H ++#define _ASPEED_GPIO_H ++ ++#define ASPEED_GPIO_PORT_A 0 ++#define ASPEED_GPIO_PORT_B 1 ++#define ASPEED_GPIO_PORT_C 2 ++#define ASPEED_GPIO_PORT_D 3 ++#define ASPEED_GPIO_PORT_E 4 ++#define ASPEED_GPIO_PORT_F 5 ++#define ASPEED_GPIO_PORT_G 6 ++#define ASPEED_GPIO_PORT_H 7 ++#define ASPEED_GPIO_PORT_I 8 ++#define ASPEED_GPIO_PORT_J 9 ++#define ASPEED_GPIO_PORT_K 10 ++#define ASPEED_GPIO_PORT_L 11 ++#define ASPEED_GPIO_PORT_M 12 ++#define ASPEED_GPIO_PORT_N 13 ++#define ASPEED_GPIO_PORT_O 14 ++#define ASPEED_GPIO_PORT_P 15 ++#define ASPEED_GPIO_PORT_Q 16 ++#define ASPEED_GPIO_PORT_R 17 ++#define ASPEED_GPIO_PORT_S 18 ++#define ASPEED_GPIO_PORT_T 19 ++#define ASPEED_GPIO_PORT_U 20 ++#define ASPEED_GPIO_PORT_V 21 ++#define ASPEED_GPIO_PORT_W 22 ++#define ASPEED_GPIO_PORT_X 23 ++#define ASPEED_GPIO_PORT_Y 24 ++#define ASPEED_GPIO_PORT_Z 25 ++#define ASPEED_GPIO_PORT_AA 26 ++#define ASPEED_GPIO_PORT_AB 27 ++#define ASPEED_GPIO_PORT_AC 28 ++ ++#define ASPEED_GPIO_PORT_SHIFT 3 ++#define ASPEED_GPIO_PIN_MASK 0x7 ++#define ASPEED_GPIO(port, pin) \ ++ ((ASPEED_GPIO_PORT_##port << ASPEED_GPIO_PORT_SHIFT) | \ ++ (pin & ASPEED_GPIO_PIN_MASK)) ++ ++/* Direction values */ ++#define ASPEED_GPIO_INPUT 0 ++#define ASPEED_GPIO_OUTPUT 1 ++ ++/* Trigger values */ ++#define ASPEED_GPIO_FALLING_EDGE 0 ++#define ASPEED_GPIO_RISING_EDGE 1 ++#define ASPEED_GPIO_LOW_LEVEL 2 ++#define ASPEED_GPIO_HIGH_LEVEL 3 ++#define ASPEED_GPIO_DUAL_EDGE 4 ++ ++/* Debounce values */ ++#define ASPEED_GPIO_DEBOUNCE_NONE 0 ++#define ASPEED_GPIO_DEBOUNCE_1 1 ++#define ASPEED_GPIO_DEBOUNCE_2 2 ++#define ASPEED_GPIO_DEBOUNCE_3 3 ++ ++#define gpio_status() gpio_info() ++ ++extern void gpio_info(void); ++ ++#endif /* #ifndef _ASPEED_GPIO_H */ +diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile +index 792d19186a..5f043e07ce 100644 +--- a/drivers/gpio/Makefile ++++ b/drivers/gpio/Makefile +@@ -14,6 +14,8 @@ obj-$(CONFIG_DM_GPIO) += gpio-uclass.o + obj-$(CONFIG_DM_PCA953X) += pca953x_gpio.o + obj-$(CONFIG_DM_74X164) += 74x164_gpio.o + ++obj-$(CONFIG_ARCH_AST2400) += aspeed_gpio.o ++obj-$(CONFIG_ARCH_AST2500) += aspeed_gpio.o + obj-$(CONFIG_AT91_GPIO) += at91_gpio.o + obj-$(CONFIG_ATMEL_PIO4) += atmel_pio4.o + obj-$(CONFIG_INTEL_ICH6_GPIO) += intel_ich6_gpio.o +diff --git a/drivers/gpio/aspeed_gpio.c b/drivers/gpio/aspeed_gpio.c +new file mode 100644 +index 0000000000..dc07f5a520 +--- /dev/null ++++ b/drivers/gpio/aspeed_gpio.c +@@ -0,0 +1,386 @@ ++/* ++ * SPDX-License-Identifier: GPL-2.0+ ++ * Copyright (C) 2020 YADRO. ++ */ ++ ++#include <common.h> ++ ++#include <asm/arch/gpio.h> ++#include <asm/arch/platform.h> ++#include <asm/io.h> ++#include <linux/ctype.h> ++ ++typedef struct _ast_gpio_regs ++{ ++ uint32_t base; /* data and direction registers */ ++ uint32_t intcfg; /* interrupt config */ ++ uint32_t debounce; /* debounce config */ ++ uint32_t cmdsrc; /* command source config */ ++ uint32_t data; /* data read register */ ++} ast_gpio_regs_t; ++ ++static ast_gpio_regs_t ast_gpio_regs[] = { ++ /* A/B/C/D */ ++ {AST_GPIO_BASE + 0x0000, AST_GPIO_BASE + 0x0008, AST_GPIO_BASE + 0x0040, ++ AST_GPIO_BASE + 0x0060, AST_GPIO_BASE + 0x00C0}, ++ /* E/F/G/H */ ++ {AST_GPIO_BASE + 0x0020, AST_GPIO_BASE + 0x0028, AST_GPIO_BASE + 0x0048, ++ AST_GPIO_BASE + 0x0068, AST_GPIO_BASE + 0x00C4}, ++ /* I/J/K/L */ ++ {AST_GPIO_BASE + 0x0070, AST_GPIO_BASE + 0x0098, AST_GPIO_BASE + 0x00B0, ++ AST_GPIO_BASE + 0x0090, AST_GPIO_BASE + 0x00C8}, ++ /* M/N/O/P */ ++ {AST_GPIO_BASE + 0x0078, AST_GPIO_BASE + 0x00E8, AST_GPIO_BASE + 0x0100, ++ AST_GPIO_BASE + 0x00E0, AST_GPIO_BASE + 0x00CC}, ++ /* Q/R/S/T */ ++ {AST_GPIO_BASE + 0x0080, AST_GPIO_BASE + 0x0118, AST_GPIO_BASE + 0x0130, ++ AST_GPIO_BASE + 0x0110, AST_GPIO_BASE + 0x00D0}, ++ /* U/V/W/X */ ++ {AST_GPIO_BASE + 0x0088, AST_GPIO_BASE + 0x0148, AST_GPIO_BASE + 0x0160, ++ AST_GPIO_BASE + 0x0140, AST_GPIO_BASE + 0x00D4}, ++ /* Y/Z/AA/AB */ ++ {AST_GPIO_BASE + 0x01E0, AST_GPIO_BASE + 0x0178, AST_GPIO_BASE + 0x0190, ++ AST_GPIO_BASE + 0x0170, AST_GPIO_BASE + 0x00D8}, ++ /* AC */ ++ {AST_GPIO_BASE + 0x01E8, AST_GPIO_BASE + 0x01A8, AST_GPIO_BASE + 0x01C0, ++ AST_GPIO_BASE + 0x01A0, AST_GPIO_BASE + 0x00DC}, ++}; ++ ++#define AST_GPIO_PINS_PER_PORT 8 ++#define AST_GPIO_PORTS_PER_REGISTER 4 ++ ++#define AST_GPIO_PORT(gpio) (gpio >> ASPEED_GPIO_PORT_SHIFT) ++#define AST_GPIO_PIN(gpio) (gpio & ASPEED_GPIO_PIN_MASK) ++#define AST_GPIO_SHIFT(gpio) \ ++ ((AST_GPIO_PORT(gpio) % AST_GPIO_PORTS_PER_REGISTER) * \ ++ AST_GPIO_PINS_PER_PORT + \ ++ AST_GPIO_PIN(gpio)) ++ ++#define AST_GPIO_REG_INDEX(gpio) \ ++ (AST_GPIO_PORT(gpio) / AST_GPIO_PORTS_PER_REGISTER) ++ ++/** ++ * @return Pointer to corresponding item from ast_gpio_regs table. ++ */ ++#define AST_GPIO_REGS(gpio) \ ++ ((AST_GPIO_REG_INDEX(gpio) < ARRAY_SIZE(ast_gpio_regs)) \ ++ ? (ast_gpio_regs + AST_GPIO_REG_INDEX(gpio)) \ ++ : NULL) ++ ++/** ++ * @brief Set a corresponding bit in specified register. ++ * ++ * @param val - Required bit value ++ * @param base - Register address ++ * @param shift - Bit index. ++ */ ++#define AST_GPIO_WRITE(val, base, shift) \ ++ writel(((val) ? readl(base) | (1 << (shift)) \ ++ : readl(base) & ~(1 << (shift))), \ ++ base) ++ ++/** ++ * @brief Get value of corresponging bit from specified register. ++ * ++ * @param base - Register address ++ * @param shift - Bit index ++ * ++ * @return Bit value ++ */ ++#define AST_GPIO_READ(base, shift) ((readl(base) >> (shift)) & 1) ++ ++#define IS_VALID_GPIO(gpio) \ ++ ((gpio) >= ASPEED_GPIO(A, 0) && (gpio) <= ASPEED_GPIO(AC, 7)) ++ ++#define AST_GPIO_DIRECTION 0x04 ++#define AST_GPIO_INT_SENS0 0x04 ++#define AST_GPIO_INT_SENS1 0x08 ++#define AST_GPIO_INT_SENS2 0x0C ++#define AST_GPIO_INT_STATUS 0x10 ++#define AST_GPIO_DEBOUNCE0 0x00 ++#define AST_GPIO_DEBOUNCE1 0x04 ++#define AST_GPIO_CMD_SRC0 0x00 ++#define AST_GPIO_CMD_SRC1 0x04 ++ ++/** ++ * @brief Set a GPIO direction ++ * ++ * @param gpio GPIO line ++ * @param direction GPIO direction (0 for input or 1 for output) ++ * ++ * @return 0 if ok, -1 on error ++ */ ++static int ast_gpio_set_direction(unsigned gpio, unsigned direction) ++{ ++ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); ++ if (!regs) ++ { ++ printf("%s: Invalid GPIO!\n", __func__); ++ return -1; ++ } ++ ++ AST_GPIO_WRITE(direction, regs->base + AST_GPIO_DIRECTION, ++ AST_GPIO_SHIFT(gpio)); ++ return 0; ++} ++ ++/** ++ * The 6 following functions are generic u-boot gpio implementation. ++ * They are declared in `include/asm-generic/gpio.h` ++ */ ++ ++int gpio_request(unsigned gpio, const char *label) ++{ ++ return (IS_VALID_GPIO(gpio) ? 0 : -1); ++} ++ ++int gpio_free(unsigned gpio) ++{ ++ return (IS_VALID_GPIO(gpio) ? 0 : -1); ++} ++ ++int gpio_get_value(unsigned gpio) ++{ ++ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); ++ if (!regs) ++ { ++ printf("%s: Invalid GPIO!\n", __func__); ++ return -1; ++ } ++ ++ return AST_GPIO_READ(regs->base, AST_GPIO_SHIFT(gpio)); ++} ++ ++int gpio_set_value(unsigned gpio, int value) ++{ ++ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); ++ if (!regs) ++ { ++ printf("%s: Invalid GPIO!\n", __func__); ++ return -1; ++ } ++ ++ AST_GPIO_WRITE(value, regs->base, AST_GPIO_SHIFT(gpio)); ++ return 0; ++} ++ ++int gpio_direction_input(unsigned gpio) ++{ ++ return ast_gpio_set_direction(gpio, ASPEED_GPIO_INPUT); ++} ++ ++int gpio_direction_output(unsigned gpio, int value) ++{ ++ int rc = ast_gpio_set_direction(gpio, ASPEED_GPIO_OUTPUT); ++ return (rc == 0 ? gpio_set_value(gpio, value) : rc); ++} ++ ++/** ++ * @brief Convert a string to GPIO line. Used by `do_gpio()` from `cmd/gpio.c` ++ * ++ * @param str a GPIO name or line number ++ * ++ * @return GPIO line if ok, -1 on error ++ */ ++int name_to_gpio(const char *str) ++{ ++ int gpio = -1; ++ ++ if (str) ++ { ++ if (isalpha(*str)) ++ { ++ gpio = (toupper(*str) - 'A') << ASPEED_GPIO_PORT_SHIFT; ++ ++ if (toupper(*str) == 'A' && toupper(*(str + 1)) >= 'A' && ++ toupper(*(str + 1)) <= 'C') ++ { ++ str++; ++ gpio = (ASPEED_GPIO_PORT_AA + toupper(*str) - 'A') ++ << ASPEED_GPIO_PORT_SHIFT; ++ } ++ ++ str++; ++ if (*str >= '0' && *str <= '7' && !*(str + 1)) ++ { ++ gpio += *str - '0'; ++ } ++ else ++ { ++ gpio = -1; ++ } ++ } ++ else if (isdigit(*str)) ++ { ++ gpio = simple_strtoul(str, NULL, 0); ++ } ++ } ++ ++ return gpio; ++} ++ ++/** ++ * @return A GPIO direction in human readable format. ++ */ ++static const char *ast_gpio_direction(unsigned gpio) ++{ ++ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); ++ if (regs) ++ { ++ int direction = AST_GPIO_READ(regs->base + AST_GPIO_DIRECTION, ++ AST_GPIO_SHIFT(gpio)); ++ switch (direction) ++ { ++ case ASPEED_GPIO_INPUT: ++ return "input"; ++ case ASPEED_GPIO_OUTPUT: ++ return "output"; ++ default: ++ break; ++ } ++ } ++ return "error"; ++} ++ ++/** ++ * @return An interrupt trigger settings in human readable format. ++ */ ++static const char *ast_gpio_trigger(unsigned gpio) ++{ ++ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); ++ if (regs) ++ { ++ unsigned shift = AST_GPIO_SHIFT(gpio); ++ unsigned trigger = ++ (AST_GPIO_READ(regs->intcfg + AST_GPIO_INT_SENS0, shift) << 0) | ++ (AST_GPIO_READ(regs->intcfg + AST_GPIO_INT_SENS1, shift) << 1) | ++ (AST_GPIO_READ(regs->intcfg + AST_GPIO_INT_SENS2, shift) << 2); ++ ++ switch (trigger) ++ { ++ case ASPEED_GPIO_FALLING_EDGE: ++ return "fall"; ++ case ASPEED_GPIO_RISING_EDGE: ++ return "rise"; ++ case ASPEED_GPIO_LOW_LEVEL: ++ return "low "; ++ case ASPEED_GPIO_HIGH_LEVEL: ++ return "high"; ++ default: ++ return "both"; ++ } ++ } ++ return "error"; ++} ++ ++/** ++ * @return An interrupt status in human readable format. ++ */ ++static const char *ast_gpio_int_status(unsigned gpio) ++{ ++ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); ++ if (regs) ++ { ++ unsigned shift = AST_GPIO_SHIFT(gpio); ++ if (AST_GPIO_READ(regs->intcfg, shift)) ++ { ++ return AST_GPIO_READ(regs->intcfg + AST_GPIO_INT_STATUS, shift) ++ ? "pending" ++ : "cleaned"; ++ } ++ return "disabled"; ++ } ++ ++ return "error"; ++} ++ ++/** ++ * @return A debounce value in human readable format. ++ */ ++static const char *ast_gpio_debounce(unsigned gpio) ++{ ++ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); ++ if (regs) ++ { ++ unsigned shift = AST_GPIO_SHIFT(gpio); ++ unsigned debounce = ++ (AST_GPIO_READ(regs->debounce + AST_GPIO_DEBOUNCE0, shift) << 0) | ++ (AST_GPIO_READ(regs->debounce + AST_GPIO_DEBOUNCE1, shift) << 1); ++ switch (debounce) ++ { ++ case ASPEED_GPIO_DEBOUNCE_NONE: ++ return "none"; ++ case ASPEED_GPIO_DEBOUNCE_1: ++ return "timer1"; ++ case ASPEED_GPIO_DEBOUNCE_2: ++ return "timer2"; ++ case ASPEED_GPIO_DEBOUNCE_3: ++ return "timer3"; ++ default: ++ break; ++ } ++ } ++ ++ return "error"; ++} ++ ++/** ++ * @return A command source value in human readable format. ++ */ ++static const char *ast_gpio_command_source(unsigned gpio) ++{ ++ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); ++ if (regs) ++ { ++ /* Used one bit per gpio port */ ++ unsigned shift = AST_GPIO_SHIFT(gpio) - AST_GPIO_PIN(gpio); ++ unsigned cmdsrc = ++ (AST_GPIO_READ(regs->cmdsrc + AST_GPIO_CMD_SRC0, shift) << 0) | ++ (AST_GPIO_READ(regs->cmdsrc + AST_GPIO_CMD_SRC1, shift) << 1); ++ ++ switch (cmdsrc) ++ { ++ /* The single place where these values are used is here. */ ++ case 0x0: ++ return "ARM"; ++ case 0x1: ++ return "LPC"; ++ case 0x2: ++ return "CoCPU"; ++ default: ++ return "Unknown"; ++ } ++ } ++ ++ return "error"; ++} ++ ++/** ++ * @brief Show all GPIO pins statuses. Used by `do_gpio()` in `cmd/gpio.c` ++ */ ++void gpio_info(void) ++{ ++ unsigned first = ASPEED_GPIO(A, 0); ++ unsigned last = ASPEED_GPIO(AC, 7); ++ for (unsigned gpio = first; gpio <= last; gpio++) ++ { ++ unsigned port = AST_GPIO_PORT(gpio); ++ unsigned pin = AST_GPIO_PIN(gpio); ++ unsigned shift = AST_GPIO_SHIFT(gpio); ++ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); ++ if (!regs) ++ { ++ printf("gpio %u is invalid!\n", gpio); ++ continue; ++ } ++ ++ printf("gpio %c%c%c line %3d: %s, int: %s, %s, deb: %s, src: %s, " ++ "val: %d/%d\n", ++ (port >= ASPEED_GPIO_PORT_AA ? 'A' : ' '), ++ ('A' + port % ASPEED_GPIO_PORT_AA), ('0' + pin), gpio, ++ ast_gpio_direction(gpio), ast_gpio_trigger(gpio), ++ ast_gpio_int_status(gpio), ast_gpio_debounce(gpio), ++ ast_gpio_command_source(gpio), gpio_get_value(gpio), ++ AST_GPIO_READ(regs->data, shift)); ++ } ++} +diff --git a/include/configs/ast-g5-phy.h b/include/configs/ast-g5-phy.h +index 5443a26cab..ea7c66716a 100644 +--- a/include/configs/ast-g5-phy.h ++++ b/include/configs/ast-g5-phy.h +@@ -32,5 +32,6 @@ + + /* Call board_late_init */ + #define CONFIG_BOARD_LATE_INIT 1 ++#define CONFIG_CMD_GPIO 1 /* Enable gpio command in shell */ + + #endif /* __AST_G5_PHY_CONFIG_H */ +-- +2.17.1 + diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0005-aspeed-Enable-SPI-master-mode.patch b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0005-aspeed-Enable-SPI-master-mode.patch new file mode 100644 index 000000000..0dd736fba --- /dev/null +++ b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0005-aspeed-Enable-SPI-master-mode.patch @@ -0,0 +1,33 @@ +From 0bf84de2a9db749bd61064cd47b96ef457725f54 Mon Sep 17 00:00:00 2001 +From: Chanh Nguyen <chanh@os.amperecomputing.com> +Date: Wed, 10 Mar 2021 00:02:17 +0700 +Subject: [PATCH] aspeed: Enable SPI master mode + +Currently, some systems design the strap pin, +which was shared pin with another function. +That makes the board strapping does not reflect the intended use of the system. + +This patch will enable SPI master mode by default. + +Signed-off-by: Chanh Nguyen <chanh@os.amperecomputing.com> +--- + board/aspeed/ast-g5/ast-g5.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c +index 9e27bce0f5..ed83d65136 100644 +--- a/board/aspeed/ast-g5/ast-g5.c ++++ b/board/aspeed/ast-g5/ast-g5.c +@@ -125,6 +125,9 @@ int board_late_init(void) + update_bootargs_cmd("resetreason", value); + } + ++ /* enable SPI master */ ++ ast_scu_spi_master(1); ++ + return 0; + } + #endif +-- +2.17.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 77a58f523..0febf924d 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 @@ -4,4 +4,6 @@ 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 \ + file://0004-aspeed-add-gpio-support.patch \ + file://0005-aspeed-Enable-SPI-master-mode.patch \ " diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb new file mode 100644 index 000000000..e068b4d24 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb @@ -0,0 +1,33 @@ +SUMMARY = "MTJade fault-led application" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit obmc-phosphor-systemd + +DEPENDS += "virtual/obmc-gpio-monitor" +RDEPENDS_${PN} += "virtual/obmc-gpio-monitor" + +S = "${WORKDIR}" +SRC_URI += "file://toggle_fault_led.sh" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/toggle_fault_led.sh \ + ${D}${bindir}/toggle_fault_led.sh +} + +OBMC_FAULT_MONITOR_INSTANCES = "s0_fault_alert s1_fault_alert" + +SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/gpio/s0_fault_alert \ + obmc/gpio/s1_fault_alert \ + " + +TMPL = "phosphor-gpio-monitor@.service" +INSTFMT = "phosphor-gpio-monitor@{0}.service" +TGT = "multi-user.target" +FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" + +SYSTEMD_SERVICE_${PN} += "ampere_fault_led.service" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAULT_MONITOR_INSTANCES')}" + diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/ampere_fault_led.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/ampere_fault_led.service new file mode 100644 index 000000000..05c63d012 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/ampere_fault_led.service @@ -0,0 +1,10 @@ +[Unit] +Description=Ampere Computing LLC fault event condition service +Wants=mapper-wait@-xyz-openbmc_project-led-groups.service +After=mapper-wait@-xyz-openbmc_project-led-groups.service +StartLimitIntervalSec=0 + +[Service] +Type=oneshot +ExecStart=/usr/bin/env toggle_fault_led.sh +SyslogIdentifier=fault-led diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/obmc/gpio/s0_fault_alert b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/obmc/gpio/s0_fault_alert new file mode 100644 index 000000000..dd048efbd --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/obmc/gpio/s0_fault_alert @@ -0,0 +1,5 @@ +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=73 +POLARITY=1 +TARGET=ampere_fault_led.service +EXTRA_ARGS=--continue diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/obmc/gpio/s1_fault_alert b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/obmc/gpio/s1_fault_alert new file mode 100644 index 000000000..1963ce059 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/obmc/gpio/s1_fault_alert @@ -0,0 +1,5 @@ +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=201 +POLARITY=1 +TARGET=ampere_fault_led.service +EXTRA_ARGS=--continue diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/toggle_fault_led.sh b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/toggle_fault_led.sh new file mode 100644 index 000000000..8d3d54374 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/toggle_fault_led.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# +# 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. + +# Toggle the state of identify LED Group + +SERVICE="xyz.openbmc_project.LED.GroupManager" +INTERFACE="xyz.openbmc_project.Led.Group" +PROPERTY="Asserted" + +# Get current state +object=$(busctl tree $SERVICE --list | grep system_fault) +state=$(busctl get-property $SERVICE $object $INTERFACE $PROPERTY \ + | awk '{print $NF;}') + +if [ "$state" == "false" ]; then + target='true' +else + target='false' +fi + +# Set target state +busctl set-property $SERVICE $object $INTERFACE $PROPERTY b $target diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb new file mode 100644 index 000000000..c19cdee18 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb @@ -0,0 +1,29 @@ +SUMMARY = "MTJade ID Button pressed application" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit obmc-phosphor-systemd + +DEPENDS += "virtual/obmc-gpio-monitor" +RDEPENDS_${PN} += "virtual/obmc-gpio-monitor" + +SRC_URI += "file://toggle_identify_led.sh" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/toggle_identify_led.sh \ + ${D}${bindir}/toggle_identify_led.sh +} + +SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" + +ID_BUTTON_SERVICE = "id_button" + +TMPL = "phosphor-gpio-monitor@.service" +INSTFMT = "phosphor-gpio-monitor@{0}.service" +TGT = "multi-user.target" +FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" + +SYSTEMD_SERVICE_${PN} += "id-button-pressed.service" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/id-button-pressed.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/id-button-pressed.service new file mode 100644 index 000000000..0a97ed70c --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/id-button-pressed.service @@ -0,0 +1,10 @@ +[Unit] +Description=ID Button Pressed Service +Wants=mapper-wait@-xyz-openbmc_project-led-groups.service +After=mapper-wait@-xyz-openbmc_project-led-groups.service +StartLimitIntervalSec=0 + +[Service] +Type=oneshot +ExecStart=/usr/bin/toggle_identify_led.sh +SyslogIdentifier=id-button diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/obmc/gpio/id_button b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/obmc/gpio/id_button new file mode 100644 index 000000000..70e2b585b --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/obmc/gpio/id_button @@ -0,0 +1,5 @@ +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=133 +POLARITY=1 +TARGET=id-button-pressed.service +EXTRA_ARGS=--continue diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/toggle_identify_led.sh b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/toggle_identify_led.sh new file mode 100755 index 000000000..d62c84ae1 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/toggle_identify_led.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# +# 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. + +# Toggle the state of identify LED Group + +SERVICE="xyz.openbmc_project.LED.GroupManager" +INTERFACE="xyz.openbmc_project.Led.Group" +PROPERTY="Asserted" + +# Get enclosure_identify state +identify_object=$(busctl tree $SERVICE --list | grep -m 1 identify) +identify_state=$(busctl get-property $SERVICE $identify_object $INTERFACE $PROPERTY \ + | awk '{print $NF;}') + +# Get enclosure_identify_blink state +identify_blink_object=$(busctl tree $SERVICE --list | grep identify_blink) +identify_blink_state=$(busctl get-property $SERVICE $identify_blink_object $INTERFACE $PROPERTY \ + | awk '{print $NF;}') + +# Set state +if [[ "$identify_state" == "false" && "$identify_blink_state" == "false" ]]; then + # Turn on the UID LED + busctl set-property $SERVICE $identify_object $INTERFACE $PROPERTY b true +elif [[ "$identify_state" == "false" && "$identify_blink_state" == "true" ]]; then + # Turn off the UID LED when LED is blinking state + busctl set-property $SERVICE $identify_blink_object $INTERFACE $PROPERTY b false +elif [[ "$identify_state" == "true" && "$identify_blink_state" == "false" ]]; then + # Turn off the UID LED + busctl set-property $SERVICE $identify_object $INTERFACE $PROPERTY b false +else + echo "Invalid case! When identify_blink_state is true, the identify_state will set to false" +fi diff --git a/meta-ampere/meta-jade/recipes-phosphor/leds/mtjade-led-manager-config-native.bb b/meta-ampere/meta-jade/recipes-phosphor/leds/mtjade-led-manager-config-native.bb new file mode 100644 index 000000000..694ca237a --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/leds/mtjade-led-manager-config-native.bb @@ -0,0 +1,19 @@ +SUMMARY = "Phosphor LED Group Management for Mt. Jade" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit native + +PROVIDES += "virtual/phosphor-led-manager-config-native" + +SRC_URI += "file://led.yaml" +S = "${WORKDIR}" + +# Overwrite the example led layout yaml file prior +# to building the phosphor-led-manager package +do_install() { + SRC=${S} + DEST=${D}${datadir}/phosphor-led-manager + install -D ${SRC}/led.yaml ${DEST}/led.yaml +} diff --git a/meta-ampere/meta-jade/recipes-phosphor/leds/mtjade-led-manager-config/led.yaml b/meta-ampere/meta-jade/recipes-phosphor/leds/mtjade-led-manager-config/led.yaml new file mode 100644 index 000000000..3e321ed5c --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/leds/mtjade-led-manager-config/led.yaml @@ -0,0 +1,32 @@ +bmc_booted: + power: + Action: 'Blink' + DutyOn: 50 + Period: 1000 + Priority: 'On' + +power_on: + power: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' + +systemFault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' + +enclosure_identify: + identify: + Action: 'On' + DutyOn: 50 + Period: 1000 + +enclosure_identify_blink: + identify: + Action: 'Blink' + DutyOn: 50 + Period: 1000 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 index 07bff9390..980d9261d 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1 +1,2 @@ RDEPENDS_${PN}-extras_append_mtjade = " phosphor-webui phosphor-image-signing" +RDEPENDS_${PN}-inventory_append_mtjade = " fault-monitor id-button" diff --git a/meta-aspeed/conf/machine/evb-ast2600.conf b/meta-aspeed/conf/machine/evb-ast2600.conf index 9fb38e090..e011045d2 100644 --- a/meta-aspeed/conf/machine/evb-ast2600.conf +++ b/meta-aspeed/conf/machine/evb-ast2600.conf @@ -5,3 +5,6 @@ UBOOT_DEVICETREE = "ast2600a1-evb" require conf/machine/include/ast2600.inc SERIAL_CONSOLES = "115200;ttyS4" + +# AST2600 EVB has 64MB SPI flash +FLASH_SIZE = "65536" diff --git a/meta-aspeed/recipes-aspeed/python/socsec_git.bb b/meta-aspeed/recipes-aspeed/python/socsec_git.bb new file mode 100644 index 000000000..3de811a51 --- /dev/null +++ b/meta-aspeed/recipes-aspeed/python/socsec_git.bb @@ -0,0 +1,23 @@ +SUMMARY = "Secure-boot utilities for ASPEED BMC SoCs" +HOMEPAGE = "https://github.com/AspeedTech-BMC/socsec/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d50b901333b4eedfee074ebcd6a6d611" + +SRC_URI = "git://github.com/AspeedTech-BMC/socsec/;protocol=https;branch=develop" + +PV = "1.7+git${SRCPV}" +SRCREV = "54cdd3b26262e66d2020a04cba55bc8b02090f1a" + +S = "${WORKDIR}/git" + +inherit python3native setuptools3 + +RDEPENDS_${PN} += "python3-bitarray" +RDEPENDS_${PN} += "python3-core" +RDEPENDS_${PN} += "python3-hexdump" +RDEPENDS_${PN} += "python3-jsonschema" +RDEPENDS_${PN} += "python3-jstyleson" +RDEPENDS_${PN} += "python3-pycryptodome" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index ed4a10f02..45f09d7a3 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.10" -LINUX_VERSION ?= "5.10.14" +LINUX_VERSION ?= "5.10.23" -SRCREV="56621ca6dcf8c20fc7bc72771df00cd3d59c153b" +SRCREV="6687842ee68152c5cc7b7f8ac771b25eaece056a" require linux-aspeed.inc diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend new file mode 100644 index 000000000..0090254ac --- /dev/null +++ b/meta-bytedance/meta-g220a/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend @@ -0,0 +1 @@ +DEFAULT_INSTANCE = "ttyS2" diff --git a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/machine/evb-zx3-pm3.conf b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/machine/evb-zx3-pm3.conf index 0fcb9711d..62716cd42 100644 --- a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/machine/evb-zx3-pm3.conf +++ b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/machine/evb-zx3-pm3.conf @@ -24,8 +24,6 @@ KERNEL_DEVICETREE = "zynq-zc702.dtb" IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${KERNEL_IMAGETYPE}-zynq-zc702.dtb" -KERNEL_FEATURES_remove = "phosphor-gpio-keys" - # Overwrite flash offsets FLASH_UBOOT_OFFSET = "0" FLASH_KERNEL_OFFSET = "6144" 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 03db6c329..6cc2450c5 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 = "5f8e343516c0db488e977084ca7810a6c9fafae8" +SRCREV = "c723d6a5917cde0808713bc57934eb503fa20b8a" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" @@ -17,6 +17,8 @@ inherit cmake obmc-phosphor-ipmiprovider-symlink EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1" EXTRA_OECMAKE_append_yosemitev2 = " -DBIC=1" +EXTRA_OECMAKE_append = " -DHOST_INSTANCES='${OBMC_HOST_INSTANCES}'" + LIBRARY_NAMES = "libzfboemcmds.so" HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" diff --git a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager/yosemitev2/settings-manager.override.yml b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager/yosemitev2/settings-manager.override.yml new file mode 100644 index 000000000..3fdc847c7 --- /dev/null +++ b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager/yosemitev2/settings-manager.override.yml @@ -0,0 +1,39 @@ +/xyz/openbmc_project/control/host1/boot: + - Interface: xyz.openbmc_project.Control.Boot.Source + Properties: + BootSource: + Default: Source::Sources::Default + - Interface: xyz.openbmc_project.Control.Boot.Mode + Properties: + BootMode: + Default: Mode::Modes::Regular + +/xyz/openbmc_project/control/host2/boot: + - Interface: xyz.openbmc_project.Control.Boot.Source + Properties: + BootSource: + Default: Source::Sources::Default + - Interface: xyz.openbmc_project.Control.Boot.Mode + Properties: + BootMode: + Default: Mode::Modes::Regular + +/xyz/openbmc_project/control/host3/boot: + - Interface: xyz.openbmc_project.Control.Boot.Source + Properties: + BootSource: + Default: Source::Sources::Default + - Interface: xyz.openbmc_project.Control.Boot.Mode + Properties: + BootMode: + Default: Mode::Modes::Regular + +/xyz/openbmc_project/control/host4/boot: + - Interface: xyz.openbmc_project.Control.Boot.Source + Properties: + BootSource: + Default: Source::Sources::Default + - Interface: xyz.openbmc_project.Control.Boot.Mode + Properties: + BootMode: + Default: Mode::Modes::Regular diff --git a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend new file mode 100644 index 000000000..2b4c4c0cb --- /dev/null +++ b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI_append_yosemitev2 = " file://settings-manager.override.yml" diff --git a/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf b/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf deleted file mode 100644 index 047091353..000000000 --- a/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf +++ /dev/null @@ -1,4 +0,0 @@ -require conf/distro/openbmc-phosphor.conf - -DISTRO = "openbmc-kudo" - diff --git a/meta-fii/meta-kudo/conf/local.conf.sample b/meta-fii/meta-kudo/conf/local.conf.sample index 8f6659537..cc5544d95 100644 --- a/meta-fii/meta-kudo/conf/local.conf.sample +++ b/meta-fii/meta-kudo/conf/local.conf.sample @@ -1,5 +1,5 @@ MACHINE ??= "kudo" -DISTRO ?= "openbmc-kudo" +DISTRO ?= "openbmc-phosphor" PACKAGE_CLASSES ?= "package_rpm" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" diff --git a/meta-google/conf/layer.conf b/meta-google/conf/layer.conf index a8fda28ea..24a84800c 100644 --- a/meta-google/conf/layer.conf +++ b/meta-google/conf/layer.conf @@ -4,6 +4,13 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" +BBFILES_DYNAMIC += " \ + aspeed-layer:${LAYERDIR}/dynamic-layers/aspeed-layer/recipes-*/*/*.bb \ + aspeed-layer:${LAYERDIR}/dynamic-layers/aspeed-layer/recipes-*/*/*.bbappend \ + nuvoton-layer:${LAYERDIR}/dynamic-layers/nuvoton-layer/recipes-*/*/*.bb \ + nuvoton-layer:${LAYERDIR}/dynamic-layers/nuvoton-layer/recipes-*/*/*.bbappend \ + " + BBFILE_COLLECTIONS += "google-layer" BBFILE_PATTERN_google-layer := "^${LAYERDIR}/" LAYERVERSION_google-layer = "1" diff --git a/meta-google/dynamic-layers/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-google/dynamic-layers/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..1f704ca9b --- /dev/null +++ b/meta-google/dynamic-layers/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/../../../../recipes-kernel/linux/files:" +SRC_URI_append_gbmc = " file://gbmc.cfg" +SRC_URI_append_gbmc_dev = " file://gbmc-dev.cfg" +SRC_URI_append_gbmc_prod = " file://gbmc-prod.cfg" diff --git a/meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps-native_%.bbappend b/meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps-native_%.bbappend new file mode 100644 index 000000000..890ebbb64 --- /dev/null +++ b/meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps-native_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend_gbmc_hoth := "${THISDIR}/${BPN}:" + +SRC_URI_append_gbmc_hoth = " file://0001-Set-FIU0_DRD_CFG-and-FIU_Clk_divider-for-gbmc-hoth.patch" diff --git a/meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps/0001-Set-FIU0_DRD_CFG-and-FIU_Clk_divider-for-gbmc-hoth.patch b/meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps/0001-Set-FIU0_DRD_CFG-and-FIU_Clk_divider-for-gbmc-hoth.patch new file mode 100644 index 000000000..9352bb4ee --- /dev/null +++ b/meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps/0001-Set-FIU0_DRD_CFG-and-FIU_Clk_divider-for-gbmc-hoth.patch @@ -0,0 +1,52 @@ +From 98c236c535e6cd8cce3d08bb424f5f0d8a99617d Mon Sep 17 00:00:00 2001 +From: Benjamin Fair <benjaminfair@google.com> +Date: Wed, 20 Nov 2019 14:20:38 -0800 +Subject: [PATCH] Set FIU0_DRD_CFG and FIU_Clk_divider for gbmc hoth + +This is to set the SPI frequency to 20MHz + +Signed-off-by: Benjamin Fair <benjaminfair@google.com> +Signed-off-by: Brandon Kim <brandonkim@google.com> +--- + ImageGeneration/references/BootBlockAndHeader_EB.xml | 4 ++-- + ImageGeneration/references/UbootHeader_EB.xml | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ImageGeneration/references/BootBlockAndHeader_EB.xml b/ImageGeneration/references/BootBlockAndHeader_EB.xml +index 775534f..4d5c053 100644 +--- a/ImageGeneration/references/BootBlockAndHeader_EB.xml ++++ b/ImageGeneration/references/BootBlockAndHeader_EB.xml +@@ -63,7 +63,7 @@ + <offset>0x108</offset> + <size>0x4</size> + </config> +- <content format='32bit'>0x030011BB</content> <!-- content the user should fill --> ++ <content format='32bit'>0x0300100B</content> <!-- content the user should fill --> + </BinField> + + <BinField> +@@ -73,7 +73,7 @@ + <offset>0x10C</offset> + <size>0x1</size> + </config> +- <content format='bytes'>4</content> <!-- content the user should fill --> ++ <content format='bytes'>10</content> <!-- content the user should fill --> + </BinField> + + <BinField> +diff --git a/ImageGeneration/references/UbootHeader_EB.xml b/ImageGeneration/references/UbootHeader_EB.xml +index 1e72e22..4434504 100644 +--- a/ImageGeneration/references/UbootHeader_EB.xml ++++ b/ImageGeneration/references/UbootHeader_EB.xml +@@ -63,7 +63,7 @@ + <offset>0x108</offset> <!-- offset in the header --> + <size>0x4</size> <!-- size in the header --> + </config> +- <content format='32bit'>0x030111BC</content> <!-- content the user should fill 0x030032EB --> ++ <content format='32bit'>0x0300100B</content> <!-- content the user should fill 0x030032EB --> + </BinField> + + <BinField> +-- +2.28.0.220.ged08abb693-goog + diff --git a/meta-google/dynamic-layers/nuvoton-layer/recipes-kernel/linux/files/gbmc-nuvoton.cfg b/meta-google/dynamic-layers/nuvoton-layer/recipes-kernel/linux/files/gbmc-nuvoton.cfg new file mode 100644 index 000000000..3bc14d5fa --- /dev/null +++ b/meta-google/dynamic-layers/nuvoton-layer/recipes-kernel/linux/files/gbmc-nuvoton.cfg @@ -0,0 +1,5 @@ +# Enable EDAC support +CONFIG_EDAC_SUPPORT=y +CONFIG_EDAC=y +CONFIG_EDAC_NPCM7XX=y +CONFIG_RAS=y diff --git a/meta-google/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-google/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend new file mode 100644 index 000000000..8de09b103 --- /dev/null +++ b/meta-google/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:${THISDIR}/../../../../recipes-kernel/linux/files:" +SRC_URI_append_gbmc = " file://gbmc.cfg" +SRC_URI_append_gbmc = " file://gbmc-nuvoton.cfg" +SRC_URI_append_gbmc_dev = " file://gbmc-dev.cfg" +SRC_URI_append_gbmc_prod = " file://gbmc-prod.cfg" diff --git a/meta-google/recipes-core/busybox/busybox_%.bbappend b/meta-google/recipes-core/busybox/busybox_%.bbappend index 38863ec45..9d8cb2d97 100644 --- a/meta-google/recipes-core/busybox/busybox_%.bbappend +++ b/meta-google/recipes-core/busybox/busybox_%.bbappend @@ -1,6 +1,2 @@ FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/files:" -SRC_URI_append_gbmc = " \ - file://udhcpc6.cfg \ - file://ip.cfg \ - file://ls.cfg \ -" +SRC_URI_append_gbmc = " file://gbmc.cfg" diff --git a/meta-google/recipes-core/busybox/files/udhcpc6.cfg b/meta-google/recipes-core/busybox/files/gbmc.cfg index 1c2766fda..e097a921a 100644 --- a/meta-google/recipes-core/busybox/files/udhcpc6.cfg +++ b/meta-google/recipes-core/busybox/files/gbmc.cfg @@ -1,3 +1,15 @@ +# gBMC uses iproute2 +CONFIG_IP=n +CONFIG_NETSTAT=n + +# Debugging utilities +CONFIG_LSOF=y +CONFIG_LSUSB=y + +# Used for line buffering +CONFIG_SCRIPT=y + +# Used by NC-SId CONFIG_FEATURE_IPV6=y CONFIG_UDHCPC6=y CONFIG_FEATURE_UDHCPC6_RFC3646=y diff --git a/meta-google/recipes-core/busybox/files/ip.cfg b/meta-google/recipes-core/busybox/files/ip.cfg deleted file mode 100644 index f9357715e..000000000 --- a/meta-google/recipes-core/busybox/files/ip.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_IPNEIGH=y diff --git a/meta-google/recipes-core/busybox/files/ls.cfg b/meta-google/recipes-core/busybox/files/ls.cfg deleted file mode 100644 index a302cb8b1..000000000 --- a/meta-google/recipes-core/busybox/files/ls.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_LSOF=y diff --git a/meta-google/recipes-core/dropbear/dropbear_%.bbappend b/meta-google/recipes-core/dropbear/dropbear_%.bbappend new file mode 100644 index 000000000..20c53fecb --- /dev/null +++ b/meta-google/recipes-core/dropbear/dropbear_%.bbappend @@ -0,0 +1,11 @@ +# Allow SSH to the mgmt node on DEV builds +do_install_append_gbmc_dev() { + nftables_dir=${D}${sysconfdir}/nftables + rules=$nftables_dir/50-dropbear-dev.rules + install -d -m0755 $nftables_dir + echo 'table inet filter {' >"$rules" + echo ' chain mgmt_pub_input {' >>"$rules" + echo ' tcp dport 22 accept' >>"$rules" + echo ' }' >>"$rules" + echo '}' >>"$rules" +} diff --git a/meta-google/recipes-extended/networking/files/bridge-stp b/meta-google/recipes-extended/networking/files/bridge-stp index c874f4420..59c5786b7 100644 --- a/meta-google/recipes-extended/networking/files/bridge-stp +++ b/meta-google/recipes-extended/networking/files/bridge-stp @@ -1,31 +1,18 @@ -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 -} +#!/bin/sh +if [ "$#" -lt 2 ]; then + echo "Missing args: bridge-stp <bridge> <start|stop>" >&2 + exit 1 +fi +case "$2" in + start) + /usr/sbin/mstpctl addbridge "$1" + exit + ;; + stop) + /usr/sbin/mstpctl delbridge "$1" + exit + ;; + *) + echo "Invalid operation: $2" >&2 + exit 1 +esac diff --git a/meta-google/recipes-google/acpi-power-state-daemon/acpi-power-state-daemon_git.bb b/meta-google/recipes-google/acpi-power-state-daemon/acpi-power-state-daemon_git.bb new file mode 100644 index 000000000..bf26a8c07 --- /dev/null +++ b/meta-google/recipes-google/acpi-power-state-daemon/acpi-power-state-daemon_git.bb @@ -0,0 +1,28 @@ +SUMMARY = "ACPI Power/Sleep state daemon to allow host state events" +DESCRIPTION = "ACPI Power/Sleep state daemon to allow host state events" +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 = "15fe169d1fbdd510bb9cfc9bb725baf0613350ff" +S = "${WORKDIR}/git/acpi-power-state-daemon" + +inherit meson +inherit pkgconfig +inherit systemd + +DEPENDS += " \ + phosphor-dbus-interfaces \ + sdbusplus \ + systemd \ + " + +SYSTEMD_SERVICE_${PN} = " \ + acpi-power-state.service \ + host-s0-state.target \ + host-s5-state.target \ + " 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 c27248700..70c4bcb39 100644 --- a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb +++ b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb @@ -18,7 +18,7 @@ DEPENDS += "nlohmann-json" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/google-ipmi-sys" -SRCREV = "96ad906981d1e32ecb77d1c75f30b18eeb9dd3d6" +SRCREV = "3b1b427c1fa4bcddcab1fc003410e5fa5d7a8334" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" diff --git a/meta-google/recipes-google/ipmi/ipmi-fru-sh.bb b/meta-google/recipes-google/ipmi/ipmi-fru-sh.bb new file mode 100644 index 000000000..deaee7aac --- /dev/null +++ b/meta-google/recipes-google/ipmi/ipmi-fru-sh.bb @@ -0,0 +1,16 @@ +SUMMARY = "Shell functions for manipulating IPMI formatted EEPROMs" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "file://lib.sh" +S = "${WORKDIR}" + +DATA = "${datadir}/ipmi-fru" +FILES_${PN} += "${DATA}" + +do_install_append() { + install -d -m0755 ${D}${DATA} + install -m0644 lib.sh ${D}${DATA}/ +} diff --git a/meta-google/recipes-google/ipmi/ipmi-fru-sh/lib.sh b/meta-google/recipes-google/ipmi/ipmi-fru-sh/lib.sh new file mode 100644 index 000000000..335e0b21c --- /dev/null +++ b/meta-google/recipes-google/ipmi/ipmi-fru-sh/lib.sh @@ -0,0 +1,124 @@ +#!/bin/bash +# Copyright 2021 Google 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. + +[ -n "${ipmi_fru_init-}" ] && return + +IPMI_FRU_COMMON_HEADER_INTERNAL_OFFSET_IDX=1 +IPMI_FRU_COMMON_HEADER_CHASSIS_OFFSET_IDX=2 +IPMI_FRU_COMMON_HEADER_BOARD_OFFSET_IDX=3 +IPMI_FRU_COMMON_HEADER_PRODUCT_OFFSET_IDX=4 +IPMI_FRU_COMMON_HEADER_MULTI_RECORD_OFFSET_IDX=5 +IPMI_FRU_AREA_HEADER_SIZE_IDX=1 +IPMI_FRU_CHECKSUM_IDX=-1 + +of_name_to_eeproms() { + local names + if ! names="$(grep -xl "$1" /sys/bus/i2c/devices/*/of_node/name)"; then + echo "Failed to find eeproms with of_name '$1'" >&2 + return 1 + fi + echo "$names" | sed 's,/of_node/name$,/eeprom,' +} + +of_name_to_eeprom() { + local eeproms + eeproms="$(of_name_to_eeproms "$1")" || return + if (( "$(echo "$eeproms" | wc -l)" != 1 )); then + echo "Got more than one eeprom for '$1':" $eeproms >&2 + return 1 + fi + echo "$eeproms" +} + +checksum() { + local -n checksum_arr="$1" + local checksum=0 + for byte in "${checksum_arr[@]}"; do + checksum=$((checksum + byte)) + done + echo $((checksum & 0xff)) +} + +fix_checksum() { + local -n fix_checksum_arr="$1" + old_cksum=${fix_checksum_arr[$IPMI_FRU_CHECKSUM_IDX]} + ((fix_checksum_arr[$IPMI_FRU_CHECKSUM_IDX]-=$(checksum fix_checksum_arr))) + ((fix_checksum_arr[$IPMI_FRU_CHECKSUM_IDX]&=0xff)) + printf 'Corrected %s checksum from 0x%02X -> 0x%02X\n' \ + "$1" "${old_cksum}" "${fix_checksum_arr[$IPMI_FRU_CHECKSUM_IDX]}" >&2 +} + +read_bytes() { + local file="$1" + local offset="$2" + local size="$3" + + echo "Reading $file at $offset for $size" >&2 + dd if="$file" bs=1 count="$size" skip="$offset" 2>/dev/null | \ + hexdump -v -e '1/1 "%d "' +} + +write_bytes() { + local file="$1" + local offset="$2" + local -n bytes_arr="$3" + + local hexstr + hexstr="$(printf '\\x%x' "${bytes_arr[@]}")" || return + echo "Writing $file at $offset for ${#bytes_arr[@]}" >&2 + printf "$hexstr" | dd of="$file" bs=1 seek=$offset 2>/dev/null +} + +read_header() { + local eeprom="$1" + local -n header_arr="$2" + + header_arr=($(read_bytes "$eeprom" 0 8)) || return + echo "Checking $eeprom FRU Header version" >&2 + # FRU header is always version 1 + (( header_arr[0] == 1 )) || return + echo "Checking $eeprom FRU Header checksum" >&2 + local sum + sum="$(checksum header_arr)" || return + # Checksums should be valid + (( sum == 0 )) || return 10 +} + +read_area() { + local eeprom="$1" + local offset="$2" + local -n area_arr="$3" + local area_size="${4-0}" + + offset=$((offset*8)) + area_arr=($(read_bytes "$eeprom" "$offset" 8)) || return + echo "Checking $eeprom $offset FRU Area version" >&2 + # FRU Area is always version 1 + (( area_arr[0] == 1 )) || return + if (( area_size == 0 )); then + area_size=${area_arr[$IPMI_FRU_AREA_HEADER_SIZE_IDX]} + fi + area_arr=($(read_bytes "$eeprom" "$offset" $((area_size*8)))) || return + echo "Checking $eeprom $offset FRU Area checksum" >&2 + local sum + sum="$(checksum area_arr)" || return + # Checksums should be valid + (( sum == 0 )) || return 10 +} + +ipmi_fru_init=1 +return 0 2>/dev/null +echo "ipmi-fru is a library, not executed directly" >&2 +exit 1 diff --git a/meta-google/recipes-google/ncsi/ncsid_git.bb b/meta-google/recipes-google/ncsi/ncsid_git.bb index 96833b885..de5eb6e5b 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 = "a65b7b8174de2720b3abe97ebc95a4619bc1bd73" +SRCREV = "15fe169d1fbdd510bb9cfc9bb725baf0613350ff" S = "${WORKDIR}/git/ncsid" inherit meson systemd diff --git a/meta-google/recipes-google/networking/files/gbmc-mac-config.service b/meta-google/recipes-google/networking/files/gbmc-mac-config.service new file mode 100644 index 000000000..fd9247d27 --- /dev/null +++ b/meta-google/recipes-google/networking/files/gbmc-mac-config.service @@ -0,0 +1,10 @@ +[Unit] +Before=systemd-networkd.service + +[Service] +Restart=on-failure +Type=oneshot +ExecStart=/usr/libexec/gbmc-mac-config.sh + +[Install] +WantedBy=multi-user.target diff --git a/meta-google/recipes-google/networking/files/gbmc-mac-config.sh.in b/meta-google/recipes-google/networking/files/gbmc-mac-config.sh.in new file mode 100644 index 000000000..a3430a65e --- /dev/null +++ b/meta-google/recipes-google/networking/files/gbmc-mac-config.sh.in @@ -0,0 +1,82 @@ +#!/bin/bash +# Copyright 2021 Google 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. + +source /usr/share/ipmi-fru/lib.sh || exit + +eeprom="$(of_name_to_eeprom '@EEPROM@')" || exit + +header=() +read_header "$eeprom" header || exit +internal_offset=${header[$IPMI_FRU_COMMON_HEADER_INTERNAL_OFFSET_IDX]} +if (( internal_offset == 0 )); then + echo "Internal offset invalid for eeprom" >&2 + exit 1 +fi + +# Our MAC Address configuration lives in the internal area with a format +# Offset Data +# 0 Version (Always 1) +# 1 Type (Always 1 for MAC Address) +# 2 Area Length in bytes (Always 32 bytes or 4 IPMI FRU sectors) +# 3-8 MAC Address Base Octets +# 9 Num Allocate MACs from Base +# 10-30 Padding (Always 0xFF) +# 31 IPMI FRU Checksum +internal=() +read_area "$eeprom" "$internal_offset" internal 4 || exit +if (( internal[1] != 1 || internal[2] != 32 )); then + echo "Not a MAC internal region" >&2 + exit 1 +fi +mac=("${internal[@]:3:6}") +num="${internal[@]:9:1}" +macstr=$(printf '%02x:%02x:%02x:%02x:%02x:%02x' "${mac[@]}") +echo "Base MAC $macstr num $num" >&2 + +rc=0 + +# Pre-Determine if we will miss an allocation due to the number of +# addresses the FRU actually supports. +declare -A num_to_if=(@NUM_TO_IF@) +for key in "${!num_to_if[@]}"; do + if (( key >= num )); then + echo "${num_to_if[$key]} at $key is out of range" >&2 + rc=1 + fi +done + +# Write out each MAC override to the runtime networkd configuration +for (( i=0; i<num; i++ )); do + intf="${num_to_if[$i]}" + if [ -n "$intf" ]; then + macstr=$(printf '%02x:%02x:%02x:%02x:%02x:%02x' "${mac[@]}") + echo "Setting $intf to $macstr" >&2 + for override in /run/systemd/network/{00,}-bmc-$intf.network.d; do + mkdir -p "$override" + printf '[Link]\nMACAddress=%s\n' "$macstr" >"$override"/50-mac.conf + done + for override in /run/systemd/network/{00,}-bmc-$intf.netdev.d; do + mkdir -p "$override" + printf '[NetDev]\nMACAddress=%s\n' "$macstr" >"$override"/50-mac.conf + done + fi + if (( ++mac[5] > 0xff )); then + echo "MAC assignment too large: ${mac[@]}" >&2 + rc=2 + break + fi +done + +exit $rc diff --git a/meta-google/recipes-google/networking/gbmc-iperf3.bb b/meta-google/recipes-google/networking/gbmc-iperf3.bb index f1a88b459..5044e418b 100644 --- a/meta-google/recipes-google/networking/gbmc-iperf3.bb +++ b/meta-google/recipes-google/networking/gbmc-iperf3.bb @@ -12,7 +12,19 @@ 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} + # Install service definitions + install -d -m 0755 ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/iperf3.service ${D}${systemd_system_unitdir} +} + +# Allow IPERF3 to the mgmt node on DEV builds +do_install_append_dev() { + nftables_dir=${D}${sysconfdir}/nftables + rules=$nftables_dir/50-gbmc-iperf3-dev.rules + install -d -m0755 $nftables_dir + echo 'table inet filter {' >"$rules" + echo ' chain mgmt_pub_input {' >>"$rules" + echo ' tcp dport 5201 accept' >>"$rules" + echo ' }' >>"$rules" + echo '}' >>"$rules" } diff --git a/meta-google/recipes-google/networking/gbmc-mac-config.bb b/meta-google/recipes-google/networking/gbmc-mac-config.bb new file mode 100644 index 000000000..6ca4c798b --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-mac-config.bb @@ -0,0 +1,50 @@ +SUMMARY = "Configures MAC addresses on 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://gbmc-mac-config.service \ + file://gbmc-mac-config.sh.in \ + " + +S = "${WORKDIR}" + +RDEPENDS_${PN} += " \ + bash \ + ipmi-fru-sh \ + " + +FILES_${PN} += "${systemd_unitdir}" + +SYSTEMD_SERVICE_${PN} += "gbmc-mac-config.service" + +GBMC_MAC_EEPROM_OF_NAME ?= "" + +# Maps the MAC address offset from the base address to an interface name +# in bash associative array syntax. +# Ex. "[0]=eth0 [2]=eth2" +GBMC_MAC_IF_MAP ?= "" + +do_install_append() { + if [ -z '${GBMC_MAC_EEPROM_OF_NAME}' ]; then + echo 'Missing GBMC_MAC_EEPROM_OF_NAME' >&2 + exit 1 + fi + + # Build time dictionary sanity check + bash -c 'declare -A dict=(${GBMC_MAC_IF_MAP})' + + sed gbmc-mac-config.sh.in \ + -e 's#@EEPROM@#${GBMC_MAC_EEPROM_OF_NAME}#' \ + -e 's#@NUM_TO_IF@#${GBMC_MAC_IF_MAP}#' \ + >gbmc-mac-config.sh + + install -d -m0755 ${D}${libexecdir} + install -m0755 gbmc-mac-config.sh ${D}${libexecdir}/ + + install -d -m0755 ${D}${systemd_system_unitdir} + install -m0644 gbmc-mac-config.service ${D}${systemd_system_unitdir}/ +} diff --git a/meta-google/recipes-google/nftables/files/nft-configure.sh b/meta-google/recipes-google/nftables/files/nft-configure.sh new file mode 100644 index 000000000..a82c2826f --- /dev/null +++ b/meta-google/recipes-google/nftables/files/nft-configure.sh @@ -0,0 +1,16 @@ +#!/bin/bash +shopt -s nullglob +declare -A basemap=() +i=0 +for dir in /run/nftables /etc/nftables /usr/share/nftables; do + for file in "$dir"/*.rules; do + basemap["${file##*/}$i"]="$file" + done + let i+=1 +done +rc=0 +for key in $(printf "%s\n" "${!basemap[@]}" | sort -r); do + echo "Executing ${basemap[$key]}" >&2 + nft -f "${basemap[$key]}" || rc=$? +done +exit $rc diff --git a/meta-google/recipes-google/nftables/files/nftables.service b/meta-google/recipes-google/nftables/files/nftables.service index 3830988eb..79f0bb5b0 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 'shopt -s nullglob; echo /etc/nftables/*.rules | xargs -r -n 1 nft -f' +ExecStart=/usr/libexec/nft-configure.sh ExecStop=/bin/bash -c 'nft flush ruleset' [Install] diff --git a/meta-google/recipes-google/nftables/nftables-systemd.bb b/meta-google/recipes-google/nftables/nftables-systemd.bb index 24d3e821b..f4109ddc7 100644 --- a/meta-google/recipes-google/nftables/nftables-systemd.bb +++ b/meta-google/recipes-google/nftables/nftables-systemd.bb @@ -8,10 +8,22 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd -SRC_URI += "file://nftables.service" +SRC_URI += " \ + file://nft-configure.sh \ + file://nftables.service \ + " + SYSTEMD_SERVICE_${PN} += "nftables.service" +RDEPENDS_${PN} += " \ + bash \ + nftables \ + " + do_install() { - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/nftables.service ${D}${systemd_system_unitdir} + install -d ${D}${libexecdir} + install -m0755 ${WORKDIR}/nft-configure.sh ${D}${libexecdir}/ + + install -d ${D}${systemd_system_unitdir} + install -m0644 ${WORKDIR}/nftables.service ${D}${systemd_system_unitdir}/ } diff --git a/meta-google/recipes-kernel/linux/files/gbmc-dev.cfg b/meta-google/recipes-kernel/linux/files/gbmc-dev.cfg new file mode 100644 index 000000000..d37b1163e --- /dev/null +++ b/meta-google/recipes-kernel/linux/files/gbmc-dev.cfg @@ -0,0 +1,15 @@ +# Enable all kinds of kernel debug features +CONFIG_DEBUG_KERNEL=y +CONFIG_DYNAMIC_DEBUG=y +CONFIG_DEBUG_FS=y +# Turn off DEBUG_INFO to compress image size. +CONFIG_DEBUG_INFO=n +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +CONFIG_STACK_TRACER=y +CONFIG_DYNAMIC_FTRACE=y + +# We want to allow for sysrqs over the console +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 diff --git a/meta-google/recipes-kernel/linux/files/gbmc-prod.cfg b/meta-google/recipes-kernel/linux/files/gbmc-prod.cfg new file mode 100644 index 000000000..e1a4ce8ec --- /dev/null +++ b/meta-google/recipes-kernel/linux/files/gbmc-prod.cfg @@ -0,0 +1,2 @@ +# Prod builds should not have SYSRQ +CONFIG_MAGIC_SYSRQ=n diff --git a/meta-google/recipes-kernel/linux/files/gbmc.cfg b/meta-google/recipes-kernel/linux/files/gbmc.cfg new file mode 100644 index 000000000..4385cc9eb --- /dev/null +++ b/meta-google/recipes-kernel/linux/files/gbmc.cfg @@ -0,0 +1,38 @@ +# Appended gBMC kernel commandline +CONFIG_CMDLINE="dummy.numdummies=0" +CONFIG_CMDLINE_EXTEND=y + +# We still have commandline users of /dev/mem +CONFIG_DEVMEM=y +CONFIG_DEVMEM_BOOTPARAM=n + +# Unused implicitly included functionality +CONFIG_IPV6_SIT=n + +# Used by gbmc nftables configurations +CONFIG_NETFILTER=y +CONFIG_NF_CONNTRACK=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_TABLES=y +CONFIG_NFT_CT=y +CONFIG_NF_TABLES_INET=y +CONFIG_NFT_REJECT=y +CONFIG_NFT_LOG=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_NF_LOG_IPV4=y +CONFIG_NFT_FIB_IPV4=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_LOG_IPV6=y +CONFIG_NFT_FIB_IPV6=y +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_TARGET_REJECT=y + +# MGMT Bridge Required Features +CONFIG_BRIDGE=y +CONFIG_DUMMY=y +# Support for bridge filter +CONFIG_BRIDGE_NETFILTER=y +CONFIG_NF_TABLES_BRIDGE=y +CONFIG_BRIDGE_NF_EBTABLES=y diff --git a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend index 37655b98f..acccde532 100644 --- a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -4,7 +4,10 @@ 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 = " iproute2 iproute2-ss" 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"}' +OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = \ + '${@"" if not d.getVar("GBMC_MAC_EEPROM_OF_NAME") else " gbmc-mac-config"}' diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg deleted file mode 100644 index f5c01bed7..000000000 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_INPUT_KEYBOARD=y -# CONFIG_INPUT_LEDS is not set -# CONFIG_INPUT_MOUSDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc deleted file mode 100644 index 78961af7a..000000000 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc +++ /dev/null @@ -1,2 +0,0 @@ -define KFEATURE_DESCRIPTION "Enable gpio-keys" -kconf non-hardware phosphor-gpio-keys.cfg diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.7.bb b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.7.bb index 8f5a627ed..0e57afd87 100644 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.7.bb +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.7.bb @@ -4,9 +4,6 @@ LINUX_VERSION ?= "5.7.10" SRCREV="1ca49db2b4baf304d29396a603d0308770797a5c" require linux-obmc.inc -SRC_URI += "file://phosphor-gpio-keys.scc" -SRC_URI += "file://phosphor-gpio-keys.cfg" - # OpenBMC loads in kernel features via other mechanisms so this check # in the kernel-yocto.bbclass is not required KERNEL_DANGLING_FEATURES_WARN_ONLY="1" diff --git a/meta-ibm/conf/conf-notes.txt b/meta-ibm/conf/conf-notes.txt index f8772310a..f56b88b1b 100644 --- a/meta-ibm/conf/conf-notes.txt +++ b/meta-ibm/conf/conf-notes.txt @@ -8,3 +8,5 @@ witherspoon: DISTRO=openbmc-witherspoon MACHINE=witherspoon bitbake obmc-phosphor-image witherspoon-tacoma: DISTRO=openbmc-openpower MACHINE=witherspoon-tacoma bitbake obmc-phosphor-image +rainier: +DISTRO=openbmc-openpower MACHINE=rainier bitbake obmc-phosphor-image diff --git a/meta-ibm/conf/distro/openbmc-witherspoon.conf b/meta-ibm/conf/distro/openbmc-witherspoon.conf index 1ccdeb3f5..f2caf402b 100644 --- a/meta-ibm/conf/distro/openbmc-witherspoon.conf +++ b/meta-ibm/conf/distro/openbmc-witherspoon.conf @@ -1,5 +1,4 @@ require conf/distro/openbmc-openpower.conf require conf/distro/include/phosphor-ubi.inc -require conf/distro/include/phosphor-tiny.inc require conf/distro/include/openpower-mrw.inc require conf/distro/include/openpower-ubi.inc diff --git a/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc b/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc index 2eb7f5879..37ae6abeb 100644 --- a/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc +++ b/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc @@ -28,5 +28,4 @@ do_patch_append() { inherit kernel require recipes-kernel/linux/linux-yocto.inc -KERNEL_FEATURES_remove = "phosphor-gpio-keys" INSANE_SKIP_kernel-vmlinux = "ldflags" diff --git a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend index b6fbb19dc..a134e350b 100644 --- a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend +++ b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend @@ -30,7 +30,7 @@ python link_ibm_plugins() { #Install dump header script from dreport/ibm.d to dreport/include.d install_dreport_header() { install -d ${D}${dreport_include_dir} - install -m 0755 ${S}/tools/dreport.d/ibm.d/* ${D}${dreport_include_dir}/ + install -m 0755 ${S}/tools/dreport.d/ibm.d/gendumpheader ${D}${dreport_include_dir}/ } IBM_INSTALL_POSTFUNCS = "install_ibm_plugins link_ibm_plugins" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json index 5923ccc42..f0df15788 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json @@ -6,6 +6,7 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 20, "sensors": [ { "name": "fan0_0", @@ -23,6 +24,7 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 20, "sensors": [ { "name": "fan1_0", @@ -54,6 +56,7 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 20, "sensors": [ { "name": "fan2_0", @@ -71,6 +74,7 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 20, "sensors": [ { "name": "fan3_0", diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 2b6da5946..3d6829a2d 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -56,11 +56,13 @@ FMT_CONTROL_PWRON_witherspoon = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${IN SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" # Enable the use of JSON on the fan applications that support it -EXTRA_OECONF_append_witherspoon = " --enable-json --disable-json-control" +PACKAGECONFIG_append_witherspoon = " json" +EXTRA_OECONF_append_witherspoon = " --disable-json-control" RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config" RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config" -EXTRA_OECONF_append_rainier = " --enable-json" +PACKAGECONFIG_append_rainier = " json sensor-monitor" +FAN_PACKAGES_append_rainier = " sensor-monitor" RDEPENDS_${PN}-presence-tach_append_rainier = " phosphor-fan-presence-config" RDEPENDS_${PN}-monitor_append_rainier = " phosphor-fan-monitor-config" diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf index 07564e989..d2c96e643 100644 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf @@ -1,6 +1,7 @@ INVENTORY=/system/chassis/motherboard/powersupply0 DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=144 +DRIVER_BIND_DELAY_MS=1500 NAME=powersupply0 DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068 EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf index 304442fe9..655ce07f5 100644 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf @@ -1,6 +1,7 @@ INVENTORY=/system/chassis/motherboard/powersupply1 DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=145 +DRIVER_BIND_DELAY_MS=1500 NAME=powersupply1 DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069 EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf index 0f2a9c4f6..0723892d6 100644 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf @@ -1,6 +1,7 @@ INVENTORY=/system/chassis/motherboard/powersupply2 DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=146 +DRIVER_BIND_DELAY_MS=1500 NAME=powersupply2 DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-006a EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf index 3ea74acab..3dadeefbe 100644 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf @@ -1,6 +1,7 @@ INVENTORY=/system/chassis/motherboard/powersupply3 DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=147 +DRIVER_BIND_DELAY_MS=1500 NAME=powersupply3 DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-006b EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,everest_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,everest_associations.json new file mode 100644 index 000000000..bf797d94c --- /dev/null +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,everest_associations.json @@ -0,0 +1,111 @@ +{ + "condition": + { + "path": "system/chassis/motherboard", + "interface": "com.ibm.ipzvpd.VSBP", + "property": "IM", + "values": [ + [80, 0, 48, 0] + ] + }, + "associations": + [ + { + "path": "system/chassis/motherboard/fan0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan0_0", + "/xyz/openbmc_project/sensors/fan_tach/fan0_1" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan1_0", + "/xyz/openbmc_project/sensors/fan_tach/fan1_1" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan2", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan2_0", + "/xyz/openbmc_project/sensors/fan_tach/fan2_1" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan3", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan3_0", + "/xyz/openbmc_project/sensors/fan_tach/fan3_1" + ] + } + ] + }, + { + "path": "system/chassis", + "endpoints": + [ + { + "types": + { + "rType": "chassis", + "fType": "all_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan0_0", + "/xyz/openbmc_project/sensors/fan_tach/fan0_1", + "/xyz/openbmc_project/sensors/fan_tach/fan1_0", + "/xyz/openbmc_project/sensors/fan_tach/fan1_1", + "/xyz/openbmc_project/sensors/fan_tach/fan2_0", + "/xyz/openbmc_project/sensors/fan_tach/fan2_1", + "/xyz/openbmc_project/sensors/fan_tach/fan3_0", + "/xyz/openbmc_project/sensors/fan_tach/fan3_1" + ] + } + ] + } + ] +} + diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,rainier-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,rainier-2u_associations.json new file mode 100644 index 000000000..e27de98a8 --- /dev/null +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,rainier-2u_associations.json @@ -0,0 +1,150 @@ +{ + "condition": + { + "path": "system/chassis/motherboard", + "interface": "com.ibm.ipzvpd.VSBP", + "property": "IM", + "values": [ + [80, 0, 16, 1], + [80, 0, 16, 3] + ] + }, + "associations": + [ + { + "path": "system/chassis/motherboard/fan0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan0_0", + "/xyz/openbmc_project/sensors/fan_tach/fan0_1" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan1_0", + "/xyz/openbmc_project/sensors/fan_tach/fan1_1" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan2", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan2_0", + "/xyz/openbmc_project/sensors/fan_tach/fan2_1" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan3", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan3_0", + "/xyz/openbmc_project/sensors/fan_tach/fan3_1" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan4", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan4_0", + "/xyz/openbmc_project/sensors/fan_tach/fan4_1" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan5", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan5_0", + "/xyz/openbmc_project/sensors/fan_tach/fan5_1" + ] + } + ] + }, + { + "path": "system/chassis", + "endpoints": + [ + { + "types": + { + "rType": "chassis", + "fType": "all_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan0_0", + "/xyz/openbmc_project/sensors/fan_tach/fan0_1", + "/xyz/openbmc_project/sensors/fan_tach/fan1_0", + "/xyz/openbmc_project/sensors/fan_tach/fan1_1", + "/xyz/openbmc_project/sensors/fan_tach/fan2_0", + "/xyz/openbmc_project/sensors/fan_tach/fan2_1", + "/xyz/openbmc_project/sensors/fan_tach/fan3_0", + "/xyz/openbmc_project/sensors/fan_tach/fan3_1", + "/xyz/openbmc_project/sensors/fan_tach/fan4_0", + "/xyz/openbmc_project/sensors/fan_tach/fan4_1" + ] + } + ] + } + ] +} + diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,rainier-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,rainier-4u_associations.json new file mode 100644 index 000000000..3ba8fea11 --- /dev/null +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/rainier/ibm,rainier-4u_associations.json @@ -0,0 +1,150 @@ +{ + "condition": + { + "path": "system/chassis/motherboard", + "interface": "com.ibm.ipzvpd.VSBP", + "property": "IM", + "values": [ + [80, 0, 16, 0], + [80, 0, 16, 2] + ] + }, + "associations": + [ + { + "path": "system/chassis/motherboard/fan0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan0_0" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "leds" + }, + "paths": + [ + "/xyz/openbmc_project/led/physical/fan0" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan1_0" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan2", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan2_0" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan3", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan3_0" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan4", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan4_0" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan5", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan5_0" + ] + } + ] + }, + { + "path": "system/chassis", + "endpoints": + [ + { + "types": + { + "rType": "chassis", + "fType": "all_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan0_0", + "/xyz/openbmc_project/sensors/fan_tach/fan1_0", + "/xyz/openbmc_project/sensors/fan_tach/fan2_0", + "/xyz/openbmc_project/sensors/fan_tach/fan3_0", + "/xyz/openbmc_project/sensors/fan_tach/fan4_0" + ] + } + ] + } + ] +} + diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index bdc3912d5..af512973a 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1,11 +1,23 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" PACKAGECONFIG_append_ibm-ac-server = " associations" SRC_URI_append_ibm-ac-server = " file://associations.json" - - DEPENDS_append_ibm-ac-server = " inventory-cleanup" +PACKAGECONFIG_append_rainier = " associations" +SRC_URI_append_rainier = " \ + file://ibm,rainier-2u_associations.json \ + file://ibm,rainier-4u_associations.json \ + file://ibm,everest_associations.json \ + " + do_install_append_ibm-ac-server() { install -d ${D}${base_datadir} install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json } + +do_install_append_rainier() { + install -d ${D}${base_datadir} + install -m 0755 ${WORKDIR}/ibm,rainier-2u_associations.json ${D}${base_datadir}/ibm,rainier-2u_associations.json + install -m 0755 ${WORKDIR}/ibm,rainier-4u_associations.json ${D}${base_datadir}/ibm,rainier-4u_associations.json + install -m 0755 ${WORKDIR}/ibm,everest_associations.json ${D}${base_datadir}/ibm,everest_associations.json +} diff --git a/meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb b/meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb index a52e93762..6d4edb337 100644 --- a/meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb +++ b/meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-logging +inherit native SRC_URI += "file://callouts.yaml" diff --git a/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend b/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend index 6ffe5db6c..ebe35e4b2 100644 --- a/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend +++ b/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend @@ -1,4 +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" +DEPRECATED_CRYPTO_FLAGS_remove_witherspoon-tacoma = " no-camellia" +DEPRECATED_CRYPTO_FLAGS_remove_rainier = " no-camellia" diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 29a567e27..ce13dc115 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -26,17 +26,17 @@ RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-oc RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " fan-watchdog" -RDEPENDS_${PN}-fan-control_append_rainier = " fan-watchdog" +RDEPENDS_${PN}-fan-control_append_rainier = " fan-watchdog sensor-monitor" 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 biosconfig-manager" +RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm srvcfg-manager webui-vue biosconfig-manager phosphor-post-code-manager phosphor-host-postd" 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 biosconfig-manager" +RDEPENDS_${PN}-extras_append_rainier = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd" RDEPENDS_${PN}-leds_remove_rainier = "phosphor-led-manager-faultmonitor" RDEPENDS_${PN}-leds_remove_witherspoon-tacoma = "phosphor-led-manager-faultmonitor" diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb b/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb index 3c174c3e8..5ea6cb522 100644 --- a/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb @@ -2,8 +2,8 @@ SUMMARY = "Copy error yaml files to known path for elog parsing" PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-dbus-yaml +inherit native require recipes-phosphor/power/phosphor-power.inc diff --git a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend index 075cddab2..47201122b 100644 --- a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -4,3 +4,8 @@ EXTRA_OEMESON_witherspoon += "-Dwarm-reboot=disabled" # 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" + +# IBM systems track the state of the hypervisor so bring +# in the needed package when the host state package is +# included +RRECOMMENDS_${PN}-host += "${PN}-hypervisor" diff --git a/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb index 2edb98d3c..a0f8b81d8 100644 --- a/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb +++ b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://inventory" diff --git a/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb index c2332d56e..84cce2cb0 100644 --- a/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb +++ b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://layout.yaml" diff --git a/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf b/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf deleted file mode 100644 index 854e0fb7b..000000000 --- a/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf +++ /dev/null @@ -1,2 +0,0 @@ -require conf/distro/openbmc-openpower.conf -require conf/distro/include/phosphor-aspeednic-use-mac2.inc diff --git a/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-ingrasys/meta-zaius/conf/local.conf.sample index d09389ea7..c7ccc92b3 100644 --- a/meta-ingrasys/meta-zaius/conf/local.conf.sample +++ b/meta-ingrasys/meta-zaius/conf/local.conf.sample @@ -1,5 +1,5 @@ MACHINE ??= "zaius" -DISTRO ?= "openbmc-zaius" +DISTRO ?= "openbmc-openpower" PACKAGE_CLASSES ?= "package_rpm" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf index 26595fa3d..7a558bcc1 100644 --- a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf +++ b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf @@ -9,3 +9,5 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/ingrasys.inc require conf/machine/include/p9.inc + +require conf/distro/include/phosphor-aspeednic-use-mac2.inc diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json index bb90d15f5..0f3ffa3d2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json @@ -11,10 +11,12 @@ }, "paths": [ - "/xyz/openbmc_project/sensors/power/psu0_pin", - "/xyz/openbmc_project/sensors/power/psu0_pout", - "/xyz/openbmc_project/sensors/voltage/psu0_vin", - "/xyz/openbmc_project/sensors/voltage/psu0_vout", + "/xyz/openbmc_project/sensors/power/ps0_input_power", + "/xyz/openbmc_project/sensors/power/ps0_output_power", + "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage", + "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage", + "/xyz/openbmc_project/sensors/current/ps0_input_current", + "/xyz/openbmc_project/sensors/current/ps0_output_current", "/xyz/openbmc_project/sensors/temperature/psu_inlet", "/xyz/openbmc_project/sensors/voltage/P12V", "/xyz/openbmc_project/sensors/voltage/P3V3" @@ -56,10 +58,12 @@ }, "paths": [ - "/xyz/openbmc_project/sensors/power/psu1_pin", - "/xyz/openbmc_project/sensors/power/psu1_pout", - "/xyz/openbmc_project/sensors/voltage/psu1_vin", - "/xyz/openbmc_project/sensors/voltage/psu1_vout", + "/xyz/openbmc_project/sensors/power/ps1_input_power", + "/xyz/openbmc_project/sensors/power/ps1_output_power", + "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage", + "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage", + "/xyz/openbmc_project/sensors/current/ps1_input_current", + "/xyz/openbmc_project/sensors/current/ps1_output_current", "/xyz/openbmc_project/sensors/temperature/psu_inlet", "/xyz/openbmc_project/sensors/voltage/P12V", "/xyz/openbmc_project/sensors/voltage/P3V3" @@ -1903,14 +1907,18 @@ "/xyz/openbmc_project/sensors/voltage/PVDN_CPU1", "/xyz/openbmc_project/sensors/voltage/PVIO_CPU0", "/xyz/openbmc_project/sensors/voltage/PVIO_CPU1", - "/xyz/openbmc_project/sensors/power/psu0_pin", - "/xyz/openbmc_project/sensors/power/psu0_pout", - "/xyz/openbmc_project/sensors/power/psu1_pin", - "/xyz/openbmc_project/sensors/power/psu1_pout", - "/xyz/openbmc_project/sensors/voltage/psu0_vin", - "/xyz/openbmc_project/sensors/voltage/psu0_vout", - "/xyz/openbmc_project/sensors/voltage/psu1_vin", - "/xyz/openbmc_project/sensors/voltage/psu1_vout", + "/xyz/openbmc_project/sensors/power/ps0_input_power", + "/xyz/openbmc_project/sensors/power/ps0_output_power", + "/xyz/openbmc_project/sensors/power/ps1_input_power", + "/xyz/openbmc_project/sensors/power/ps1_output_power", + "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage", + "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage", + "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage", + "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage", + "/xyz/openbmc_project/sensors/current/ps0_input_current", + "/xyz/openbmc_project/sensors/current/ps0_output_current", + "/xyz/openbmc_project/sensors/current/ps1_input_current", + "/xyz/openbmc_project/sensors/current/ps1_output_current", "/xyz/openbmc_project/sensors/temperature/psu_inlet" ] } diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf index 362b4b017..437d4b515 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf @@ -1,4 +1,6 @@ -LABEL_in1 = "psu0_vin" -LABEL_in2 = "psu0_vout" -LABEL_power1 = "psu0_pin" -LABEL_power2 = "psu0_pout" +LABEL_in1 = "ps0_input_voltage" +LABEL_in2 = "ps0_output_voltage" +LABEL_curr1 = "ps0_input_current" +LABEL_curr2 = "ps0_output_current" +LABEL_power1 = "ps0_input_power" +LABEL_power2 = "ps0_output_power" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@59.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@59.conf index 8ffe44179..7d4333c7f 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@59.conf +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@59.conf @@ -1,4 +1,6 @@ -LABEL_in1 = "psu1_vin" -LABEL_in2 = "psu1_vout" -LABEL_power1 = "psu1_pin" -LABEL_power2 = "psu1_pout" +LABEL_in1 = "ps1_input_voltage" +LABEL_in2 = "ps1_output_voltage" +LABEL_curr1 = "ps1_input_current" +LABEL_curr2 = "ps1_output_current" +LABEL_power1 = "ps1_input_power" +LABEL_power2 = "ps1_output_power" 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 b5fcae1f7..ad02834a3 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 = "bc641112abc99b4a972665aa984023a6713a21ac" +SRCREV = "8fc53d7cef0dd7ac405b5d7d91a368f376cdb508" S = "${WORKDIR}/git" 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 0273d61bf..bb820da3f 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 = "09701efa93f2e9b25b19c4560db60c1878ef8a9c" +SRCREV = "06aa21ab75cecce354b2a17e05d053c6f61d6a29" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" 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 8b6a885c1..abfcbc539 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 = "f88197083c3372cfb9167347b3cf9cc26d488a4d" +SRCREV = "00acaffb3840d019bf0853d1ee93fdde947f47d2" S = "${WORKDIR}/git" diff --git a/meta-intel-openbmc/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-intel-openbmc/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend new file mode 100644 index 000000000..5d47989b7 --- /dev/null +++ b/meta-intel-openbmc/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend @@ -0,0 +1,2 @@ +# Use PLT_RST to detect warm resets +EXTRA_OECMAKE_intel += "-DUSE_PLT_RST=ON" diff --git a/meta-lenovo/meta-hr630/conf/distro/openbmc-hr630.conf b/meta-lenovo/meta-hr630/conf/distro/openbmc-hr630.conf index f736653df..ea25cdd48 100644 --- a/meta-lenovo/meta-hr630/conf/distro/openbmc-hr630.conf +++ b/meta-lenovo/meta-hr630/conf/distro/openbmc-hr630.conf @@ -1,7 +1,7 @@ #"Copyright (c) 2019-present Lenovo #Licensed under BSD-3, see COPYING.BSD file for details." -require conf/distro/include/phosphor-base.inc +require conf/distro/openbmc-phosphor.conf DISTRO_NAME = "Lenovo Hr630 OpenBMC" DISTRO_VERSION = "0.1.2" diff --git a/meta-lenovo/meta-hr855xg2/conf/distro/openbmc-hr855xg2.conf b/meta-lenovo/meta-hr855xg2/conf/distro/openbmc-hr855xg2.conf index fb36e34f4..82bea29a8 100644 --- a/meta-lenovo/meta-hr855xg2/conf/distro/openbmc-hr855xg2.conf +++ b/meta-lenovo/meta-hr855xg2/conf/distro/openbmc-hr855xg2.conf @@ -1,7 +1,7 @@ #"Copyright (c) 2019-present Lenovo #Licensed under BSD-3, see COPYING.BSD file for details." -require conf/distro/include/phosphor-base.inc +require conf/distro/openbmc-phosphor.conf DISTRO_NAME = "Lenovo Hr855xg2 OpenBMC" DISTRO_VERSION = "0.05" diff --git a/meta-mellanox/conf/layer.conf b/meta-mellanox/conf/layer.conf deleted file mode 100644 index 8e43822f8..000000000 --- a/meta-mellanox/conf/layer.conf +++ /dev/null @@ -1,7 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -BBFILE_COLLECTIONS += "mellanox" -BBFILE_PATTERN_mellanox = "" - -LAYERSERIES_COMPAT_mellanox = "dunfell gatesgarth" diff --git a/meta-mellanox/meta-msn/conf/bblayers.conf.sample b/meta-mellanox/meta-msn/conf/bblayers.conf.sample deleted file mode 100644 index 1f34a692e..000000000 --- a/meta-mellanox/meta-msn/conf/bblayers.conf.sample +++ /dev/null @@ -1,35 +0,0 @@ -# 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-x86 \ - ##OEROOT##/meta-mellanox \ - ##OEROOT##/meta-mellanox/meta-msn \ - " -BBLAYERS_NON_REMOVABLE ?= " \ - ##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-x86 \ - ##OEROOT##/meta-mellanox \ - ##OEROOT##/meta-mellanox/meta-msn \ - " diff --git a/meta-mellanox/meta-msn/conf/conf-notes.txt b/meta-mellanox/meta-msn/conf/conf-notes.txt deleted file mode 100644 index 9b3c01a55..000000000 --- a/meta-mellanox/meta-msn/conf/conf-notes.txt +++ /dev/null @@ -1,2 +0,0 @@ -Common targets are: - obmc-phosphor-image diff --git a/meta-mellanox/meta-msn/conf/layer.conf b/meta-mellanox/meta-msn/conf/layer.conf deleted file mode 100644 index a5711698f..000000000 --- a/meta-mellanox/meta-msn/conf/layer.conf +++ /dev/null @@ -1,9 +0,0 @@ -# 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 += "msn" -BBFILE_PATTERN_msn = "" diff --git a/meta-mellanox/meta-msn/conf/local.conf.sample b/meta-mellanox/meta-msn/conf/local.conf.sample deleted file mode 100644 index 2547907ca..000000000 --- a/meta-mellanox/meta-msn/conf/local.conf.sample +++ /dev/null @@ -1,21 +0,0 @@ -MACHINE ??= "msn" -DISTRO ?= "openbmc-phosphor" -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" -INHERIT += "extrausers" -EXTRA_USERS_PARAMS = " \ - usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ - " diff --git a/meta-mellanox/meta-msn/conf/machine/msn.conf b/meta-mellanox/meta-msn/conf/machine/msn.conf deleted file mode 100644 index af2229e7f..000000000 --- a/meta-mellanox/meta-msn/conf/machine/msn.conf +++ /dev/null @@ -1,9 +0,0 @@ -KMACHINE = "aspeed" -KERNEL_DEVICETREE = "${KMACHINE}-bmc-mellanox-${MACHINE}.dtb" - -UBOOT_MACHINE = "ast_g5_ncsi_config" - -FLASH_SIZE = "32768" - -require conf/machine/include/ast2500.inc -require conf/machine/include/obmc-bsp-common.inc diff --git a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid.inc b/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid.inc deleted file mode 100644 index 73e7614f6..000000000 --- a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid.inc +++ /dev/null @@ -1,60 +0,0 @@ -DESCRIPTION = "This is the OpenIPMI library, a library that makes simplifies building complex IPMI management software." -SECTION = "console/network" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = " \ - openssl \ - popt \ - zlib \ - ncurses \ - glib-2.0 \ - gdbm \ - dbus \ - dbus-glib \ -" -RDEPENDS_${PN} += " bash dbus" - -INC_PR = "r2" - -inherit autotools gettext update-alternatives systemd pkgconfig - -PACKAGECONFIG ??= "net-snmp" - -PACKAGECONFIG[net-snmp] = ",--with-ucdsnmp=no,net-snmp" -PACKAGECONFIG[python] = "--with-python,--without-python,python," -PACKAGECONFIG[perl] = "--with-perl=${STAGING_BINDIR_NATIVE},--with-perl=no,perl," -PACKAGECONFIG[tcl] = "--with-tcl,--without-tcl,tcl," - -EXTRA_OECONF = "\ - --prefix=${prefix} \ - --with-mellanox \ - --with-dbus \ - " - -S = "${WORKDIR}/git" - -PARALLEL_MAKEINST = "" - -SYSTEMD_PACKAGES = "${PN}" - -SYSTEMD_SERVICE_${PN} = " mlx_ipmid.service" - - -do_install_append() { - install -d ${D}/etc/init.d - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/mlx_ipmid.service ${D}/${systemd_unitdir}/system/mlx_ipmid.service - install -d ${D}${libdir}/mlx_ipmid - install -m 0644 ${B}/lanserv/mellanox/.libs/mellanox.so ${D}${libdir}/mlx_ipmid/ - install -Dpm 644 ${D}/var/mlx_ipmid/mellanox/50-mlx-events-4.10.rules ${D}/lib/udev/rules.d/50-mlx-events.rules - install -Dpm 644 ${D}/var/mlx_ipmid/mellanox/50-mlx-hwmon-4-10-events.rules ${D}/lib/udev/rules.d/50-mlx-hwmon-events.rules -} - -FILES_${PN} += "/usr/lib/perl5 \ - /usr/lib/mlx_ipmid \ - ${systemd_unitdir} \ - " - -FILES_${PN}-dev += "/usr/lib/OpenIPMI" - -FILES_${PN}-dbg += "/usr/lib/perl5/auto/OpenIPMI/.debug" diff --git a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid/mlx_ipmid.service b/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid/mlx_ipmid.service deleted file mode 100644 index 09abe1e65..000000000 --- a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid/mlx_ipmid.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=mlx_ipmid - -[Service] -Restart=always -OOMScoreAdjust=-1000 - -ExecStart=/usr/bin/mlx_ipmid -n -TimeoutSec=120 - -[Install] -WantedBy=multi-user.target diff --git a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid/remove_libdir.patch b/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid/remove_libdir.patch deleted file mode 100644 index e74e06f2b..000000000 --- a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid/remove_libdir.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index e80090d..b59ff24 100644 ---- a/cmdlang/Makefile.am -+++ b/cmdlang/Makefile.am -@@ -16,7 +16,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \ - $(top_builddir)/utils/libOpenIPMIutils.la \ - $(top_builddir)/lib/libOpenIPMI.la - libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIcmdlang.map -L$(libdir) -+ -Wl,-Map -Wl,libOpenIPMIcmdlang.map - - bin_PROGRAMS = openipmish - -diff --git a/glib/Makefile.am b/glib/Makefile.am -index 671cae2..eff55f3 100644 ---- a/glib/Makefile.am -+++ b/glib/Makefile.am -@@ -11,14 +11,14 @@ libOpenIPMIglib_la_SOURCES = glib_os_hnd.c - libOpenIPMIglib_la_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS) - libOpenIPMIglib_la_LIBADD = $(GDBM_LIB) - libOpenIPMIglib_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIglib.map $(GLIB_LIBS) -L$(libdir) \ -+ -Wl,-Map -Wl,libOpenIPMIglib.map $(GLIB_LIBS) \ - -rpath $(libdir) - - libOpenIPMIglib12_la_SOURCES = glib_os_hnd.c - libOpenIPMIglib12_la_CFLAGS = $(GLIB12_CFLAGS) $(AM_CFLAGS) - libOpenIPMIglib12_la_LIBADD = $(GDBM_LIB) - libOpenIPMIglib12_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIglib12.map $(GLIB12_LIBS) -L$(libdir) \ -+ -Wl,-Map -Wl,libOpenIPMIglib12.map $(GLIB12_LIBS) \ - -rpath $(libdir) - - CLEANFILES = libOpenIPMIglib.map libOpenIPMIglib12.map -diff --git a/tcl/Makefile.am b/tcl/Makefile.am -index e2a98dc..256af0c 100644 ---- a/tcl/Makefile.am -+++ b/tcl/Makefile.am -@@ -11,7 +11,7 @@ libOpenIPMItcl_la_SOURCES = tcl_os_hnd.c - libOpenIPMItcl_la_CFLAGS = $(TCL_CFLAGS) $(AM_CFLAGS) - libOpenIPMItcl_la_LIBADD = $(GDBM_LIB) - libOpenIPMItcl_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMItcl.map $(TCL_LIBS) -L$(libdir) \ -+ -Wl,-Map -Wl,libOpenIPMItcl.map $(TCL_LIBS) \ - -rpath $(libdir) - - noinst_PROGRAMS = test_handlers -diff --git a/unix/Makefile.am b/unix/Makefile.am -index ac5b9f4..d5d4b82 100644 ---- a/unix/Makefile.am -+++ b/unix/Makefile.am -@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c - libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ - $(top_builddir)/utils/libOpenIPMIutils.la - libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIpthread.map -L$(libdir) -+ -Wl,-Map -Wl,libOpenIPMIpthread.map - - libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c - libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ - $(GDBM_LIB) - libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIposix.map -L$(libdir) -+ -Wl,-Map -Wl,libOpenIPMIposix.map - - noinst_HEADERS = heap.h - diff --git a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid_git.bb b/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid_git.bb deleted file mode 100644 index 195b639bd..000000000 --- a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid_git.bb +++ /dev/null @@ -1,14 +0,0 @@ -PV = "git${SRCPV}" -PV = "2.0.22+git${SRCPV}" - -MLX_IPMID_BRANCH = "openbmc" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI = "git://github.com/mellanoxbmc/ipmi.git;protocol=git;branch=${MLX_IPMID_BRANCH};" -SRC_URI += "file://mlx_ipmid.service" -SRC_URI += "file://remove_libdir.patch" - -SRCREV = "${AUTOREV}" - -require mlx-ipmid.inc diff --git a/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed/msn.cfg b/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed/msn.cfg deleted file mode 100644 index e0df616f2..000000000 --- a/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed/msn.cfg +++ /dev/null @@ -1,21 +0,0 @@ -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_MLXSW_CORE=y -CONFIG_MLXSW_CORE_HWMON=y -CONFIG_MLXSW_CORE_THERMAL=y -CONFIG_MLXSW_I2C=y -CONFIG_MLXSW_MINIMAL=y -CONFIG_OF_UNITTEST=y -CONFIG_OF_DYNAMIC=y -CONFIG_MFD_MLXREG_CORE=y -CONFIG_MFD_MLXREG_I2C=y -CONFIG_LEDS_MLXREG=y -CONFIG_MLXREG_HOTPLUG=y -CONFIG_SENSORS_TPS53679=y -CONFIG_SENSORS_TMP102=y -CONFIG_SENSORS_MAX6621=y -CONFIG_THERMAL=y -CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_OF=y -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -CONFIG_THERMAL_GOV_STEP_WISE=y -CONFIG_FSI=n diff --git a/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed_%.bbappend deleted file mode 100644 index 35e9d9b33..000000000 --- a/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://msn.cfg"
\ No newline at end of file diff --git a/meta-mellanox/meta-msn/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-mellanox/meta-msn/recipes-phosphor/images/obmc-phosphor-image.bbappend deleted file mode 100644 index fb6a24439..000000000 --- a/meta-mellanox/meta-msn/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ /dev/null @@ -1 +0,0 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = " mlx-ipmid" diff --git a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/failsafe-boot.sh b/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/failsafe-boot.sh deleted file mode 100644 index ea1bd0711..000000000 --- a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/failsafe-boot.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -echo "---------------- -System entered recovery mode. Running from backup flash!!! -help for get ip: -ifconfig eth0 $IP netmask $NETMASK up; -route add default gw $GATEWAY eth0 -Or type udhcpc to get ip over dhcp. -Please scp image file to /tmp folder and re-burn main flash with: -/run/initramfs/recovery /tmp/<bmc-image-file>. -----------------"; - -mkdir /run/lock; - -mkdir /dev/mtd; - -ln -s /run/mtd\:u-boot-env /dev/mtd/u-boot-env; - -/usr/bin/mlx-hw-events.sh add reset /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a140.i2c-bus/i2c-4/4-0071/mlxreg-core.1137/hwmon/hwmon*; - -mount /dev/mtdblock5 /run/initramfs/rw -t jffs2 -o remount,ro; -mount tmpfs tmp -t tmpfs -o mode=755,nodev; - -export PS1="(recovery)\u@BMC:\w\$" - -while true; -do - /run/initramfs/ro/sbin/sulogin; -done - diff --git a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/obmc-init.sh b/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/obmc-init.sh deleted file mode 100644 index 9512c762c..000000000 --- a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/obmc-init.sh +++ /dev/null @@ -1,430 +0,0 @@ -#!/bin/sh - -fslist="proc sys dev run" -rodir=run/initramfs/ro -rwdir=run/initramfs/rw -upper=$rwdir/cow -work=$rwdir/work - -cd / -mkdir -p $fslist -mount dev dev -tdevtmpfs -mount sys sys -tsysfs -mount proc proc -tproc -if ! grep run proc/mounts -then - mount tmpfs run -t tmpfs -o mode=755,nodev -fi - -mkdir -p $rodir $rwdir - -cp -rp init failsafe recovery shutdown update update_all whitelist bin sbin usr lib etc var run/initramfs - -# To start a interactive shell with job control at this point, run -# getty 38400 ttyS4 - -findmtd() { - m=$(grep -xl "$1" /sys/class/mtd/*/name) - m=${m%/name} - m=${m##*/} - echo $m -} - -blkid_fs_type() { - # Emulate util-linux's `blkid -s TYPE -o value $1` - # Example busybox blkid output: - # # blkid /dev/mtdblock5 - # /dev/mtdblock5: TYPE="squashfs" - # Process output to extract TYPE value "squashfs". - blkid $1 | sed -e 's/^.*TYPE="//' -e 's/".*$//' -} - -probe_fs_type() { - fst=$(blkid_fs_type $1) - echo ${fst:=jffs2} -} - -# This fw_get_env_var is a possibly broken version of fw_printenv that -# does not check the crc or flag byte. -# The u-boot environment starts with a crc32, followed by a flag byte -# when a redundannt environment is configured, followed by var=value\0 sets. -# The flag byte for nand is a 1 byte counter; for nor it is a 1 or 0 byte. - -get_fw_env_var() { - # do we have 1 or 2 copies of the environment? - # count non-blank non-comment lines - # copies=$(grep -v ^# /etc/fw_env.config | grep -c [::alnum::]) - # ... we could if we had the fw_env.config in the initramfs - copies=2 - - # * Change \n to \r and \0 to \n - # * Skip to the 5th byte to skip over crc - # * then skip to the first or 2nd byte to skip over flag if it exists - # * stop parsing at first empty line corresponding to the - # double \0 at the end of the environment. - # * print the value of the variable name passed as argument - - envdev=$(findmtd u-boot-env) - if test -n $envdev - then - cat /dev/$envdev | - tr '\n\000' '\r\n' | - tail -c +5 | tail -c +${copies-1} | - sed -ne '/^$/,$d' -e "s/^$1=//p" - fi -} - -setup_resolv() { - runresolv=/run/systemd/resolve/resolv.conf - etcresolv=/etc/resolv.conf - - if test ! -e $etcresolv -a ! -L $etcresolv - then - mkdir -p ${runresolv%/*} - ln -s $runresolv $etcresolv - fi - if test ! -f $runresolv - then - cat /proc/net/pnp > $runresolv - fi - - return 0 -} - -try_tftp() { - # split into tftp:// host:port/ path/on/remote - # then spilt off / and then :port from the end of host:port/ - # and : from the beginning of port - - rest="${1#tftp://}" - path=${rest#*/} - host=${rest%$path} - host="${host%/}" - port="${host#${host%:*}}" - host="${host%$port}" - port="${port#:}" - - setup_resolv - - if test -z "$host" -o -z "$path" - then - debug_takeover "Invalid tftp download url '$url'." - elif echo "Downloading '$url' from $host ..." && - ! tftp -g -r "$path" -l /run/image-rofs "$host" ${port+"$port"} - then - debug_takeover "Download of '$url' failed." - fi -} - -try_wget() { - setup_resolv - - echo "Downloading '$1' ..." - if ! wget -O /run/image-rofs "$1" - then - debug_takeover "Download of '$url' failed." - fi -} - -debug_takeover() { - echo "$@" - test -n "$@" && echo Enter password to try to manually fix. - cat << HERE -After fixing run exit to continue this script, or reboot -f to retry, or -touch /takeover and exit to become PID 1 allowing editing of this script. -HERE - - while ! sulogin && ! test -f /takeover - do - echo getty failed, retrying - done - - # Touch /takeover in the above getty to become pid 1 - if test -e /takeover - then - cat << HERE - -Takeover of init requested. Executing /bin/sh as PID 1. -When finished exec new init or cleanup and run reboot -f. - -Warning: No job control! Shell exit will panic the system! -HERE - export PS1=init#\ - exec /bin/sh - fi -} - -env=$(findmtd u-boot-env) -if test -n $env -then - ln -s /dev/$env /run/mtd:u-boot-env - cp /run/mtd:u-boot-env /run/fw_env -fi - -rofs=$(findmtd rofs) -rwfs=$(findmtd rwfs) - -rodev=/dev/mtdblock${rofs#mtd} -rwdev=/dev/mtdblock${rwfs#mtd} - -# Set to y for yes, anything else for no. -force_rwfst_jffs2=y -flash_images_before_init=n -consider_download_files=y -consider_download_tftp=y -consider_download_http=y -consider_download_ftp=y - -rofst=squashfs -rwfst=$(probe_fs_type $rwdev) -roopts=ro -rwopts=rw - -image=/run/initramfs/image- -trigger=${image}rwfs - -init=/sbin/init -failsafe=/run/initramfs/failsafe -fsckbase=/sbin/fsck. -fsck=$fsckbase$rwfst -fsckopts=-a -optfile=/run/initramfs/init-options -optbase=/run/initramfs/init-options-base -urlfile=/run/initramfs/init-download-url -update=/run/initramfs/update - -if test -e /${optfile##*/} -then - cp /${optfile##*/} $optfile -fi - -if test -e /${optbase##*/} -then - cp /${optbase##*/} $optbase -else - touch $optbase -fi - -if test ! -f $optfile -then - cat /proc/cmdline $optbase > $optfile - get_fw_env_var openbmcinit >> $optfile - get_fw_env_var openbmconce >> $optfile -fi - -echo rofs = $rofs $rofst rwfs = $rwfs $rwfst - -if grep -w debug-init-sh $optfile -then - debug_takeover "Debug initial shell requested by command line." -fi - -if test "x$consider_download_files" = xy && - grep -w openbmc-init-download-files $optfile -then - if test -f ${urlfile##*/} - then - cp ${urlfile##*/} $urlfile - fi - if test ! -f $urlfile - then - get_fw_env_var openbmcinitdownloadurl > $urlfile - fi - url="$(cat $urlfile)" - rest="${url#*://}" - proto="${url%$rest}" - - if test -z "$url" - then - echo "Download url empty. Ignoring download request." - elif test -z "$proto" - then - echo "Download failed." - elif test "$proto" = tftp:// - then - if test "x$consider_download_tftp" = xy - then - try_tftp "$url" - else - echo "Download failed." - fi - elif test "$proto" = http:// - then - if test "x$consider_download_http" = xy - then - try_wget "$url" - else - echo "Download failed." - fi - elif test "$proto" = ftp:// - then - if test "x$consider_download_ftp" = xy - then - try_wget "$url" - else - echo "Download failed." - fi - else - echo "Download failed." - fi -fi - -# If there are images in root move them to /run/initramfs/ or /run/ now. -imagebasename=${image##*/} -if test -n "${imagebasename}" && ls /${imagebasename}* > /dev/null 2>&1 -then - if test "x$flash_images_before_init" = xy - then - echo "Flash images found, will update before starting init." - mv /${imagebasename}* ${image%$imagebasename} - else - echo "Flash images found, will use but deferring flash update." - mv /${imagebasename}* /run/ - fi -fi - -if grep -w clean-rwfs-filesystem $optfile -then - echo "Cleaning of read-write overlay filesystem requested." - touch $trigger -fi - -if test "x$force_rwfst_jffs2" = xy -a $rwfst != jffs2 -a ! -f $trigger -then - echo "Converting read-write overlay filesystem to jffs2 forced." - touch $trigger -fi - -if ls $image* > /dev/null 2>&1 -then - if ! test -x $update - then - debug_takeover "Flash update requested but $update missing!" - elif test -f $trigger -a ! -s $trigger - then - echo "Saving selected files from read-write overlay filesystem." - $update --no-restore-files - echo "Clearing read-write overlay filesystem." - flash_eraseall /dev/$rwfs - echo "Restoring saved files to read-write overlay filesystem." - touch $trigger - $update --no-save-files --clean-saved-files - else - $update --clean-saved-files - fi - - rwfst=$(probe_fs_type $rwdev) - fsck=$fsckbase$rwfst -fi - -if grep -w overlay-filesystem-in-ram $optfile -then - rwfst=none -fi - -copyfiles= -if grep -w copy-files-to-ram $optfile -then - rwfst=none - copyfiles=y -fi - -# It would be nice to do this after fsck but that mean rofs is mounted -# which triggers the mtd is mounted check -if test "$rwfst$copyfiles" = noney -then - touch $trigger - $update --copy-files --clean-saved-files --no-restore-files -fi - -if grep -w copy-base-filesystem-to-ram $optfile && - test ! -e /run/image-rofs && ! cp $rodev /run/image-rofs -then - # Remove any partial copy to avoid attempted usage later - if test -e /run/image-rofs - then - ls -l /run/image-rofs - rm -f /run/image-rofs - fi - debug_takeover "Copying $rodev to /run/image-rofs failed." -fi - -if test -s /run/image-rofs -then - rodev=/run/image-rofs - roopts=$roopts,loop -fi - -mount $rodev $rodir -t $rofst -o $roopts - -if test -x $rodir$fsck -then - for fs in $fslist - do - mount --bind $fs $rodir/$fs - done - chroot $rodir $fsck $fsckopts $rwdev - rc=$? - for fs in $fslist - do - umount $rodir/$fs - done - if test $rc -gt 1 - then - debug_takeover "fsck of read-write fs on $rwdev failed (rc=$rc)" - fi -elif test "$rwfst" != jffs2 -a "$rwfst" != none -then - echo "No '$fsck' in read only fs, skipping fsck." -fi - -if test "$rwfst" = none -then - echo "Running with read-write overlay in RAM for this boot." - echo "No state will be preserved unless flash update performed." -elif ! mount $rwdev $rwdir -t $rwfst -o $rwopts -then - msg="$(cat)" << HERE - -Mounting read-write $rwdev filesystem failed. Please fix and run - mount $rwdev $rwdir -t $rwfst -o $rwopts -to to continue, or do change nothing to run from RAM for this boot. -HERE - debug_takeover "$msg" -fi - -rm -rf $work -mkdir -p $upper $work - -mount -t overlay -o lowerdir=$rodir,upperdir=$upper,workdir=$work cow /root - -while ! chroot /root /bin/sh -c "test -x '$init' -a -s '$init'" -do - msg="$(cat)" << HERE - -Unable to confirm /sbin/init is an executable non-empty file -in merged file system mounted at /root. - -Change Root test failed! Invoking emergency shell. -HERE - debug_takeover "$msg" -done - -for f in $fslist -do - mount --move $f root/$f -done - -# switch_root /root $init -ln -s /root/dev/mem /dev/mem -FLASH_CP=`/root/sbin/devmem 0x1e785030` -FLASH_CP=$(($FLASH_CP&0x02)) -rm /dev/mem - -if [ $FLASH_CP == 0 ]; then -# echo "Flash 1 used. Normal boot."; - exec chroot /root $init; -else - exec chroot /root $failsafe; -fi - diff --git a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/obmc-update_all.sh b/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/obmc-update_all.sh deleted file mode 100644 index fbcf466d6..000000000 --- a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/obmc-update_all.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# Script to burn entire 32MB of BMC SPI Flash -# -# Usage: -# a) Local: /run/initramfs/update_all <bmc-image-file> -# b) Remote: sshpass -p "<root-password>" ssh root@<ip> '/run/initramfs/update_all <bmc-image-file>' -# -# Assumptions: -# <bmc-image-file> is a 32MB file representing all partitions in BMC SPI Flash -# <bmc-image-file> exists on local filesystem -# /dev/mtd0 represents entire BMC SPI Flash device -# /dev/mtd5 is a JFFS2 filesystem (rwfs) partition -# /bsp/reset/bmc_upgrade is symlink pointing to proper sticky bit in CPLD -# - -if [ -f $1 ] -then - echo $0: Update BMC SPI Flash with $1 -else - echo $0: File $1 not found on target, exiting - exit -fi - -echo $0: Stopping system services -systemctl stop mlx_ipmid - -echo $0: Remounting rwfs "(/dev/mtd5)" as read-only -mount /dev/mtdblock5 /run/initramfs/rw -t jffs2 -o remount,ro - -echo $0: Unmounting rofs "(/dev/mtd4)" -umount /dev/mtdblock4 - -MAC=`fw_printenv ethaddr | sed -n "s/^ethaddr=//p"` - -echo $0: Burning SPI Flash "(/dev/mtd0)" with image "$1" -/usr/sbin/flashcp -v $1 /dev/mtd0 - -if [ -v $MAC ]; then - echo "MAC env variable not exist. Set eth0 MAC from eeprom." - MAC=`hexdump -n 6 -s 0xf0 -v -e '/1 "%02x:"' /sys/bus/i2c/devices/6-0055/eeprom`;MAC=${MAC::-1}; -else - echo "MAC env variable exist. Set eth0 MAC from env." -fi; -fw_setenv ethaddr $MAC - -echo $0: Setting bmc_upgrade sticky bit in CPLD -echo 1 > /bsp/reset/bmc_upgrade - -echo $0: Rebooting BMC -echo 0 > /bsp/reset/bmc_reset_soft - - - diff --git a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/recovery.sh b/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/recovery.sh deleted file mode 100644 index 256e18fdb..000000000 --- a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/recovery.sh +++ /dev/null @@ -1,52 +0,0 @@ - -#!/bin/sh -# -# Script to burn entire 32MB of BMC SPI Flash 1 -# -# Usage: -# a) Local: /run/initramfs/recovery <bmc-image-file> -# -# Assumptions: -# <bmc-image-file> is a 32MB file representing all partitions in BMC SPI Flash -# <bmc-image-file> exists on local filesystem -# /dev/mtd0 represents entire BMC SPI Flash device -# /dev/mtd5 is a JFFS2 filesystem (rwfs) partition -# /bsp/reset/bmc_upgrade is symlink pointing to proper sticky bit in CPLD -# - -if [ -f $1 ] -then - echo $0: Update BMC SPI Flash with $1 -else - echo $0: File $1 not found on target, exiting - exit -fi - -echo $0: Remounting rwfs "(/dev/mtd5)" as read-only -mount /dev/mtdblock5 /run/initramfs/rw -t jffs2 -o remount,ro - -echo $0: Unmounting rofs "(/dev/mtd4)" -umount /dev/mtdblock4 - -devmem 0x1e785034 l 0x01; - -MAC=`fw_printenv ethaddr | sed -n "s/^ethaddr=//p"` - -echo $0: Burning SPI Flash "(/dev/mtd0)" with image "$1" -/usr/sbin/flashcp -v $1 /dev/mtd0 - -if [ -v $MAC ]; then - echo "MAC env variable not exist. Set eth0 MAC from eeprom." - MAC=`hexdump -n 6 -s 0xf0 -v -e '/1 "%02x:"' /sys/bus/i2c/devices/6-0055/eeprom`;MAC=${MAC::-1}; -else - echo "MAC env variable exist. Set eth0 MAC from env." -fi; - -fw_setenv ethaddr $MAC - -echo $0: Setting bmc_upgrade sticky bit in CPLD -echo 1 > /bsp/reset/bmc_upgrade - -echo $0: Rebooting BMC -echo 0 > /bsp/reset/bmc_reset_soft - diff --git a/meta-mellanox/meta-msn/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend b/meta-mellanox/meta-msn/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend deleted file mode 100644 index 9ad6bc849..000000000 --- a/meta-mellanox/meta-msn/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend +++ /dev/null @@ -1,16 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://obmc-init.sh" -SRC_URI += "file://obmc-update_all.sh" -SRC_URI += "file://failsafe-boot.sh" -SRC_URI += "file://recovery.sh" - - -do_install_append() { - install -m 0755 ${WORKDIR}/obmc-init.sh ${D}/init - install -m 0755 ${WORKDIR}/failsafe-boot.sh ${D}/failsafe - install -m 0755 ${WORKDIR}/obmc-update_all.sh ${D}/update_all - install -m 0755 ${WORKDIR}/recovery.sh ${D}/recovery -} - -FILES_${PN} += " /update_all /failsafe /recovery" diff --git a/meta-mellanox/meta-msn/recipes.txt b/meta-mellanox/meta-msn/recipes.txt deleted file mode 100644 index c58366847..000000000 --- a/meta-mellanox/meta-msn/recipes.txt +++ /dev/null @@ -1 +0,0 @@ -recipes-phosphor - Phosphor OpenBMC applications and configuration 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 62082b10b..5a1813296 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 = "c311158da2dff0cb2a0a9fefbf9e2979747a2134" +SRCREV = "9033cd58bf7050e8aa9a6b08ba53ed8d72e17394" S = "${WORKDIR}/git" diff --git a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig index 635db10b9..cbc3fd26c 100644 --- a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig +++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig @@ -6,19 +6,19 @@ CONFIG_CGROUPS=y CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y -CONFIG_SYSCTL_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_DEFAULT_DEADLINE=y CONFIG_ARCH_NPCM=y CONFIG_ARCH_NPCM7XX=y CONFIG_SMP=y CONFIG_VMSPLIT_3G_OPT=y -CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ARM_CRYPTO=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SIG=y +CONFIG_MODULE_SIG_SHA512=y +CONFIG_PARTITION_ADVANCED=y CONFIG_BINFMT_MISC=y CONFIG_NET=y CONFIG_PACKET=y @@ -28,23 +28,20 @@ CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y +CONFIG_MTD_PARTITIONED_MASTER=y CONFIG_MTD_RAM=y CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_PARTITIONED_MASTER=y CONFIG_MTD_SPI_NOR=y -CONFIG_SPI_NPCM_FIU=y CONFIG_OF_OVERLAY=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y @@ -62,15 +59,13 @@ CONFIG_BROADCOM_PHY=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_NPCM750_OTP=y -CONFIG_NPCM750_OTP_WRITE_ENABLE=y CONFIG_NPCM7XX_KCS_IPMI_BMC=y CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_NPCM7XX=y -CONFIG_I2C_SLAVE_EEPROM=y CONFIG_SPI=y +CONFIG_SPI_NPCM_FIU=y CONFIG_SPI_NPCM_PSPI=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_GENERIC_PLATFORM=y @@ -80,8 +75,6 @@ CONFIG_SENSORS_TMP102=y CONFIG_WATCHDOG=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_NPCM750_VCD=y -CONFIG_NPCM750_ECE=y CONFIG_USB_HIDDEV=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y @@ -92,31 +85,28 @@ CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_NPCMX50_USB2=y CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_EDM_KBD_MOUSE=m CONFIG_MMC=y CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_NPCM750=y CONFIG_EDAC=y # CONFIG_EDAC_LEGACY_SYSFS is not set CONFIG_EDAC_NPCM7XX=y CONFIG_IIO=y -CONFIG_RAS=y CONFIG_NPCM_ADC=y CONFIG_IIO_MUX=y +CONFIG_RAS=y CONFIG_MUX_MMIO=y +CONFIG_OVERLAY_FS=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y -CONFIG_OVERLAY_FS=y +CONFIG_TMPFS=y CONFIG_JFFS2_FS=y CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_FS_XATTR=y CONFIG_SQUASHFS=y CONFIG_SQUASHFS_XZ=y -CONFIG_TMPFS=y CONFIG_ROMFS_FS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y @@ -125,6 +115,12 @@ CONFIG_CIFS_XATTR=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_USER_API_HASH=y +CONFIG_CRYPTO_USER_API_SKCIPHER=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_REDUCED=y @@ -132,13 +128,3 @@ CONFIG_READABLE_ASM=y CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_MAGIC_SYSRQ=y CONFIG_FUNCTION_TRACER=y -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_USER_API_SKCIPHER=y -CONFIG_CRYPTO_DEV_NPCMX50=y -CONFIG_ARM_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_USER_API_HASH=y diff --git a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb index 3f63d4e01..49f2f38b1 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.10" -LINUX_VERSION ?= "5.10.14" +LINUX_VERSION ?= "5.10.23" -SRCREV="56621ca6dcf8c20fc7bc72771df00cd3d59c153b" +SRCREV="6687842ee68152c5cc7b7f8ac771b25eaece056a" require linux-nuvoton.inc diff --git a/meta-nuvoton/recipes-nuvoton/loadsvf/loadsvf_git.bb b/meta-nuvoton/recipes-nuvoton/loadsvf/loadsvf_git.bb index a0206da9c..08f6c18bf 100644 --- a/meta-nuvoton/recipes-nuvoton/loadsvf/loadsvf_git.bb +++ b/meta-nuvoton/recipes-nuvoton/loadsvf/loadsvf_git.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/Nuvoton-Israel/loadsvf.git" -SRCREV = "69d077629d5c85309c8dc17623d8586464db5c50" +SRCREV = "f2296005cbba13b49e5163340cac80efbec9cdf4" S = "${WORKDIR}/git/" inherit autotools pkgconfig 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.2.bb index 49d6c15da..91d0e373b 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.2.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "d82d74d4c03e099f806e4bb31483955637c69226576bf0ca9bd142f1d50ae451" +SRC_URI[sha256sum] = "736e8d1ce65c09cb435fbbb500d53dc75f4d6e93bd325d22adc890951cf56337" S = "${WORKDIR}/fuse-${PV}" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.9.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.10.0.bb index 48d15cca9..509dbd620 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.9.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.10.0.bb @@ -12,12 +12,12 @@ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ file://0001-support-usrmerge.patch \ " -SRC_URI[sha256sum] = "bc5c805596bc609a18dc1f1b4ed6a2821dba9f47408ec00e7799ceea1b2097f1" +SRC_URI[sha256sum] = "e04017e46d43e4d54b9a560fd7cea922520f8f6ef882404969d20cd4e5c790e9" inherit autotools-brokensep PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" -DEPENDS += "util-linux" +DEPENDS += "util-linux libinih" RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb index f2bc24ea9..bc3e66ca2 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb @@ -13,6 +13,8 @@ SRC_URI[archive.sha256sum] = "ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96 # We don't not have ubuntu's appindicator (yet?) EXTRA_OEMESON = "-Dappindicator=no" +# We currently don't build NetworkManager with libteamdctl support +EXTRA_OEMESON += "-Dteam=false" PACKAGECONFIG ??= "" PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.1.0.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.2.0.bb index 3aaec3cdd..d0a499e6e 100644 --- a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.1.0.bb +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.2.0.bb @@ -11,8 +11,7 @@ SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://0001-Install-polkit-action-unconditionally-executable-pke.patch \ " -SRC_URI[md5sum] = "0da45cb522d766dfb4886fb3bdbc2634" -SRC_URI[sha256sum] = "e2fe7b7afbc07e930491c00a05200c2682cc0576ca8f6da87245a000257f5924" +SRC_URI[sha256sum] = "6c90715d254d7a7ec0208b29007b64160dd9fb7df4c4aa7f8ec2c9d23114c719" DEPENDS += " \ glib-2.0-native \ diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.82.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb index 244b867fa..b49d9d7e8 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.82.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb @@ -15,6 +15,6 @@ CFLAGS_append_toolchain-clang_mipsarch = " -ffp-exception-behavior=ignore " CFLAGS_append_toolchain-clang_riscv64 = " -ffp-exception-behavior=ignore " SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" -SRC_URI[sha256sum] = "c62d93d4ad6774cb8e3231bbbc7f2e61e551e7242d78640d757505ee1a9fadc5" +SRC_URI[sha256sum] = "e7e38b8441f77feb9dc8231cb434a86190a21f2f3692c281457e99d35e9c34ea" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.26.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb index 6ac1e6ca9..810036162 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.26.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb @@ -26,7 +26,7 @@ SRC_URI = " \ https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ " -SRC_URI[sha256sum] = "0f371e2ed2b92162fefd3dde743e648ca08a6a1b2b05004867fbddc7e211e424" +SRC_URI[sha256sum] = "1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900" PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" PACKAGECONFIG_class-native = "libpng librsvg" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch new file mode 100644 index 000000000..7e12487c7 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch @@ -0,0 +1,58 @@ +From 1b66e4cca6d95f4607599bcbdd4afeb601aee84e Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Sun, 25 Oct 2020 18:09:21 +0000 +Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming autoconf-2.70 + +Upcoming autoconf-2.70 exposes deficiency in configure.ac: + +``` +$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu +./configure: line 1430: 5: Bad file descriptor +checking whether is declared... ./configure: line 1432: ${+y}: bad +``` + +It happens because macros are called with parameters using insufficient quoting. + +More details at https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html + +The fix only amends `--with-linux-input`. Other cases of underquoting +will need to be handled separately. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/cebeb90a87105cd6e35bcb357d53cc04c828ca21] +Fix-by: Zack Weinberg +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + configure.ac | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6e2c193..afbcdd8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2138,15 +2138,14 @@ fi + AC_ARG_WITH(linux-input, [ --without-linux-input don't build linux input event controller module]) + + have_linux_input="no (linux input support disabled)" +-if test "x$with_linux_input" != "xno"; then +- AC_CHECK_HEADER(linux/input.h, +- AC_CHECK_DECL(KEY_OK, +- have_linux_input=yes, +- have_linux_input="no (needs Linux 2.6)", +- [#include <linux/input.h>])) +-fi +- +-AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes) ++AS_IF([test "x$with_linux_input" != "xno"], ++ [AC_CHECK_HEADER([linux/input.h], ++ [AC_CHECK_DECL([KEY_OK], ++ [have_linux_input=yes], ++ [have_linux_input="no (needs Linux 2.6)"], ++ [#include <linux/input.h>])])]) ++ ++AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes]) + + + ############################### +-- +2.30.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb index aec1ebf7b..2d75d6011 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb @@ -5,6 +5,11 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" DEPENDS = " \ + alsa-lib \ + atk \ + cairo \ + fontconfig \ + freetype \ gdk-pixbuf-native \ intltool-native \ libxslt-native \ @@ -17,6 +22,7 @@ DEPENDS = " \ mypaint-brushes-1.0 \ gexiv2 \ jpeg \ + libmng \ libpng \ libexif \ tiff \ @@ -37,15 +43,18 @@ REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" -SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" +SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \ + file://0001-configure.ac-fix-with-linux-input-handling-with-upco.patch \ + " SRC_URI[sha256sum] = "2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb" EXTRA_OECONF = "--disable-python \ --without-webkit \ + --disable-check-update \ --without-wmf" EXTRA_OECONF_append_libc-musl_mipsarch = " --disable-vector-icons" -EXTRA_OECONF_append_toolchain-clang_arm = " --disable-vector-icons" +EXTRA_OECONF_append_arm = " --disable-vector-icons" do_configure_append() { find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g diff --git a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch new file mode 100644 index 000000000..28e279438 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch @@ -0,0 +1,32 @@ +From 712a101c9aa2eb8548e4d0100a4a2eaf76fad164 Mon Sep 17 00:00:00 2001 +From: Jesper Lloyd <jpl.lloyd@gmail.com> +Date: Wed, 20 Jan 2021 20:21:53 +0100 +Subject: [PATCH] make build compatible w. autoconf 2.7 + +Workaround for stricter behaviour (due to a bugfix) in 2.7, +which makes a failing intltoolize macro check fail the build. + +Fix provided by hosiet. + +Upstream-Status: Backport [https://github.com/mypaint/libmypaint/commit/a6bac154db018e1f1cc4dbddc34f6c8422c891fb] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 416d9fe..48b9d02 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -248,7 +248,7 @@ if test "x$enable_i18n" != "xno"; then + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The prefix for our gettext translation domains.]) + AC_SUBST(GETTEXT_PACKAGE) +- IT_PROG_INTLTOOL ++IT_PROG_INTLTOOL + AM_GLIB_GNU_GETTEXT + + dnl Debian: stdlib +-- +2.30.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb index 37d41780d..e711a2a7f 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb @@ -12,7 +12,9 @@ DEPENDS = " \ inherit autotools gobject-introspection gettext python3native -SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1" +SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1 \ + file://0001-make-build-compatible-w.-autoconf-2.7.patch \ + " SRCREV = "2768251dacce3939136c839aeca413f4aa4241d0" PV = "1.6.1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch new file mode 100644 index 000000000..46831429d --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch @@ -0,0 +1,32 @@ +From 9ab5acb902a38b420592931ec9e46ccd0624035a Mon Sep 17 00:00:00 2001 +From: Ondrej Holy <oholy@redhat.com> +Date: Wed, 13 Jan 2021 13:22:58 +0100 +Subject: [PATCH] Drop use of volatile + +The `fedora rawhide` CI job currently fails because of usage of the +`volatile` qualifier. Let's drop the `volatile` qualifier as it doesn't +help anyway. It was dropped in GLib as well, see: +https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719 + +Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/1741 +--- +Upstream-Status: Backport [https://github.com/GNOME/nautilus/commit/9b733dd9df9d6d9805c56749d05ada15a7560ef4] + src/nautilus-enum-types.c.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nautilus-enum-types.c.template b/src/nautilus-enum-types.c.template +index 00155ca..9d8ac83 100644 +--- a/src/nautilus-enum-types.c.template ++++ b/src/nautilus-enum-types.c.template +@@ -13,7 +13,7 @@ + GType + @enum_name@_get_type (void) + { +- static volatile GType type_once = 0; ++ static GType type_once = 0; + + if (g_once_init_enter (&type_once)) + { +-- +2.30.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb index fc9ab379d..cf138d973 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb @@ -17,6 +17,7 @@ DEPENDS = " \ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check upstream-version-is-even mime-xdg +SRC_URI += "file://0001-Drop-use-of-volatile.patch" SRC_URI[archive.md5sum] = "c3c8dbb90d8eeed6c127aa568e131395" SRC_URI[archive.sha256sum] = "b6cafc7ab1e70a64383de391b6097fcccbf36b208f8502d8c46423224fd30ef8" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb index 6b9d769b7..14a885056 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb @@ -16,6 +16,6 @@ SRC_URI[archive.sha256sum] = "4fe51c0233b79a4c204c68498d45f09b342c30ed02c4e41850 RDEPENDS_${PN}_append_class-target = " libxml2 itstool" # ensure our native consumers are forced to inherit itstool -RDEPENDS_${PN}_append_class-native = " libxml2" +RDEPENDS_${PN}_append_class-native = " libxml2-native" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/files/0001-make-Add-compiler-includes-in-cflags.patch b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/files/0001-make-Add-compiler-includes-in-cflags.patch new file mode 100644 index 000000000..931d0fa58 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/files/0001-make-Add-compiler-includes-in-cflags.patch @@ -0,0 +1,31 @@ +From 528a64d17488295299dad9fbfe3d7140bc1cfdfa Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 6 Feb 2021 11:06:48 -0800 +Subject: [PATCH] make: Add compiler includes in cflags + +Fixes +| In file included from /mnt/b/yoe/master/build/tmp/work/raspberrypi4_64-yoe-linux/kexecboot-klibc/0.6+gitAUTOINC+5a5e04be20-r0/recipe-sysroot/usr/lib/klibc/include/stdio.h:11: +| /mnt/b/yoe/master/build/tmp/work/raspberrypi4_64-yoe-linux/kexecboot-klibc/0.6+gitAUTOINC+5a5e04be20-r0/recipe-sysroot/usr/lib/klibc/include/stdarg.h:9:15: fatal error: 'stdarg.h' file not found +| #include_next <stdarg.h> +| ^~~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index c75df23..d2adf38 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,6 +1,6 @@ + bin_PROGRAMS=kexecboot + +-kexecboot_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) ++kexecboot_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) -I$(shell $(CC) -print-file-name=include) + + kexecboot_SOURCES = \ + util.c \ +-- +2.30.0 + diff --git a/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb index 2f46fa952..ad9ccd02c 100644 --- a/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb @@ -6,8 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PV = "0.6+git${SRCPV}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/kexecboot/kexecboot.git" -SRC_URI_append_libc-klibc = " file://0001-kexecboot-Use-new-reboot-API-with-klibc.patch " - +SRC_URI_append_libc-klibc = "\ + file://0001-kexecboot-Use-new-reboot-API-with-klibc.patch \ + file://0001-make-Add-compiler-includes-in-cflags.patch \ +" SRCREV = "5a5e04be206140059f42ac786d424da1afaa04b6" inherit autotools diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch deleted file mode 100644 index eee144dc4..000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 241f423a015279cb29b7ad1a34386ef1c32007fc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 Dec 2018 16:47:16 -0800 -Subject: [PATCH] Define ulocked_{fgets|fread|fwrite} aliases - -latest clang converts the normal calls to the unlocked variant -equivalents - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Cc: Andrea Adami <andrea.adami@gmail.com> ---- - usr/klibc/fgets.c | 2 ++ - usr/klibc/fread2.c | 2 ++ - usr/klibc/fwrite2.c | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/usr/klibc/fgets.c b/usr/klibc/fgets.c -index dbf742c6..2e9fcb65 100644 ---- a/usr/klibc/fgets.c -+++ b/usr/klibc/fgets.c -@@ -25,3 +25,5 @@ char *fgets(char *s, int n, FILE *f) - - return s; - } -+char *fgets_unlocked(char *s, int n, FILE *f) -+ __alias("fgets"); -diff --git a/usr/klibc/fread2.c b/usr/klibc/fread2.c -index 7dca56b1..5c234766 100644 ---- a/usr/klibc/fread2.c -+++ b/usr/klibc/fread2.c -@@ -11,3 +11,5 @@ size_t fread(void *ptr, size_t size, size_t nmemb, FILE * f) - { - return _fread(ptr, size * nmemb, f) / size; - } -+size_t fread_unlocked(void *ptr, size_t size, size_t nmemb, FILE *f) -+ __alias("fread"); -diff --git a/usr/klibc/fwrite2.c b/usr/klibc/fwrite2.c -index cebc017c..3e0bb57d 100644 ---- a/usr/klibc/fwrite2.c -+++ b/usr/klibc/fwrite2.c -@@ -11,3 +11,5 @@ size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE * f) - { - return _fwrite(ptr, size * nmemb, f) / size; - } -+size_t fwrite_unlocked(void *ptr, size_t size, size_t nmemb, FILE *f) -+ __alias("fwrite"); --- -2.19.2 - diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch deleted file mode 100644 index 181dcfb6d..000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4b4147b76518d31a88fb2c58cdbf2236e159a25c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Sep 2017 23:10:54 -0700 -Subject: [PATCH] Kbuild.klibc: Add path to compiler headers via -isystem - -We need to include this path so it can find compiler headers e.g. -stdarg.h which is called from wrapper stdarg.h using include_next - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - scripts/Kbuild.klibc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc -index 101f86f..1d5cdc4 100644 ---- a/scripts/Kbuild.klibc -+++ b/scripts/Kbuild.klibc -@@ -105,7 +105,8 @@ KLIBCOBJCOPY := $(OBJCOPY) - KLIBCOBJDUMP := $(OBJDUMP) - - # klibc include paths --KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ -+KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ -+ -isystem $(shell $(CC) -print-file-name=include) \ - -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ - -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ - -I$(KLIBCOBJ)/../include \ diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch deleted file mode 100644 index 1ba05a811..000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b6185401fc3daa7fa8ba2b84db3e4da3b94a9867 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 26 Jul 2017 16:13:16 -0700 -Subject: [PATCH] Kbuild.klibc: Use -print-libgcc-file-name instead of - --print-libgcc - --print-libgcc-file-name works with clang and gcc unlike --print-libgcc -which is gcc specific - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - scripts/Kbuild.klibc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc -index f500d53..101f86f 100644 ---- a/scripts/Kbuild.klibc -+++ b/scripts/Kbuild.klibc -@@ -128,7 +128,7 @@ KLIBCCFLAGS += $(KLIBCCPPFLAGS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS) \ - KLIBCAFLAGS += -D__ASSEMBLY__ $(KLIBCCFLAGS) - KLIBCSTRIPFLAGS += --strip-all -R .comment -R .note - --KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-libgcc) -+KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) -print-libgcc-file-name) - KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) - KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o - KLIBCLIBC := $(KLIBCOBJ)/libc.a diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch index fcf4f891a..ea14c49f0 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch @@ -14,8 +14,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> usr/klibc/arch/arm/MCONFIG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG -index 303c6ac..48d2685 100644 --- a/usr/klibc/arch/arm/MCONFIG +++ b/usr/klibc/arch/arm/MCONFIG @@ -10,7 +10,7 @@ diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch index 94818e366..15b5144e4 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch @@ -12,11 +12,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> usr/klibc/Kbuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild -index 98caf2e9..b34521e0 100644 --- a/usr/klibc/Kbuild +++ b/usr/klibc/Kbuild -@@ -168,7 +168,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash +@@ -183,7 +183,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash targets += interp.o quiet_cmd_interp = BUILD $@ @@ -25,4 +23,4 @@ index 98caf2e9..b34521e0 100644 + -D__ASSEMBLY__ \ -DLIBDIR=\"$(SHLIBDIR)\" \ -DSOHASH=\"$(SOLIBHASH)\" \ - -c -o $@ $< + $(KLIBCSTACKFLAGS) \ diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch index 0768f6d51..f096486d0 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch @@ -10,11 +10,9 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> usr/klibc/SYSCALLS.def | 1 + 1 file changed, 1 insertion(+) -diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def -index 6b3bf4c..d4184ba 100644 --- a/usr/klibc/SYSCALLS.def +++ b/usr/klibc/SYSCALLS.def -@@ -274,6 +274,7 @@ int syslog::klogctl(int, char *, int); +@@ -275,6 +275,7 @@ int syslog::klogctl(int, char *, int); int sysinfo(struct sysinfo *); long kexec_load(void *, unsigned long, struct kexec_segment *, unsigned long); <x86_64,ppc64,s390x> long kexec_file_load(int, int, unsigned long, const char *, unsigned long); @@ -22,6 +20,3 @@ index 6b3bf4c..d4184ba 100644 /* * Low-level I/O (generally architecture-specific); --- -2.7.4 - diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch index 3d8d987c4..b03fb9126 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch @@ -10,11 +10,9 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> usr/klibc/SYSCALLS.def | 1 + 1 file changed, 1 insertion(+) -diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def -index c56e8f9..6b3bf4c 100644 --- a/usr/klibc/SYSCALLS.def +++ b/usr/klibc/SYSCALLS.def -@@ -273,6 +273,7 @@ int reboot::__reboot(int, int, int, void *); +@@ -274,6 +274,7 @@ int reboot::__reboot(int, int, int, void int syslog::klogctl(int, char *, int); int sysinfo(struct sysinfo *); long kexec_load(void *, unsigned long, struct kexec_segment *, unsigned long); @@ -22,6 +20,3 @@ index c56e8f9..6b3bf4c 100644 /* * Low-level I/O (generally architecture-specific); --- -2.7.4 - diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-workaround-for-overlapping-sections-in-binary.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-workaround-for-overlapping-sections-in-binary.patch new file mode 100644 index 000000000..8ccfe447e --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-workaround-for-overlapping-sections-in-binary.patch @@ -0,0 +1,52 @@ +From 911130ce429cbf6a92d0fbd17f0ff638ec941df2 Mon Sep 17 00:00:00 2001 +From: Petr Ovtchenkov <ptr@void-ptr.info> +Date: Sun, 7 Feb 2021 00:04:36 -0800 +Subject: [PATCH] workaround for overlapping sections in binary + +Problem: binary (typesize.bin) created from object file (typesize.o) +with 'objcopy -O binary ... '. But typesize.o has relocatable objects that all +copied with offset 0. This will lead to overlapping sections in binary. +By fortunate syscalls.pl check magic bytes and ring the bell. + +This is naive workaround: skip .note.gnu.property section that overlap +.rodata section. + +This not a bug of objcopy, https://sourceware.org/bugzilla/show_bug.cgi?id=27314 + +Related commit: + + commit de6f630e6be90d6d32d8bf2fed3f856b0c32f7ba + Author: H. Peter Anvin <hpa at zytor.com> + Date: Sat Jun 10 11:15:19 2006 -0700 + + [klibc] Detect the sizes of various types, and make available to sysstub.ph. + + This additional code effectively queries the C compiler for the sizes of + various types, and makes an associative array %typesize available to + sysstub.ph. This is currently not used, but it's expected that some + architectures, e.g. s390, will need this to determine which registers + go where, and how many registers are needed. + +Upstream-Status: Submitted [https://lists.zytor.com/archives/klibc/2021-February/004583.html] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + usr/klibc/syscalls/Kbuild | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/klibc/syscalls/Kbuild b/usr/klibc/syscalls/Kbuild +index 2430b9b4..754d028e 100644 +--- a/usr/klibc/syscalls/Kbuild ++++ b/usr/klibc/syscalls/Kbuild +@@ -71,7 +71,7 @@ $(obj)/typesize.c: $(srctree)/$(KLIBCSRC)/syscalls.pl $(obj)/SYSCALLS.i \ + + # Convert typesize.o to typesize.bin + quiet_cmd_mkbin = OBJCOPY $@ +- cmd_mkbin = $(KLIBCOBJCOPY) -O binary $< $@ ++ cmd_mkbin = $(KLIBCOBJCOPY) -O binary --remove-section .note.gnu.property $< $@ + + $(obj)/typesize.bin: $(obj)/typesize.o FORCE + $(call if_changed,mkbin) +-- +2.30.0 + diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch new file mode 100644 index 000000000..69799c5c7 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch @@ -0,0 +1,24 @@ +--- a/scripts/Kbuild.klibc ++++ b/scripts/Kbuild.klibc +@@ -113,10 +113,8 @@ KLIBCCPPFLAGS := -nostdinc -iwithpref + -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ + -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ + -I$(KLIBCOBJ)/../include \ +- -I$(KLIBCINC) +-ifeq ($(cc-name),clang) +-KLIBCCPPFLAGS += -I$(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-file-name=include) +-endif ++ -I$(KLIBCINC) \ ++ -I$(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-file-name=include) + + # kernel include paths + KLIBCKERNELSRC ?= $(srctree) +@@ -137,7 +135,7 @@ KLIBCCFLAGS += $(KLIBCCPPFLAGS) $(K + KLIBCAFLAGS += -D__ASSEMBLY__ $(KLIBCCFLAGS) + KLIBCSTRIPFLAGS += --strip-all -R .comment -R .note + +-KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) $(if $(filter gcc,$(cc-name)),--print-libgcc,--print-libgcc-file-name)) ++KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-libgcc-file-name) + KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) + KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o + KLIBCLIBC := $(KLIBCOBJ)/libc.a diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch index 3b7031e98..56905a515 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch @@ -5,10 +5,22 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/klcc/klcc.in +++ b/klcc/klcc.in -@@ -207,6 +207,12 @@ while ( defined($a = shift(@ARGV)) ) { +@@ -207,6 +207,24 @@ while ( defined($a = shift(@ARGV)) ) { } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) { # Override gcc encoded sysroot push(@ccopt, $a); ++ } elsif ( $a eq '-nostartfiles' ) { ++ # Allow clang options ++ push(@ccopt, $a); ++ } elsif ( $a eq '-nostdlib' ) { ++ # Allow clang options ++ push(@ccopt, $a); ++ } elsif ( $a eq '-nodefaultlibs' ) { ++ # Allow clang options ++ push(@ccopt, $a); ++ } elsif ( $a eq '-no-pie' ) { ++ # Allow clang options ++ push(@ccopt, $a); + } elsif ( $a eq '-no-integrated-as' ) { + # Allow clang options + push(@ccopt, $a); diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch index eac128cc0..597382488 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch @@ -10,8 +10,6 @@ that /usr/bin/env perl will always return ours (if it has been built). Signed-off-by: Tom Rini <tom_rini@mentor.com> -Index: klibc-1.5.20/klcc/makeklcc.pl -=================================================================== --- a/klcc/makeklcc.pl +++ b/klcc/makeklcc.pl @@ -26,7 +26,7 @@ sub pathsearch($) { diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.7.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.8.bb index 4011aa231..4011aa231 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.7.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.8.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.7.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.8.bb index c835fd647..c835fd647 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.7.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.8.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.7.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.8.bb index 06e71cb7b..06e71cb7b 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.7.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.8.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc index 243107e9a..41147eb2d 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -15,13 +15,12 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/klibc/2.0/klibc-${PV}.tar.xz \ file://0001-include-linux-sysinfo.h-directly.patch \ file://0001-mkfifo-Implement-mkfifo.patch \ file://0001-always-use-bfd-linker.patch \ - file://0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch \ - file://0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch \ file://0001-arm-Do-not-set-a-fallback-march-and-mtune.patch \ file://0001-klibc_2.0.4-add-kexec_file_load-syscall.patch \ file://0001-klibc-add-getrandom-syscall.patch \ file://0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch \ - file://0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch \ + file://cross-clang.patch \ + file://0001-workaround-for-overlapping-sections-in-binary.patch \ " ARMPATCHES ?= "" @@ -29,9 +28,7 @@ ARMPATCHES ?= "" ARMPATCHES_arm = " \ file://armv4-fix-v4bx.patch \ " - -SRC_URI[md5sum] = "712f8bc1a069e03d92584b7f5380c521" -SRC_URI[sha256sum] = "abef2637ca823485d9c90ce9512e2b08a65047ec4da204635eeaef95a41a9122" +SRC_URI[sha256sum] = "4e48f1398cfe3ce0b6df55ce6e70acf54fc8488e3aea3fb3610ee1622d9cb436" S = "${WORKDIR}/klibc-${PV}" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.7.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.8.bb index 7df0b0a3d..7df0b0a3d 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.7.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.8.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-make-Add-compiler-includes-in-cflags.patch b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-make-Add-compiler-includes-in-cflags.patch new file mode 100644 index 000000000..778d83012 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-make-Add-compiler-includes-in-cflags.patch @@ -0,0 +1,32 @@ +From 884ec4c654f1d07a387fdc1dae5640606369f254 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 6 Feb 2021 10:56:36 -0800 +Subject: [PATCH] make: Add compiler includes in cflags + +Fixes + In file included from ../git/ubi-utils/ubiformat.c:47: +| ../git/include/common.h:22:10: fatal error: 'stdbool.h' file not found +| #include <stdbool.h> +| ^~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index 5a6e77c..f0003d5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -9,6 +9,7 @@ endif + if WITHOUT_LZO + AM_CPPFLAGS += -DWITHOUT_LZO + endif ++AM_CPPFLAGS += -I$(shell $(CC) -print-file-name=include) + + sbin_PROGRAMS = + sbin_SCRIPTS = +-- +2.30.0 + diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb index d32238162..5f43b0229 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb @@ -16,6 +16,7 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git \ file://0003-Makefile.am-only-build-ubi-utils.patch \ file://0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch \ file://0005-common.h-replace-getline-with-fgets.patch \ + file://0001-make-Add-compiler-includes-in-cflags.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch index 5bbb178bc..07fa841cc 100644 --- a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch +++ b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch @@ -10,11 +10,9 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> purgatory/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/purgatory/Makefile b/purgatory/Makefile -index 49ce80a..1542b3a 100644 --- a/purgatory/Makefile +++ b/purgatory/Makefile -@@ -47,7 +47,7 @@ purgatory/sha256.o: $(srcdir)/util_lib/sha256.c +@@ -47,7 +47,7 @@ purgatory/sha256.o: $(srcdir)/util_lib/s $(PURGATORY): CC=$(TARGET_CC) $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \ $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ @@ -23,14 +21,14 @@ index 49ce80a..1542b3a 100644 -fno-zero-initialized-in-bss \ -fno-PIC -fno-PIE -fno-stack-protector -@@ -59,8 +59,8 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ +@@ -59,8 +59,8 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATO -Iinclude \ -I$(shell $(CC) -print-file-name=include) $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ - -Wl,--no-undefined -nostartfiles -nostdlib \ - -nodefaultlibs -e purgatory_start -r \ -+ -Wl,--no-undefined -Wl,-no-pie -Wl,-nostartfiles -Wl,-nostdlib \ -+ -Wl,-nodefaultlibs -Wl,--entry=purgatory_start -Wl,-r \ ++ -Wl,--no-undefined -no-pie -nostartfiles -nostdlib \ ++ -nodefaultlibs -Wl,--entry=purgatory_start -Wl,-r \ -Wl,-Map=$(PURGATORY_MAP) $(PURGATORY): $(PURGATORY_OBJS) diff --git a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/include_next.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/include_next.patch new file mode 100644 index 000000000..d4fbd1436 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/include_next.patch @@ -0,0 +1,22 @@ +--- a/kexec/Makefile ++++ b/kexec/Makefile +@@ -110,7 +110,7 @@ $(KEXEC): $(KEXEC_OBJS) $(UTIL_LIB) + @$(MKDIR) -p $(@D) + $(LINK.o) -o $@ $^ $(CFLAGS) $(LIBS) + +-$(KEXEC): CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH)/include ++$(KEXEC): CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH)/include -I$(shell $(CC) -print-file-name=include) + + kexec/fs2dt.o: CPPFLAGS+=$($(ARCH)_FS2DT_INCLUDE) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -46,7 +46,7 @@ TARGET_CFLAGS = @TARGET_CFLAGS@ + # Base compiler flags. These are extended by the subcomponent-Makefiles + # where necessary. + CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -I$(srcdir)/util_lib/include \ +- -Iinclude/ $($(ARCH)_CPPFLAGS) ++ -Iinclude/ $($(ARCH)_CPPFLAGS) -I$(shell $(CC) -print-file-name=include) + CFLAGS = @CFLAGS@ -static -fno-strict-aliasing -Wall -Wstrict-prototypes + PURGATORY_EXTRA_CFLAGS = @PURGATORY_EXTRA_CFLAGS@ + ASFLAGS = @ASFLAGS@ $($(ARCH)_ASFLAGS) diff --git a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb index d28cfc90f..c49b24f52 100644 --- a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb @@ -32,7 +32,9 @@ KLIBC_PATCHES += " \ file://0013-sha256.h-avoid-inclusion-of-sys-types.h.patch \ file://0014-add-if_nameindex-from-musl.patch \ file://0015-vmcore-dmesg-fix-warning.patch \ - file://klibc-reboot.patch" + file://klibc-reboot.patch \ + file://include_next.patch \ + " WARNING_FIXES = "" FROM_OE_CORE = "file://arm_crashdump-fix-buffer-align.patch \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb index c5ad1f806..1ad457710 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb @@ -18,3 +18,5 @@ DEPENDS = " yasm-native" EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=1 -DENABLE_TESTS=0 \ -DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl \ " + +EXTRA_OECMAKE_append_arm = " ${@bb.utils.contains("TUNE_FEATURES","neon","-DENABLE_NEON=ON","-DENABLE_NEON=OFF",d)}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb index f354ef387..977a9e792 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb @@ -20,6 +20,8 @@ inherit perlnative export enable_static="no" +export PERL_USE_UNSAFE_INC = "1" + do_configure() { sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh } diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 847a22311..74a2683ac 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.1.x" -SRCREV = "fd9bf6a6b0d10a984d2eb0e0e549700b7aa590ec" +SRCREV = "e2d67ea77237046b703d537aec90620c22f7f629" S = "${WORKDIR}/git" -PV = "2.1.6" +PV = "2.1.7" inherit cmake pkgconfig lib_package diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch new file mode 100644 index 000000000..f3197f937 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch @@ -0,0 +1,32 @@ +From 5719ed8ce9ba60beb9c1670b49296b1c66430dc2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Mar 2021 12:57:37 -0800 +Subject: [PATCH] include <optional> header + +Fixes build with gcc11 +/src/util/tools.h:165:6: error: 'optional' in na +mespace 'std' does not name a template type +| 165 | std::optional<std::vector<std::byte>> readBinaryFile(const fs::path& path); +| | ^~~~~~~~ + +Upstream-Status: Submitted [https://github.com/gerbera/gerbera/pull/1273] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/util/tools.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/util/tools.h b/src/util/tools.h +index 3a4064e9..e5142966 100644 +--- a/src/util/tools.h ++++ b/src/util/tools.h +@@ -37,6 +37,7 @@ + #include <sstream> + #include <string> + #include <unordered_set> ++#include <optional> + #include <vector> + namespace fs = std::filesystem; + +-- +2.30.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.6.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb index 7f2674183..d4242aa06 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.6.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb @@ -4,9 +4,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https \ -" + file://0001-include-optional-header.patch \ + " -SRCREV = "b219e22f09e346dd048f614a01ca2cbc55edd940" +SRCREV = "7bc33b98994411e1748d3b3fa9a8424c49e236d6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb index d047caef5..94d05def3 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb @@ -10,9 +10,9 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad " SRCBRANCH ?= "master" -PV = "0.6.1" +PV = "0.7.2" -SRCREV_base = "c41a05cc9e2310c2f73eda4b4f0b4477bf4479c5" +SRCREV_base = "50e3dbd3b131de2a39d3917576e8f834631ec46b" SRCREV_common = "88e512ca7197a45c4114f7fa993108f23245bf50" SRC_URI = " \ @@ -22,7 +22,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" -PACKAGECONFIG_CONFARGS = " \ +EXTRA_OECONF += " \ --disable-graphviz \ --enable-gtk-doc=no \ " @@ -33,8 +33,3 @@ FILES_${PN} += "\ " inherit autotools gettext - -do_configure() { - ${S}/autogen.sh --noconfigure - oe_runconf -} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index 5505626d3..b05df3210 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -10,15 +10,16 @@ LIC_FILES_CHKSUM = "\ SRC_URI = " \ git://linuxtv.org/libcamera.git;protocol=git \ + file://0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch \ " -SRCREV = "1e8c91b65695449c5246d17ba7dc439c8058b781" +SRCREV = "f490a87fd339fc7443f5d8467ba56a35c750a5f7" -PV = "202008+git${SRCPV}" +PV = "202102+git${SRCPV}" S = "${WORKDIR}/git" -DEPENDS = "python3-pyyaml-native udev gnutls boost chrpath-native" +DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls boost chrpath-native" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}" PACKAGES =+ "${PN}-gst" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch new file mode 100644 index 000000000..4ca412c69 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch @@ -0,0 +1,38 @@ +From 767267ef69c001870d41caf9c60dd7fec89b0a13 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 3 Mar 2021 15:11:46 -0800 +Subject: [PATCH] uvcvideo: Use auto variable to avoid range loop warnings + +With c++17 loop range bases are defined where copy is obvious since +iterator returns a copy and not reference, gcc11 will emit a warning +about this + +uvcvideo.cpp:432:33: error: loop variable 'name' of type 'const string&' {aka 'const std::__cxx11::basic_string<cha +r>&'} binds to a temporary constructed from type 'const char* const' [-Werror=range-loop-construct] +| 432 | for (const std::string &name : { "idVendor", "idProduct" }) { +| | ^~~~ + +Therefore making it explicit is better + +Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2021-March/017966.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +index 031f96e2..ef23ece7 100644 +--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp ++++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +@@ -429,7 +429,7 @@ std::string PipelineHandlerUVC::generateId(const UVCCameraData *data) + + /* Creata a device ID from the USB devices vendor and product ID. */ + std::string deviceId; +- for (const std::string &name : { "idVendor", "idProduct" }) { ++ for (const auto name : { "idVendor", "idProduct" }) { + std::ifstream file(path + "/../" + name); + + if (!file.is_open()) +-- +2.30.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-StringBuffer-Include-cstddef-for-size_t.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-StringBuffer-Include-cstddef-for-size_t.patch deleted file mode 100644 index 1d869aa83..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-StringBuffer-Include-cstddef-for-size_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c14877071f14b218835f7fb034dea11bd1ba56f5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 25 Dec 2019 09:40:16 -0800 -Subject: [PATCH] StringBuffer: Include cstddef for size_t - -Fixes -a.cpp:3:1: error: 'size_t' does not name a type - 3 | size_t s; - | ^~~~~~ -a.cpp:2:1: note: 'size_t' is defined in header '<cstddef>'; did you forget to '#include <cstddef>'? - -Upstream-Status: Submitted [https://github.com/MusicPlayerDaemon/MPD/pull/697] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/util/StringBuffer.hxx | 1 + - 1 file changed, 1 insertion(+) - ---- a/src/util/StringBuffer.hxx -+++ b/src/util/StringBuffer.hxx -@@ -31,6 +31,7 @@ - #define STRING_BUFFER_HPP - - #include <array> -+#include <cstddef> - - /** - * A statically allocated string buffer. diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0002-Include-stdexcept-for-runtime_error.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0002-Include-stdexcept-for-runtime_error.patch deleted file mode 100644 index 1f1186719..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0002-Include-stdexcept-for-runtime_error.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 06f78ced45f6622a2e02cd09e6a2c0c22a98b89e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 25 Dec 2019 09:41:55 -0800 -Subject: [PATCH 2/2] Include <stdexcept> for runtime_error - -Fixes - -../git/src/LocateUri.cxx:65:14: error: 'runtime_error' is not a member of 'std' - 65 | throw std::runtime_error("Unsupported URI scheme"); - | ^~~~~~~~~~~~~ - -Upstream-Status: Inappropriate [ Fixed differently upstream ] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/LocateUri.cxx | 1 + - src/pcm/PcmConvert.cxx | 1 + - 2 files changed, 2 insertions(+) - ---- a/src/LocateUri.cxx -+++ b/src/LocateUri.cxx -@@ -17,6 +17,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#include <stdexcept> - #include "config.h" - #include "LocateUri.hxx" - #include "client/Client.hxx" ---- a/src/pcm/PcmConvert.cxx -+++ b/src/pcm/PcmConvert.cxx -@@ -17,6 +17,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#include <stdexcept> - #include "config.h" - #include "PcmConvert.hxx" - #include "ConfiguredResampler.hxx" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb deleted file mode 100644 index b214672c6..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb +++ /dev/null @@ -1,103 +0,0 @@ -SUMMARY = "Music Player Daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -LICENSE_FLAGS = "${@bb.utils.contains_any('PACKAGECONFIG', ['ffmpeg', 'aac'], 'commercial', '', d)}" - -HOMEPAGE ="http://www.musicpd.org" - -inherit autotools useradd systemd pkgconfig - -DEPENDS += " \ - curl \ - sqlite3 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ - yajl \ - boost \ - icu \ - dbus \ - expat \ -" - -SRC_URI = " \ - git://github.com/MusicPlayerDaemon/MPD;branch=v0.20.x \ - file://mpd.conf.in \ - file://0001-StringBuffer-Include-cstddef-for-size_t.patch \ - file://0002-Include-stdexcept-for-runtime_error.patch \ -" -SRCREV = "9274bc15bc41bbe490fde847f8422468cc20375d" -S = "${WORKDIR}/git" - -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" - -PACKAGECONFIG ??= "aac alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 jack libsamplerate libwrap httpd mms mpg123 modplug sndfile upnp openal opus oss recorder vorbis wavpack zlib" - -PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,faad2" -PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" -PACKAGECONFIG[ao] = "--enable-ao,--disable-ao,libao" -PACKAGECONFIG[audiofile] = "--enable-audiofile,--disable-audiofile,audiofile" -PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" -PACKAGECONFIG[cdioparanoia] = "--enable-cdio-paranoia,--disable-cdio-paranoia,libcdio-paranoia" -PACKAGECONFIG[daemon] = "--enable-daemon,--disable-daemon" -PACKAGECONFIG[ffmpeg] = "--enable-ffmpeg,--disable-ffmpeg,ffmpeg" -PACKAGECONFIG[fifo] = "--enable-fifo,--disable-fifo" -PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" -PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" -PACKAGECONFIG[httpd] = "--enable-httpd-output,--disable-httpd-output" -PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" -PACKAGECONFIG[iso9660] = "--enable-iso9660,--disable-iso9660,libcdio" -PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" -PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame" -PACKAGECONFIG[libsamplerate] = "--enable-lsr,--disable-lsr,libsamplerate0" -PACKAGECONFIG[libwrap] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" -PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" -PACKAGECONFIG[mms] = "--enable-mms,--disable-mms,libmms" -PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" -PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" -PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" -PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus libogg" -PACKAGECONFIG[oss] = "--enable-oss,--disable-oss," -PACKAGECONFIG[recorder] = "--enable-recorder-output,--disable-recorder-output" -PACKAGECONFIG[smb] = "--enable-smbclient,--disable-smbclient,samba" -PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" -PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" -PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" -PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" -PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" - -do_configure_prepend() { - sed -i -e 's|libsystemd-daemon|libsystemd|' ${S}/configure.ac -} - -do_install_append() { - install -o mpd -d \ - ${D}/${localstatedir}/lib/mpd \ - ${D}/${localstatedir}/lib/mpd/playlists - install -m775 -o mpd -g mpd -d \ - ${D}/${localstatedir}/lib/mpd/music - - install -d ${D}/${sysconfdir} - install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf - sed -i \ - -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ - -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ - -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ - -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ - -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ - ${D}/${sysconfdir}/mpd.conf - - # we don't need the icon - rm -rf ${D}${datadir}/icons -} - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "mpd.socket" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = " \ - --system --no-create-home \ - --home ${localstatedir}/lib/mpd \ - --groups audio \ - --user-group mpd" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb new file mode 100644 index 000000000..e91bb5d97 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb @@ -0,0 +1,96 @@ +SUMMARY = "Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +LICENSE_FLAGS = "${@bb.utils.contains_any('PACKAGECONFIG', ['ffmpeg', 'aac'], 'commercial', '', d)}" + +HOMEPAGE ="http://www.musicpd.org" + +inherit meson useradd systemd pkgconfig + +DEPENDS += " \ + curl \ + sqlite3 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ + yajl \ + boost \ + icu \ + dbus \ + expat \ +" + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/MPD;branch=v0.22.x \ + file://mpd.conf.in \ +" +SRCREV = "938728820b11d4544a071994fe3c63c6ab710e8e" +S = "${WORKDIR}/git" + +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" + +PACKAGECONFIG ??= "aac alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 jack libsamplerate httpd mms mpg123 modplug sndfile upnp openal opus oss recorder vorbis wavpack zlib" + +PACKAGECONFIG[aac] = "-Dfaad=enabled,-Dfaad=disabled,faad2" +PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" +PACKAGECONFIG[ao] = "-Dao=enabled,-Dao=disabled,libao" +PACKAGECONFIG[audiofile] = "-Daudiofile=enabled,-Daudiofile=disabled,audiofile" +PACKAGECONFIG[bzip2] = "-Dbzip2=enabled,-Dbzip2=disabled,bzip2" +PACKAGECONFIG[cdioparanoia] = "-Dcdio_paranoia=enabled,-Dcdio_paranoia=disabled,libcdio-paranoia" +PACKAGECONFIG[daemon] = "-Ddaemon=true,-Ddaemon=false" +PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" +PACKAGECONFIG[fifo] = "-Dfifo=true,-Dfifo=false" +PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" +PACKAGECONFIG[fluidsynth] = "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth" +PACKAGECONFIG[httpd] = "-Dhttpd=true,-Dhttpd=false" +PACKAGECONFIG[id3tag] = "-Did3tag=enabled,-Did3tag=disabled,libid3tag" +PACKAGECONFIG[iso9660] = "-Diso9660=enabled,-Diso9660=disabled,libcdio" +PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" +PACKAGECONFIG[lame] = "-Dlame=enabled,-Dlame=disabled,lame" +PACKAGECONFIG[libsamplerate] = "-Dlibsamplerate=enabled,-Dlibsamplerate=disabled,libsamplerate0" +PACKAGECONFIG[mad] = "-Dmad=enabled,-Dmad=disabled,libmad" +PACKAGECONFIG[mms] = "-Dmms=enabled,-Dmms=disabled,libmms" +PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug" +PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" +PACKAGECONFIG[openal] = "-Dopenal=enabled,-Dopenal=disabled,openal-soft" +PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus libogg" +PACKAGECONFIG[oss] = "-Doss=enabled,-Doss=disabled," +PACKAGECONFIG[recorder] = "-Drecorder=true,-Drecorder=false" +PACKAGECONFIG[smb] = "-Dsmbclient=enabled,-Dsmbclient=disabled,samba" +PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" +PACKAGECONFIG[upnp] = "-Dupnp=enabled,-Dupnp=disabled,libupnp" +PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis libogg" +PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" +PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib" + +do_install_append() { + install -o mpd -d \ + ${D}/${localstatedir}/lib/mpd \ + ${D}/${localstatedir}/lib/mpd/playlists + install -m775 -o mpd -g mpd -d \ + ${D}/${localstatedir}/lib/mpd/music + + install -d ${D}/${sysconfdir} + install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf + sed -i \ + -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ + -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ + -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ + -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ + -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ + ${D}/${sysconfdir}/mpd.conf + + # we don't need the icon + rm -rf ${D}${datadir}/icons +} + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "mpd.socket" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = " \ + --system --no-create-home \ + --home ${localstatedir}/lib/mpd \ + --groups audio \ + --user-group mpd" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.38.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.45.bb index ebf5d290b..c089b64ed 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.38.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.45.bb @@ -11,6 +11,8 @@ DEPENDS += " \ libmpdclient \ " +RDEPENDS_${PN} += "python3-core" + PACKAGECONFIG ??= "colors locale mouse nls regex help_screen library_screen search_screen song_screen key_screen lyrics_screen outputs_screen" PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false" @@ -33,5 +35,5 @@ PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" SRC_URI = " \ git://github.com/MusicPlayerDaemon/ncmpc \ " -SRCREV = "2c71add42152072c5e0490de2870315dfb3b71e1" +SRCREV = "6780ec072f1d314f44ed77efdc58d03c6fbcc96b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb index bcb3015f8..bcb3015f8 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.22.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.22.bb new file mode 100644 index 000000000..b54be7f89 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.22.bb @@ -0,0 +1,273 @@ +SUMMARY = "Multimedia processing server for Linux" +DESCRIPTION = "Linux server for handling and routing audio and video streams between applications and multimedia I/O devices" +HOMEPAGE = "https://pipewire.org/" +BUGTRACKER = "https://gitlab.freedesktop.org/pipewire/pipewire/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ + file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ +" +SECTION = "multimedia" + +DEPENDS = "dbus" + +SRCREV = "22d563720a7f6ba7bdf59950f8c14488d80dfa95" +SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd manpages gettext useradd + +USERADD_PACKAGES = "${PN}" + +GROUPADD_PARAM_${PN} = "--system pipewire" + +USERADD_PARAM_${PN} = "--system --home / --no-create-home \ + --comment 'PipeWire multimedia daemon' \ + --gid pipewire --groups audio,video \ + pipewire" + +# For "EVL", look up https://evlproject.org/ . It involves +# a specially prepared kernel, and is currently unavailable +# in Yocto. +# FFmpeg and Vulkan aren't really supported - at the current +# stage (version 0.3.22), these are just experiments, not +# actual features. +# libcamera support currently does not build successfully. +# systemd user service files are disabled because per-user +# PipeWire instances aren't really something that makes +# much sense in an embedded environment. A system-wide +# instance does. +EXTRA_OEMESON += " \ + -Daudiotestsrc=true \ + -Devl=false \ + -Dsystemd-user-service=false \ + -Dtests=false \ + -Dudevrulesdir=${nonarch_base_libdir}/udev/rules.d/ \ + -Dvideotestsrc=true \ + -Dffmpeg=false \ + -Dvulkan=false \ + -Dlibcamera=false \ +" + +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa systemd', d)} \ + gstreamer jack v4l2 \ +" + +# "jack" and "pipewire-jack" packageconfigs cannot be both enabled, +# since "jack" imports libjack, and "pipewire-jack" generates +# libjack.so* files, thus colliding with the libpack package. This +# is why these two are marked in their respective packageconfigs +# as being in conflict. + +PACKAGECONFIG[alsa] = "-Dalsa=true,-Dalsa=false,alsa-lib udev" +PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" +PACKAGECONFIG[docs] = "-Ddocs=true,-Ddocs=false,doxygen" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack,,,pipewire-jack" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" +PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" +PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" +PACKAGECONFIG[systemd] = "-Dsystemd=true -Dsystemd-system-service=true ,-Dsystemd=false -Dsystemd-system-service=false,systemd" +PACKAGECONFIG[v4l2] = "-Dv4l2=true,-Dv4l2=false,udev" +PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=true,-Dpipewire-alsa=false,alsa-lib" +PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=true -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=false,jack,,,jack" + +PACKAGESPLITFUNCS_prepend = " split_dynamic_packages " +PACKAGESPLITFUNCS_append = " set_dynamic_metapkg_rdepends " + +SPA_SUBDIR = "spa-0.2" +PW_MODULE_SUBDIR = "pipewire-0.3" + +remove_unused_installed_files() { + # jack.conf is used by pipewire-jack (not the JACK SPA plugin). + # Remove it if pipewire-jack is not built to avoid creating the + # pipewire-jack package. + if ${@bb.utils.contains('PACKAGECONFIG', 'pipewire-jack', 'false', 'true', d)}; then + rm -f "${D}${sysconfdir}/pipewire/jack.conf" + fi +} + +do_install[postfuncs] += "remove_unused_installed_files" + +python split_dynamic_packages () { + # Create packages for each SPA plugin. These plugins are located + # in individual subdirectories, so a recursive search is needed. + spa_libdir = d.expand('${libdir}/${SPA_SUBDIR}') + do_split_packages(d, spa_libdir, r'^libspa-(.*)\.so$', d.expand('${PN}-spa-plugins-%s'), 'PipeWire SPA plugin for %s', extra_depends='', recursive=True) + + # Create packages for each PipeWire module. + pw_module_libdir = d.expand('${libdir}/${PW_MODULE_SUBDIR}') + do_split_packages(d, pw_module_libdir, r'^libpipewire-module-(.*)\.so$', d.expand('${PN}-modules-%s'), 'PipeWire %s module', extra_depends='', recursive=False) +} + +python set_dynamic_metapkg_rdepends () { + import os + import oe.utils + + # Go through all generated SPA plugin and PipeWire module packages + # (excluding the main package and the -meta package itself) and + # add them to the -meta package as RDEPENDS. + + base_pn = d.getVar('PN') + + spa_pn = base_pn + '-spa-plugins' + spa_metapkg = spa_pn + '-meta' + + pw_module_pn = base_pn + '-modules' + pw_module_metapkg = pw_module_pn + '-meta' + + d.setVar('ALLOW_EMPTY_' + spa_metapkg, "1") + d.setVar('FILES_' + spa_metapkg, "") + + d.setVar('ALLOW_EMPTY_' + pw_module_metapkg, "1") + d.setVar('FILES_' + pw_module_metapkg, "") + + blacklist = [ spa_pn, spa_metapkg, pw_module_pn, pw_module_metapkg ] + spa_metapkg_rdepends = [] + pw_module_metapkg_rdepends = [] + pkgdest = d.getVar('PKGDEST') + + for pkg in oe.utils.packages_filter_out_system(d): + if pkg in blacklist: + continue + + is_spa_pkg = pkg.startswith(spa_pn) + is_pw_module_pkg = pkg.startswith(pw_module_pn) + if not is_spa_pkg and not is_pw_module_pkg: + continue + + if pkg in spa_metapkg_rdepends or pkg in pw_module_metapkg_rdepends: + continue + + # See if the package is empty by looking at the contents of its + # PKGDEST subdirectory. If this subdirectory is empty, then then + # package is empty as well. Empty packages do not get added to + # the meta package's RDEPENDS. + pkgdir = os.path.join(pkgdest, pkg) + if os.path.exists(pkgdir): + dir_contents = os.listdir(pkgdir) or [] + else: + dir_contents = [] + is_empty = len(dir_contents) == 0 + if not is_empty: + if is_spa_pkg: + spa_metapkg_rdepends.append(pkg) + if is_pw_module_pkg: + pw_module_metapkg_rdepends.append(pkg) + + d.setVar('RDEPENDS_' + spa_metapkg, ' '.join(spa_metapkg_rdepends)) + d.setVar('DESCRIPTION_' + spa_metapkg, spa_pn + ' meta package') + + d.setVar('RDEPENDS_' + pw_module_metapkg, ' '.join(pw_module_metapkg_rdepends)) + d.setVar('DESCRIPTION_' + pw_module_metapkg, pw_module_pn + ' meta package') +} + +PACKAGES =+ "\ + libpipewire \ + ${PN}-tools \ + ${PN}-pulse \ + ${PN}-alsa \ + ${PN}-jack \ + ${PN}-media-session \ + ${PN}-spa-plugins \ + ${PN}-spa-plugins-meta \ + ${PN}-spa-tools \ + ${PN}-modules \ + ${PN}-modules-meta \ + ${PN}-alsa-card-profile \ + gstreamer1.0-pipewire \ +" + +PACKAGES_DYNAMIC = "^${PN}-spa-plugins.* ^${PN}-modules.*" + +SYSTEMD_SERVICE_${PN} = "pipewire.service" +CONFFILES_${PN} += "${sysconfdir}/pipewire/pipewire.conf" +FILES_${PN} = " \ + ${sysconfdir}/pipewire/pipewire.conf \ + ${systemd_user_unitdir}/pipewire.* \ + ${bindir}/pipewire \ +" + +FILES_${PN}-dev += " \ + ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so \ +" + +CONFFILES_libpipewire += "${sysconfdir}/pipewire/client.conf" +FILES_libpipewire = " \ + ${sysconfdir}/pipewire/client.conf \ + ${libdir}/libpipewire-*.so.* \ +" +# Add the bare minimum modules and plugins required to be able +# to use libpipewire. Without these, it is essentially unusable. +RDEPENDS_libpipewire += " \ + ${PN}-modules-client-node \ + ${PN}-modules-protocol-native \ + ${PN}-spa-plugins-support \ +" + +FILES_${PN}-tools = " \ + ${bindir}/pw-* \ +" + +# This is a shim daemon that is intended to be used as a +# drop-in PulseAudio replacement, providing a pulseaudio-compatible +# socket that can be used by applications that use libpulse. +CONFFILES_${PN}-pulse += "${sysconfdir}/pipewire/pipewire-pulse.conf" +FILES_${PN}-pulse = " \ + ${sysconfdir}/pipewire/pipewire-pulse.conf \ + ${systemd_user_unitdir}/pipewire-pulse.* \ + ${bindir}/pipewire-pulse \ +" +RDEPENDS_${PN}-pulse += " \ + ${PN}-modules-protocol-pulse \ +" + +# alsa plugin to redirect audio to pipewire +FILES_${PN}-alsa = "\ + ${libdir}/alsa-lib/* \ + ${datadir}/alsa/alsa.conf.d/* \ +" + +# jack drop-in libraries to redirect audio to pipewire +CONFFILES_${PN}-jack = "${sysconfdir}/pipewire/jack.conf" +FILES_${PN}-jack = "\ + ${sysconfdir}/pipewire/jack.conf \ + ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so.* \ +" + +# Example session manager. Not intended for use in production. +CONFFILES_${PN}-media-session = "${sysconfdir}/pipewire/media-session.d/*" +FILES_${PN}-media-session = " \ + ${bindir}/pipewire-media-session \ + ${sysconfdir}/pipewire/media-session.d/* \ +" +RPROVIDES_${PN}-media-session = "virtual/pipewire-sessionmanager" + +# Dynamic packages (see set_dynamic_metapkg_rdepends). +FILES_${PN}-spa-plugins = "" +RRECOMMENDS_${PN}-spa-plugins += "${PN}-spa-plugins-meta" + +FILES_${PN}-spa-tools = " \ + ${bindir}/spa-* \ +" + +# Dynamic packages (see set_dynamic_metapkg_rdepends). +FILES_${PN}-modules = "" +RRECOMMENDS_${PN}-modules += "${PN}-modules-meta" + +CONFFILES_${PN}-modules-rtkit = "${sysconfdir}/pipewire/client-rt.conf" +FILES_${PN}-modules-rtkit += " \ + ${sysconfdir}/pipewire/client-rt.conf \ + " + +FILES_${PN}-alsa-card-profile = " \ + ${datadir}/alsa-card-profile/* \ + ${nonarch_base_libdir}/udev/rules.d/90-pipewire-alsa.rules \ +" + +FILES_gstreamer1.0-pipewire = " \ + ${libdir}/gstreamer-1.0/* \ +" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0001-include-limits-header.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0001-include-limits-header.patch new file mode 100644 index 000000000..e1383c826 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0001-include-limits-header.patch @@ -0,0 +1,43 @@ +From 1068c7451855c3f9acde9af265b5a790073b1641 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Mar 2021 14:28:27 -0800 +Subject: [PATCH] include <limits> header + +Fixes +SegmentInformation.cpp:397:49: error: '::max' has not been declared; d +id you mean 'std::max'? + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + modules/demux/adaptive/playlist/SegmentInformation.cpp | 1 + + modules/demux/hls/playlist/Parser.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp +index 344e155..8eeb054 100644 +--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp ++++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp +@@ -34,6 +34,7 @@ + + #include <algorithm> + #include <cassert> ++#include <limits> + + using namespace adaptive::playlist; + +diff --git a/modules/demux/hls/playlist/Parser.cpp b/modules/demux/hls/playlist/Parser.cpp +index 67110e4..7439699 100644 +--- a/modules/demux/hls/playlist/Parser.cpp ++++ b/modules/demux/hls/playlist/Parser.cpp +@@ -42,6 +42,7 @@ + #include <map> + #include <cctype> + #include <algorithm> ++#include <limits> + + using namespace adaptive; + using namespace adaptive::playlist; +-- +2.30.1 + 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 index 046c059fb..c0074aabb 100644 --- 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 @@ -25,6 +25,7 @@ SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ 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 \ + file://0001-include-limits-header.patch \ " SRC_URI[sha256sum] = "eff458f38a92126094f44f2263c2bf2c7cdef271b48192d0fe7b1726388cf879" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp/0001-Rename-conflicting-variable-mips.patch b/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp/0001-Rename-conflicting-variable-mips.patch deleted file mode 100644 index b56c78959..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp/0001-Rename-conflicting-variable-mips.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 3dc8a678a844247d0afcf7e30fb3cbd5ccbd828f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 29 Jun 2017 14:05:06 -0700 -Subject: [PATCH] Rename conflicting variable 'mips' - -Fixes -test/srtp_driver.c:344:12: error: expected identifier or '(' before numeric constant - double mips = mips_estimate(1000000000, &ignore); - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - test/srtp_driver.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/test/srtp_driver.c b/test/srtp_driver.c -index 8872971..d38ea19 100644 ---- a/test/srtp_driver.c -+++ b/test/srtp_driver.c -@@ -341,7 +341,7 @@ main (int argc, char *argv[]) { - if (do_codec_timing) { - srtp_policy_t policy; - int ignore; -- double mips = mips_estimate(1000000000, &ignore); -+ double est = mips_estimate(1000000000, &ignore); - - crypto_policy_set_rtp_default(&policy.rtp); - crypto_policy_set_rtcp_default(&policy.rtcp); -@@ -353,33 +353,33 @@ main (int argc, char *argv[]) { - policy.allow_repeat_tx = 0; - policy.next = NULL; - -- printf("mips estimate: %e\n", mips); -+ printf("mips estimate: %e\n", est); - - printf("testing srtp processing time for voice codecs:\n"); - printf("codec\t\tlength (octets)\t\tsrtp instructions/second\n"); - printf("G.711\t\t%d\t\t\t%e\n", 80, -- (double) mips * (80 * 8) / -+ (double) est * (80 * 8) / - srtp_bits_per_second(80, &policy) / .01 ); - printf("G.711\t\t%d\t\t\t%e\n", 160, -- (double) mips * (160 * 8) / -+ (double) est * (160 * 8) / - srtp_bits_per_second(160, &policy) / .02); - printf("G.726-32\t%d\t\t\t%e\n", 40, -- (double) mips * (40 * 8) / -+ (double) est * (40 * 8) / - srtp_bits_per_second(40, &policy) / .01 ); - printf("G.726-32\t%d\t\t\t%e\n", 80, -- (double) mips * (80 * 8) / -+ (double) est * (80 * 8) / - srtp_bits_per_second(80, &policy) / .02); - printf("G.729\t\t%d\t\t\t%e\n", 10, -- (double) mips * (10 * 8) / -+ (double) est * (10 * 8) / - srtp_bits_per_second(10, &policy) / .01 ); - printf("G.729\t\t%d\t\t\t%e\n", 20, -- (double) mips * (20 * 8) / -+ (double) est * (20 * 8) / - srtp_bits_per_second(20, &policy) / .02 ); - printf("Wideband\t%d\t\t\t%e\n", 320, -- (double) mips * (320 * 8) / -+ (double) est * (320 * 8) / - srtp_bits_per_second(320, &policy) / .01 ); - printf("Wideband\t%d\t\t\t%e\n", 640, -- (double) mips * (640 * 8) / -+ (double) est * (640 * 8) / - srtp_bits_per_second(640, &policy) / .02 ); - } - --- -2.13.2 - diff --git a/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.6.0.bb b/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.6.0.bb deleted file mode 100644 index 6c868185f..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.6.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "library implementing Secure RTP (RFC 3711)" -HOMEPAGE = "https://github.com/cisco/libsrtp" -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=15bc16b9d2e305974dde47e733883714" - -S = "${WORKDIR}/git" -SRCREV = "2b091a4fb21c9b06fc5d4b5763bdaec97542fcd7" -SRC_URI = "git://github.com/cisco/libsrtp.git;protocol=https;branch=1_6_x_throttle; \ - file://0001-Rename-conflicting-variable-mips.patch \ - " - -inherit autotools pkgconfig - -EXTRA_OEMAKE += "shared_library" - -ALLOW_EMPTY_${PN} = "1" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_2.3.0.bb b/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_2.3.0.bb new file mode 100644 index 000000000..9d4c305fc --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_2.3.0.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "library implementing Secure RTP (RFC 3711)" +HOMEPAGE = "https://github.com/cisco/libsrtp" +SECTION = "libs" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2909fcf6f09ffff8430463d91c08c4e1" + +S = "${WORKDIR}/git" +SRCREV = "d02d21111e379c297e93a9033d7b653135f732ee" +SRC_URI = "git://github.com/cisco/libsrtp.git" + +inherit autotools pkgconfig + +EXTRA_OEMAKE += "shared_library" + +do_configure_prepend() { + cp ${STAGING_DATADIR_NATIVE}/automake-*/ar-lib ${S} +} + +ALLOW_EMPTY_${PN} = "1" diff --git a/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch b/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch new file mode 100644 index 000000000..0cb6943cc --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch @@ -0,0 +1,26 @@ +From f1b35cbf5b9b42b031e9b119e4c802b5f744468c Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux <krop@users.noreply.github.com> +Date: Wed, 10 Feb 2021 12:42:45 +0000 +Subject: [PATCH] [core] Fix build with GCC 11. (#1806) + +The 'limits' header must be included explicitly. +--- +Upstream-Status: Backport [https://github.com/haivision/srt/commit/f1b35cbf5b9b42b031e9b119e4c802b5f744468c] + srtcore/sync.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/srtcore/sync.h b/srtcore/sync.h +index 59c125a7..9f01ca91 100644 +--- a/srtcore/sync.h ++++ b/srtcore/sync.h +@@ -15,6 +15,7 @@ + //#define ENABLE_CXX17 + + #include <cstdlib> ++#include <limits> + #ifdef ENABLE_STDCXX_SYNC + #include <chrono> + #include <thread> +-- +2.30.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb b/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb index 567ea68ed..f7dfda28f 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" SRCREV = "50b7af06f3a0a456c172b4cb3aceafa8a5cc0036" SRC_URI = "git://github.com/Haivision/srt;protocol=https \ file://0001-don-t-install-srt-ffplay.patch \ + file://0001-core-Fix-build-with-GCC-11.-1806.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.8.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb index 75f303068..76df27851 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.8.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb @@ -4,7 +4,7 @@ DESCRIPTION = "A helper library and tools for Active Directory client operations HOMEPAGE = "http://cgit.freedesktop.org/realmd/adcli" SECTION = "net" -SRCREV = "cc3ef52884a48863a81acbfc741735fe09cd85f7" +SRCREV = "1b1528038e084a9f81ea108cffca9c2707623b9c" SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;branch=master \ file://Fixed-build-error-on-musl.patch \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch deleted file mode 100644 index b78f0b329..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c74f04dbab4d586287347b1d5517f36e2f0c3d8e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 19 Dec 2019 15:52:34 -0800 -Subject: [PATCH] Use GNUInstallDirs instead of hard-coding paths - -Bump minimum cmake version to be >= 3.1 - -Upstream-Status: Submitted [https://github.com/mguentner/cannelloni/pull/22] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 51b354f..958e0eb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.1) - project(cannelloni) - - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") -@@ -60,6 +60,8 @@ set_target_properties ( cannelloni-common - SOVERSION 0 - ) - -+include(GNUInstallDirs) -+ - if(SCTP_SUPPORT) - add_library(sctpthread STATIC sctpthread.cpp) - target_link_libraries(sctpthread addsources sctp) -@@ -68,5 +70,5 @@ endif(SCTP_SUPPORT) - set_target_properties(addsources PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - target_link_libraries(cannelloni addsources cannelloni-common pthread) - --install(TARGETS cannelloni DESTINATION bin) --install(TARGETS cannelloni-common DESTINATION lib) -+install(TARGETS cannelloni DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(TARGETS cannelloni-common DESTINATION ${CMAKE_INSTALL_LIBDIR}) --- -2.24.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni/0002-include-missing-stdexcept-for-runtime_error.patch b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni/0002-include-missing-stdexcept-for-runtime_error.patch deleted file mode 100644 index 55f28dd67..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni/0002-include-missing-stdexcept-for-runtime_error.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1788762863cd1f657697575f6e73a22e661ccb43 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 23 Dec 2019 10:32:54 -0800 -Subject: [PATCH 2/2] include missing <stdexcept> for runtime_error -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes -error: ‘runtime_error’ is not a member of ‘std’ - -Upstream-Status: Submitted [https://github.com/mguentner/cannelloni/pull/22] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - parser.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/parser.cpp b/parser.cpp -index 4afb9e0..5bcdbde 100644 ---- a/parser.cpp -+++ b/parser.cpp -@@ -2,6 +2,7 @@ - - #include <arpa/inet.h> - #include <string.h> -+#include <stdexcept> - - void parseFrames(uint16_t len, const uint8_t* buffer, std::function<canfd_frame*()> frameAllocator, - std::function<void(canfd_frame*, bool)> frameReceiver) --- -2.24.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb index d4a62bd92..0cf57ccdb 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb @@ -2,13 +2,8 @@ SUMMARY = "a SocketCAN over Ethernet tunnel" HOMEPAGE = "https://github.com/mguentner/cannelloni" LICENSE = "GPLv2" -SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https \ - file://0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch \ - file://0002-include-missing-stdexcept-for-runtime_error.patch \ - " -SRCREV = "82aa49b417b96fe46bb3f017ae1bfea928f20f9a" - -PV = "20160414+${SRCPV}" +SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https" +SRCREV = "0bd7e27db35bdef361226882ae04205504f7b2f4" LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-workaround-error-with-autoconf-2.7.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-workaround-error-with-autoconf-2.7.patch new file mode 100644 index 000000000..80c571df9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-workaround-error-with-autoconf-2.7.patch @@ -0,0 +1,42 @@ +From 3b4ba29c7c5800df87eecd65214244619e01162b Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sun, 7 Feb 2021 16:02:36 +0800 +Subject: [PATCH] workaround error with autoconf 2.7 + +While using autoconf 2.7, the AM_MISSING_PROG caused unexpected error: +... +configure.ac: error: required file 'missing' not found +... + +Since these tools were explicitly added by autotools bbclass, +remove the testing to workaround the error with autoconf 2.7 + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 609efb104b..2d761cf62c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -693,14 +693,6 @@ fi + + AC_PATH_PROG(RUSERS, rusers, /usr/bin/rusers) + +-dnl # +-dnl # FIXME This is truly gross. +-dnl # +-missing_dir=`cd $ac_aux_dir && pwd` +-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) +-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) +-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) +- + AC_PATH_PROG(LOCATE,locate) + AC_PATH_PROG(DIRNAME,dirname) + AC_PATH_PROG(GREP,grep) +-- +2.27.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb index 2c39c4c44..608d66b1b 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb @@ -29,6 +29,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0 file://0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch \ file://0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch \ file://0001-raddb-certs-Makefile-fix-the-occasional-verification.patch \ + file://0001-workaround-error-with-autoconf-2.7.patch \ file://radiusd.service \ file://radiusd-volatiles.conf \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch new file mode 100644 index 000000000..f3ba04f51 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch @@ -0,0 +1,34 @@ +From c3d7321d59e959b357a7d3d69782d9105f3d04aa Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 1 Mar 2021 21:04:57 -0800 +Subject: [PATCH] ssl_tls: Increase size of padbuf to 64 + +This fixes warnings with gcc11 + +git/library/ssl_tls.c: In function 'ssl_calc_finished_tls_sha384': +git/library/ssl_tls.c:3267:5: error: 'mbedtls_sha512_finish_ret' accessing 64 bytes in a region of size 48 [-Werror=stringop-overflow=] + 3267 | finish( &sha512, padbuf ); + | ^~~~~~~~~~~~~~~~~~~~~~~~~ +git/library/ssl_tls.c:3267:5: note: referencing argument 2 of type 'unsigned char *' + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + library/ssl_tls.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/library/ssl_tls.c b/library/ssl_tls.c +index a1a5859f0..4c98a4104 100644 +--- a/library/ssl_tls.c ++++ b/library/ssl_tls.c +@@ -3205,7 +3205,7 @@ static void ssl_calc_finished_tls_sha384( + { + int len = 12; + const char *sender; +- unsigned char padbuf[48]; ++ unsigned char padbuf[64]; + #if defined(MBEDTLS_USE_PSA_CRYPTO) + size_t hash_size; + psa_hash_operation_t sha384_psa = PSA_HASH_OPERATION_INIT; +-- +2.30.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb index 27c1b209d..481e7ea94 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb @@ -25,6 +25,7 @@ SECTION = "libs" S = "${WORKDIR}/git" SRCREV = "1c54b5410fd48d6bcada97e30cac417c5c7eea67" SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=development" +SRC_URI += "file://0001-ssl_tls-Increase-size-of-padbuf-to-64.patch" inherit cmake diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch index 93ff6bcfa..37560f30c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch @@ -11,7 +11,7 @@ Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -89,6 +89,8 @@ +@@ -94,6 +94,8 @@ OUTPUT_NAME mosquitto VERSION ${VERSION} SOVERSION 1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch deleted file mode 100644 index 1397fc6a2..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Also install mqtt_protocol.h, as is done in Makefile -Author: Gianfranco Costamagna <locutusofborg@debian.org> -Bug-Debian: https://bugs.debian.org/951116 -Forwarded: https://github.com/eclipse/mosquitto/pull/1599 -Last-Update: 2020-02-15 - ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -114,4 +114,4 @@ - install(TARGETS libmosquitto_static ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") - endif (WITH_STATIC_LIBRARIES) - --install(FILES mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -+install(FILES mqtt_protocol.h mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.8.bb index 36bfe099f..03a829fc8 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.8.bb @@ -6,22 +6,21 @@ provides a lightweight method of carrying out messaging using a \ publish/subscribe model. " HOMEPAGE = "http://mosquitto.org/" SECTION = "console/network" -LICENSE = "EPL-1.0 | EDL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20 \ +LICENSE = "EPL-2.0 | EDL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \ file://edl-v10;md5=c09f121939f063aeb5235972be8c722c \ - file://epl-v10;md5=8d383c379e91d20ba18a52c3e7d3a979 \ - file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \ + file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ + file://notice.html;md5=541f8f37af492858dab8d2c1b69ede69 \ " -DEPENDS = "uthash" +DEPENDS = "uthash cjson dlt-daemon" SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://mosquitto.init \ file://1571.patch \ - file://install-protocol.patch \ " -SRC_URI[md5sum] = "beb8d76d6e45f1e66d711006082a631f" -SRC_URI[sha256sum] = "548d73d19fb787dd0530334e398fd256ef3a581181678488a741a995c4f007fb" +SRC_URI[md5sum] = "542c30f32c4473b7c50dc2e4a1424cf6" +SRC_URI[sha256sum] = "b15da8fc4edcb91d554e1259e220ea0173ef639ceaa4b465e06feb7e125b84bf" inherit systemd update-rc.d useradd cmake @@ -29,6 +28,7 @@ PACKAGECONFIG ??= "ssl dlt websockets \ ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ " +PACKAGECONFIG[manpages] = "-DDOCUMENTATION=ON,-DDOCUMENTATION=OFF,libxslt-native docbook-xsl-stylesheets-native" PACKAGECONFIG[dns-srv] = "-DWITH_SRV=ON,-DWITH_SRV=OFF,c-ares" PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_EC=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF -DWITH_EC=OFF,openssl" PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" @@ -59,6 +59,8 @@ PACKAGE_BEFORE_PN = "${PN}-examples" FILES_${PN} = "${sbindir}/mosquitto \ ${bindir}/mosquitto_passwd \ + ${bindir}/mosquitto_ctrl \ + ${libdir}/mosquitto_dynamic_security.so \ ${sysconfdir}/mosquitto \ ${sysconfdir}/init.d \ ${systemd_unitdir}/system/mosquitto.service \ 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 index dcb23d05c..7a20e914f 100644 --- 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 @@ -15,7 +15,6 @@ DEPENDS = " \ util-linux \ libndp \ libnewt \ - jansson \ curl \ " @@ -89,6 +88,7 @@ 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" +PACKAGECONFIG[ovs] = "--enable-ovs,--disable-ovs,jansson" PACKAGES =+ " \ ${PN}-nmcli ${PN}-nmcli-doc \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb index 1a982368e..166bf5727 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb @@ -3,8 +3,8 @@ SECTION = "console/network" LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 " + file://${COREBASE}/meta/files/common-licenses/LGPL-3.0-or-later;md5=c51d3eef3be114124d11349ca0d7e117 \ + file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" SAMBA_MIRROR = "http://samba.org/samba/ftp" MIRRORS += "\ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.6.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.0.bb index ad7e92341..83406f507 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.6.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.0.bb @@ -14,7 +14,7 @@ RPROVIDES_${PN} = "cyassl" SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https \ " -SRCREV = "9c87f979a7f1d3a6d786b260653d566c1d31a1c4" +SRCREV = "830de9a9fb99e30f9ac9caa0a7f7bba29c3b4863" S = "${WORKDIR}/git" inherit autotools diff --git a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch deleted file mode 100644 index cfa8a7325..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 543e67919f5cacf309ac88ab091331e41af4224b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Thu, 16 Apr 2015 22:41:57 +0200 -Subject: [PATCH] argz.h: fix musl compile (add missing defines) - -Upstream-Status: Pending - -Add __THROW, __BEGIN_DECLS, __END_DECLS and __attribute_pure__ defines. - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> -Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> ---- - argz.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/argz.h b/argz.h -index 582be55..bdf9f62 100644 ---- a/argz.h -+++ b/argz.h -@@ -48,6 +48,22 @@ - # define __const const - #endif - -+#ifndef __THROW -+# define __THROW -+#endif -+ -+#ifndef __BEGIN_DECLS -+# define __BEGIN_DECLS -+#endif -+ -+#ifndef __END_DECLS -+# define __END_DECLS -+#endif -+ -+#ifndef __attribute_pure__ -+# define __attribute_pure__ -+#endif -+ - #ifndef __error_t_defined - typedef int error_t; - #endif --- -2.1.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch deleted file mode 100644 index 093054ce8..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 77e399899d9d7297d23c321811b628febdf0fd92 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Thu, 16 Apr 2015 22:43:49 +0200 -Subject: [PATCH] tftp.h/tftpd.h: fix musl compile (missing include) - -Upstream-Status: Pending - -Add sys/types.h include for u_char typedef. - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> -Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> ---- - tftp.h | 1 + - tftpd.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/tftp.h b/tftp.h -index 12bd6aa..32a3f63 100644 ---- a/tftp.h -+++ b/tftp.h -@@ -19,6 +19,7 @@ - - #include <sys/time.h> - #include <sys/times.h> -+#include <sys/types.h> - #include "tftp_def.h" - #include "config.h" - -diff --git a/tftpd.h b/tftpd.h -index 945065e..60d3a49 100644 ---- a/tftpd.h -+++ b/tftpd.h -@@ -20,6 +20,7 @@ - #include <pthread.h> - #include <arpa/tftp.h> - #include <arpa/inet.h> -+#include <sys/types.h> - #include "tftp_io.h" - - /* --- -2.1.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.2.bb b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.4.bb index ff9084dbf..936fc723f 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.2.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.4.bb @@ -4,15 +4,12 @@ HOMEPAGE = "http://packages.debian.org/atftp" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" -SRCREV = "52b71f0831dcbde508bd3a961d84abb80a62480f" +SRCREV = "e56e8845f1070e89a4a6e509396b681688d03793" SRC_URI = "git://git.code.sf.net/p/atftp/code \ file://atftpd.init \ file://atftpd.service \ " -SRC_URI_append_libc-musl = " file://0001-argz.h-fix-musl-compile-add-missing-defines.patch \ - file://0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch \ - " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.1.5.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.1.bb index 1230fcaee..a778d2609 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.1.bb @@ -11,9 +11,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz" -SRC_URI[md5sum] = "27e1cfff5b8dd95062ad415957e663e5" -SRC_URI[sha256sum] = "d94d7ccbc5c95ab39c95a0e5ae89a25a224f39b6811f2930d3a1885a69732259" - +SRC_URI[sha256sum] = "91186f20c83ffc48d7a15a9a6e2329ed4feeb2dcb51f4aa9672c8840190ea741" UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" DEPENDS = "libnfnetlink openssl" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.11.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.03.bb index ade2816f5..118c5fea3 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.11.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.03.bb @@ -29,8 +29,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-Fix-build-with-fno-common.patch \ file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ " -SRC_URI[md5sum] = "9c7871a2b45f262b7aee2e9d073798e4" -SRC_URI[sha256sum] = "11b62e6d20c449a297da0c0c15b560747c9ec884305beffed4ca4c192fa9f22c" +SRC_URI[md5sum] = "0433650ba9c25f2cf36145e11bf96a2a" +SRC_URI[sha256sum] = "ed40386852e34bbec0ca7e9534ce315b93a17b587614c8118aea1ecd082e1723" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch new file mode 100644 index 000000000..28a410c26 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch @@ -0,0 +1,105 @@ +From 1f8b5f0e1cc27634a7310be4c9674112f919d974 Mon Sep 17 00:00:00 2001 +From: uhliarik <luhliari@redhat.com> +Date: Thu, 18 Feb 2021 01:08:40 +0000 +Subject: [PATCH] Fix build on Fedora Rawhide (#772) + +* add SYSTEMD_LIBS to all binaries using client_side.cc, fixing linking +* add `<limits>` to all sources using std::numeric_limits, fixing gcc-11 + builds +--- +Upstream-Status: Backport [https://github.com/kraj/squid/commit/1f8b5f0e1cc27634a7310be4c9674112f919d974] + src/Makefile.am | 4 ++++ + src/ip/QosConfig.cc | 1 + + src/ipc/mem/PageStack.cc | 1 + + src/proxyp/Parser.cc | 1 + + src/security/ServerOptions.cc | 2 ++ + src/ssl/helper.cc | 2 ++ + 6 files changed, 11 insertions(+) + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2320,6 +2320,7 @@ tests_test_http_range_LDADD = \ + $(SSLLIB) \ + $(KRB5LIBS) \ + $(LIBCPPUNIT_LIBS) \ ++ $(SYSTEMD_LIBS) \ + $(COMPAT_LIB) \ + $(XTRA_LIBS) + tests_test_http_range_LDFLAGS = $(LIBADD_DL) +@@ -2624,6 +2625,7 @@ tests_testHttpRequest_LDADD = \ + $(SSLLIB) \ + $(KRB5LIBS) \ + $(LIBCPPUNIT_LIBS) \ ++ $(SYSTEMD_LIBS) \ + $(COMPAT_LIB) \ + $(XTRA_LIBS) + tests_testHttpRequest_LDFLAGS = $(LIBADD_DL) +@@ -3487,6 +3489,7 @@ tests_testURL_LDADD = \ + $(SSLLIB) \ + $(KRB5LIBS) \ + $(LIBCPPUNIT_LIBS) \ ++ $(SYSTEMD_LIBS) \ + $(COMPAT_LIB) \ + $(XTRA_LIBS) + tests_testURL_LDFLAGS = $(LIBADD_DL) +@@ -3646,6 +3649,7 @@ nodist_tests_testYesNoNone_SOURCES = \ + tests_testYesNoNone_LDADD= \ + base/libbase.la \ + $(LIBCPPUNIT_LIBS) \ ++ $(SYSTEMD_LIBS) \ + $(COMPAT_LIB) \ + $(XTRA_LIBS) + tests_testYesNoNone_LDFLAGS = $(LIBADD_DL) +--- a/src/ip/QosConfig.cc ++++ b/src/ip/QosConfig.cc +@@ -21,6 +21,7 @@ + #include "Parsing.h" + + #include <cerrno> ++#include <limits> + + CBDATA_CLASS_INIT(acl_tos); + +--- a/src/ipc/mem/PageStack.cc ++++ b/src/ipc/mem/PageStack.cc +@@ -14,6 +14,7 @@ + #include "Debug.h" + #include "ipc/mem/Page.h" + #include "ipc/mem/PageStack.h" ++#include <limits> + + /// used to mark a stack slot available for storing free page offsets + const Ipc::Mem::PageStack::Value Writable = 0; +--- a/src/security/ServerOptions.cc ++++ b/src/security/ServerOptions.cc +@@ -24,6 +24,8 @@ + #endif + #endif + ++#include <limits> ++ + Security::ServerOptions & + Security::ServerOptions::operator =(const Security::ServerOptions &old) { + if (this != &old) { +--- a/src/ssl/helper.cc ++++ b/src/ssl/helper.cc +@@ -19,6 +19,8 @@ + #include "ssl/helper.h" + #include "wordlist.h" + ++#include <limits> ++ + Ssl::CertValidationHelper::LruCache *Ssl::CertValidationHelper::HelperCache = nullptr; + + #if USE_SSL_CRTD +--- a/src/acl/ConnMark.cc ++++ b/src/acl/ConnMark.cc +@@ -16,6 +16,8 @@ + #include "http/Stream.h" + #include "sbuf/Stream.h" + ++#include <limits> ++ + bool + Acl::ConnMark::empty() const + { diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.13.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.14.bb index 873d09344..6d154c87e 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.13.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.14.bb @@ -24,15 +24,15 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2 file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ file://0001-tools.cc-fixed-unused-result-warning.patch \ file://0001-splay.cc-fix-bind-is-not-a-member-of-std.patch \ + file://0001-Fix-build-on-Fedora-Rawhide-772.patch \ " SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" -SRC_URI[md5sum] = "31e524a416715d6bfef30e072d2ca076" -SRC_URI[sha256sum] = "d09d3c31e3a7d158bda75501e763bd1cd3c3a99f5af6781ec1fd30eed2f771ed" +SRC_URI[sha256sum] = "4ad08884f065f8e1dac166aa13db6a872cde419a1717dff4c82c2c5337ee5756" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://errors/COPYRIGHT;md5=4c3268f394af77fbbf541875cef96a6c \ + file://errors/COPYRIGHT;md5=0e03cd976052c45697ad5d96e7dff8dc \ " DEPENDS = "libtool krb5 openldap db cyrus-sasl" diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch new file mode 100644 index 000000000..29ce85cc1 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch @@ -0,0 +1,51 @@ +From 7bc261076ec94efa3197beaca39eba095d162b5e Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Fri, 26 Feb 2021 16:32:27 +0800 +Subject: [PATCH] seccompsandbox.c: allow newfstatat and pselect6 syscalls in + the seccomp sandbox + +Allow newfstatat and pselect6 in the seccomp sanbox for glibc 2.33. + +Fixes the following OOPS error: +root@qemux86-64:~# tnftp 192.168.1.1 +Connected to 192.168.1.1. +220 (vsFTPd 3.0.3) +Name (192.168.1.1:root): anonymous +331 Please specify the password. +Password: +230 Login successful. +Remote system type is UNIX. +Using binary mode to transfer files. +ftp> ls +OOPS: priv_sock_get_cmd + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + seccompsandbox.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/seccompsandbox.c b/seccompsandbox.c +index 377c50e..f601241 100644 +--- a/seccompsandbox.c ++++ b/seccompsandbox.c +@@ -267,6 +267,7 @@ seccomp_sandbox_setup_data_connections() + 3, IPPROTO_TCP); + allow_nr(__NR_bind); + allow_nr(__NR_select); ++ allow_nr(__NR_pselect6); + if (tunable_port_enable) + { + allow_nr(__NR_connect); +@@ -411,6 +412,7 @@ seccomp_sandbox_setup_postlogin(const struct vsf_session* p_sess) + allow_nr(__NR_getdents); + allow_nr(__NR_getdents64); + allow_nr(__NR_sysinfo); ++ allow_nr(__NR_newfstatat); + /* Misc */ + allow_nr(__NR_umask); + +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb index df0d7f455..024b776de 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb @@ -22,6 +22,7 @@ SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ ${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)} \ file://0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch \ + file://0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch \ " UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/v/vsftpd/" diff --git a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.18.bb b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.20.bb index 7b1dfc241..a468a9ab6 100644 --- a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.18.bb +++ b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.20.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa88 SECTION = "libs" DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" -SRCREV = "e1f3d4fb4906a26bf155a0e3fff2b6cb02be4dd2" +SRCREV = "b8d18c8360fd39cb04748e8bc1ee26de4afa4cbd" SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1" UPSTREAM_CHECK_URI = "https://github.com/kronosnet/kronosnet/releases" diff --git a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.9.bb b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.10.bb index 95e48f013..b724233ba 100644 --- a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.9.bb +++ b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.10.bb @@ -10,12 +10,12 @@ SECTION = "base" DEPENDS = "libtool libmnl" SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2" -SRC_URI[sha256sum] = "b75c13689eddf1d95b396840a69dc04fd7ae4112b10b70594bc0405df7b9b30a" +SRC_URI[sha256sum] = "b24906ba43e2fe322bd41863476761d749a4bddf5ce4c2265ba04b03bc7e9cf6" inherit autotools pkgconfig module-base EXTRA_OECONF += "-with-kbuild=${KBUILD_OUTPUT} --with-ksource=${STAGING_KERNEL_DIR}" -RRCOMMENDS_${PN} = "\ +RRECOMMENDS_${PN} = "\ kernel-module-ip-set \ -" +" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb index c540445d7..64958a75b 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb @@ -21,13 +21,6 @@ MAKE_TARGETS = "module" RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" MODULE_NAME = "wireguard" -# Kernel module packages MUST begin with 'kernel-module-', otherwise -# multilib image generation can fail. -# -# The following line is only necessary if the recipe name does not begin -# with kernel-module-. -PKG_${PN} = "kernel-module-${MODULE_NAME}" - module_do_install() { install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} install -m 0644 ${MODULE_NAME}.ko \ diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200827.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210223.bb index c4214dee6..4af7e3e66 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200827.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210223.bb @@ -1,6 +1,6 @@ require wireguard.inc -SRCREV = "7a321ce808ef9cec1f45cce92befcc9e170d3aa9" +SRCREV = "6d3b876492298d0e311053567ecd7084972a8bc8" SRC_URI = "git://git.zx2c4.com/wireguard-tools" inherit bash-completion systemd pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch new file mode 100644 index 000000000..4cd729044 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch @@ -0,0 +1,39 @@ +From 6f8ea2e841ad45eed193310b599d3f3b410ae91d Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Fri, 29 Jan 2021 08:49:15 +0000 +Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and 64bit + +With configure option "--with-openssl=${STAGING_EXECPREFIXDIR}", it behaves +differently between 32bit and 64bit system as the openssl lib resides under +/build/tmp/work/corei7-64-wrs-linux/net-snmp/5.9-r0/recipe-sysroot/usr/lib64 +for 64bit system, but resides under [1] for 32bit system. + +So add the patch to fix the gap between 32bit and 64bit system. + +[1] /build/tmp/work/corei7-64-wrs-linux/net-snmp/5.9-r0/recipe-sysroot/usr/lib + +Upstream-Status: Inappropriate [configuration specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + m4/ac_add_search_path.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/ac_add_search_path.m4 b/m4/ac_add_search_path.m4 +index 8e0a819..961f587 100644 +--- a/m4/ac_add_search_path.m4 ++++ b/m4/ac_add_search_path.m4 +@@ -3,8 +3,8 @@ dnl Add a search path to the LIBS and CPPFLAGS variables + dnl + AC_DEFUN([AC_ADD_SEARCH_PATH],[ + if test "x$1" != x -a -d $1; then +- if test -d $1/lib; then +- LDFLAGS="-L$1/lib $LDFLAGS" ++ if test -d $1/${libdir:5}; then ++ LDFLAGS="-L$1/${libdir:5} $LDFLAGS" + fi + if test -d $1/include; then + CPPFLAGS="-I$1/include $CPPFLAGS" +-- +2.29.2 + 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 bee83c4d1..d9040c164 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 @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \ file://net-snmp-fix-for-disable-des.patch \ file://reproducibility-have-printcap.patch \ + file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \ " SRC_URI[sha256sum] = "04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071" @@ -57,7 +58,6 @@ EXTRA_OECONF = "--enable-shared \ --with-install-prefix=${D} \ --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}' \ " @@ -102,11 +102,10 @@ do_configure_prepend() { } do_configure_append() { - if [ "${HAS_PERL}" = "1" ]; then - sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=${STAGING_DIR_TARGET}\$\{includedir\}@g" \ - -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L${STAGING_DIR_TARGET}\$\{libdir\}@g" \ - -i ${B}/net-snmp-config - fi + sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=${STAGING_DIR_TARGET}\$\{includedir\}@g" \ + -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L${STAGING_DIR_TARGET}\$\{libdir\}@g" \ + -e "s@^NSC_LDFLAGS=\"-L.* @NSC_LDFLAGS=\"-L${STAGING_DIR_TARGET}\$\{libdir\} @g" \ + -i ${B}/net-snmp-config } do_install_append() { @@ -128,15 +127,16 @@ do_install_append() { -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_PATH=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \ - -e 's@-L${STAGING_DIR_HOST}${libdir}@@g' \ - -e 's@-I${STAGING_DIR_HOST}${includedir}@@g' \ + -e 's@${STAGING_DIR_HOST}@@g' \ -i ${D}${bindir}/net-snmp-config - if [ "${HAS_PERL}" = "1" ]; then - sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=\$\{includedir\}@g" \ - -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L\$\{libdir\}@g" \ - -i ${D}${bindir}/net-snmp-config - fi + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${libdir}/pkgconfig/netsnmp*.pc + + sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=\$\{includedir\}@g" \ + -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L\$\{libdir\}@g" \ + -e "s@^NSC_LDFLAGS=\"-L.* @NSC_LDFLAGS=\"-L\$\{libdir\} @g" \ + -i ${D}${bindir}/net-snmp-config oe_multilib_header net-snmp/net-snmp-config.h } diff --git a/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb index c02a19944..5afec7663 100644 --- a/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Administration tool for arp packet filtering" SECTION = "net" LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a" PV = "0.0.5+git${SRCPV}" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch index 1bf0f75c1..be2bb42fc 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch @@ -14,7 +14,7 @@ diff --git a/Makefile b/Makefile index 73ea23e..ed3eeb9 100644 --- a/Makefile +++ b/Makefile -@@ -59,8 +59,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI +@@ -60,8 +60,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI idn2_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2` ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack` ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack` @@ -22,9 +22,10 @@ index 73ea23e..ed3eeb9 100644 -lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.2` +lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua` +lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua` - nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed` - nettle_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed` - gmp_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp` + nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags 'nettle hogweed' \ + HAVE_CRYPTOHASH $(PKG_CONFIG) --cflags nettle \ + HAVE_NETTLEHASH $(PKG_CONFIG) --cflags nettle` + -- 2.9.5 diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb deleted file mode 100644 index 4ca1f3cc9..000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb +++ /dev/null @@ -1,8 +0,0 @@ -require dnsmasq.inc - -SRC_URI[dnsmasq-2.82.md5sum] = "3c710dee3edba510ed11a6e3d9e0d9cb" -SRC_URI[dnsmasq-2.82.sha256sum] = "62f33bfac1a1b4a5dab8461b4664e414f7d6ced1d2cf141e9cdf9c3c2a424f65" -SRC_URI += "\ - file://lua.patch \ -" - diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb new file mode 100644 index 000000000..3dd9154f3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb @@ -0,0 +1,8 @@ +require dnsmasq.inc + +SRC_URI[dnsmasq-2.84.md5sum] = "6bf24b5bcf9293db2941fbdb545c1133" +SRC_URI[dnsmasq-2.84.sha256sum] = "4caf385376f34fae5c55244a1f870dcf6f90e037bb7c4487210933dc497f9c36" +SRC_URI += "\ + file://lua.patch \ +" + diff --git a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.4.bb b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.16.bb index efab0c808..71163c8d9 100644 --- a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.16.bb @@ -1,16 +1,18 @@ SUMMARY = "Fetchmail retrieves mail from remote mail servers and forwards it via SMTP" HOMEPAGE = "http://www.fetchmail.info/" -DESCRIPTION = "Fetchmail is a full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC." +DESCRIPTION = "Fetchmail is a full-featured, robust, well-documented remote-mail retrieval \ +and forwarding utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP \ +connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, \ +RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC." SECTION = "mail" LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ca53985c1fd053ae0bffffaa89ed49f1" +LIC_FILES_CHKSUM = "file://COPYING;md5=06a8d16599e1d0b131390bec01fb571c" DEPENDS = "openssl" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \ " -SRC_URI[md5sum] = "53d52179c8bf8e2f57489538b49bfda9" -SRC_URI[sha256sum] = "511b60daabf7543a01de06af07c8772290c6807cd53c42a8504960e978f3abea" +SRC_URI[sha256sum] = "044b9a0ac03afbae7744979defe3e2e32e39141bca68fd0c8deda2ed40884fb9" inherit autotools gettext python3-dir python3native diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.1.bb b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.2.bb index 07d54b71f..ae92de2db 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6 SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ file://options-2.2.0.patch \ " -SRC_URI[md5sum] = "ce40593428c0de6b85946189dcc37b5e" -SRC_URI[sha256sum] = "ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77" +SRC_URI[md5sum] = "3376a86bdf9dd4abc6b8d8d645390902" +SRC_URI[sha256sum] = "27a03ef99e384d779124df755deb229cd1761f945eca6d200e8cfd9bf5297bd7" inherit waf-samba diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-m4-sctp.m4-make-conpatible-to-autoconf-2.70.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-m4-sctp.m4-make-conpatible-to-autoconf-2.70.patch new file mode 100644 index 000000000..484af4e0f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-m4-sctp.m4-make-conpatible-to-autoconf-2.70.patch @@ -0,0 +1,89 @@ +From d6d7130f0a2e3b81880fca29966e42c1b2be40a7 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Fri, 8 Jan 2021 22:22:52 +0000 +Subject: [PATCH] m4/sctp.m4: make conpatible to autoconf-2.70 + +On recently released `autoconf-2.70` generated `./configure` +fails as: + +``` +$ ./configure +... +checking for struct sctp_event_subscribe.sctp_stream_reset_event... yes +checking for gcc options needed to detect all undeclared functions... none needed +./configure: line 16464: syntax error: unexpected end of file +``` + +This happens becuase new autoconf generates less whitespace: + +``` +{ +if ... +... +fi} +``` + +It requires at least whitespace between `fi` and `}`. + +As input already has newlines the change just drops extra `{}`. + +Tested on `autoconf-2.69` and `autoconf-2.70`. + +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> + +Upstream-Status: Backport [git://github.com/sctp/lksctp-tools.git] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +--- + m4/sctp.m4 | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/m4/sctp.m4 b/m4/sctp.m4 +index 6593517..94527a6 100644 +--- a/m4/sctp.m4 ++++ b/m4/sctp.m4 +@@ -6,7 +6,7 @@ + + # Macros to assist on probing kernel features + # Probes if a type is defined +-AC_DEFUN([LKSCTP_CHECK_TYPE], [{ ++AC_DEFUN([LKSCTP_CHECK_TYPE], [ + AC_CHECK_TYPE([$1], + AC_DEFINE([$2], 1, + [Define if $1 is present.]) +@@ -22,10 +22,10 @@ AC_CHECK_TYPE([$1], + #ifdef HAVE_LINUX_SCTP_H + # include <linux/sctp.h> + #endif +-])}]) ++])]) + + # Probes if a struct has a given member +-AC_DEFUN([LKSCTP_CHECK_MEMBER], [{ ++AC_DEFUN([LKSCTP_CHECK_MEMBER], [ + AC_CHECK_MEMBER([$1], + AC_DEFINE([$2], 1, + [Define if $1 is present.]) +@@ -41,10 +41,10 @@ AC_CHECK_MEMBER([$1], + #ifdef HAVE_LINUX_SCTP_H + # include <linux/sctp.h> + #endif +-])}]) ++])]) + + # Probes if a declaration is present +-AC_DEFUN([LKSCTP_CHECK_DECL], [{ ++AC_DEFUN([LKSCTP_CHECK_DECL], [ + AC_CHECK_DECL([$1], + AC_DEFINE([$2], 1, + [Define if $1 is present.]) +@@ -60,4 +60,4 @@ AC_CHECK_DECL([$1], + #ifdef HAVE_LINUX_SCTP_H + # include <linux/sctp.h> + #endif +-])}]) ++])]) +-- +2.27.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb index 1e2c644b4..f481ffee1 100644 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb +++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb @@ -15,6 +15,7 @@ LK_REL = "1.0.18" SRC_URI = " \ git://github.com/sctp/lksctp-tools.git \ + file://0001-m4-sctp.m4-make-conpatible-to-autoconf-2.70.patch \ file://run-ptest \ file://v4test.sh \ file://v6test.sh \ diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb index f42223b1f..a2f0ccc06 100644 --- a/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb @@ -4,7 +4,7 @@ security or integrity checking, no throttling, no features, except \ one: you don't have to type the coordinates of your peer." HOMEPAGE = "http://www.fefe.de/ncp" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" DEPENDS = "libowfat" SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2" diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.42.0.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb index d24b0b475..959cccf35 100644 --- a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.42.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb @@ -11,8 +11,7 @@ SRC_URI = "\ https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz \ file://0001-fetch-ocsp-response-use-python3.patch \ " -SRC_URI[md5sum] = "c38f1d230af8cec480ff9dd60c9e0db0" -SRC_URI[sha256sum] = "c5a7f09020f31247d0d1609078a75efadeccb7e5b86fc2e4389189b1b431fe63" +SRC_URI[sha256sum] = "f7d54fa6f8aed29f695ca44612136fa2359013547394d5dffeffca9e01a26b0f" inherit cmake manpages python3native PACKAGECONFIG[manpages] = "" diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb index 1e4153779..22e4d8e9a 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb @@ -17,6 +17,8 @@ S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig +CPPFLAGS += "${SELECTED_OPTIMIZATION}" + do_configure_prepend() { ${S}/autogen.sh } diff --git a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.99.bb b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.101.bb index eb04dfae3..0b1bb6d51 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.99.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.101.bb @@ -17,7 +17,7 @@ SRC_URI = "git://github.com/open-iscsi/open-isns \ file://0001-isnsd.socket-use-run-instead-of-var-run.patch \ " -SRCREV = "cfdbcff867ee580a71bc9c18c3a38a6057df0150" +SRCREV = "0d86dc31fae2e2d77a082ccea5aba95426b40c3c" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-helper b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-helper index 4cebfb9c6..4cebfb9c6 100755..100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-helper +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-helper diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch index ce37d5eb2..1aea32eae 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch @@ -1,4 +1,4 @@ -From 6395659ca6d64b20bf78bb640c2cc523d6c1d9c2 Mon Sep 17 00:00:00 2001 +From 5a4abf223d79d4e1a58bbad1e4f2f406c7cab748 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Mon, 29 Dec 2014 18:16:04 +0800 Subject: [PATCH] remove host path from la_LDFLAGS @@ -7,42 +7,43 @@ Upstream-Status: Inappropriate [ cross compile specific ] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- - cmdlang/Makefile.am | 3 +-- - unix/Makefile.am | 6 ++---- - 2 files changed, 3 insertions(+), 6 deletions(-) + cmdlang/Makefile.am | 2 +- + unix/Makefile.am | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index d9a941f..21b9531 100644 +index 9cf180d..da46ceb 100644 --- a/cmdlang/Makefile.am +++ b/cmdlang/Makefile.am -@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ - libOpenIPMIcmdlang_la_LIBADD = -lm \ +@@ -18,7 +18,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \ $(top_builddir)/utils/libOpenIPMIutils.la \ $(top_builddir)/lib/libOpenIPMI.la --libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined bin_PROGRAMS = openipmish diff --git a/unix/Makefile.am b/unix/Makefile.am -index 5128839..bd0f897 100644 +index baf0815..80c3d5d 100644 --- a/unix/Makefile.am +++ b/unix/Makefile.am -@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la - libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c +@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) --libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ $(GDBM_LIB) $(RT_LIB) --libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined noinst_HEADERS = heap.h +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.30.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.31.bb index 4929c4f05..d172083bb 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.30.bb +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.31.bb @@ -35,8 +35,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[md5sum] = "8d35f68058ca5359973b4121e1544d31" -SRC_URI[sha256sum] = "237a9be2a30bde85a88c4ec2759b54eb5b21fede554ffabf8fef1ffac2b42ade" +SRC_URI[md5sum] = "ce8eb27da016dcad7543d0128fcb3b0a" +SRC_URI[sha256sum] = "7052f37726ff454b0dcac49f35dd030bc12c9570ca0ba5cd2d17774b8e9d9717" inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base python3targetconfig diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.0.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.1.bb index 3dc25bacd..6aa7b17be 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.1.bb @@ -14,8 +14,8 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" -SRC_URI[md5sum] = "2d42d3c2fff942bfe9eefa41cfd6f123" -SRC_URI[sha256sum] = "87ef9f5d42c1193fec2ebd86757229b5ae4f295504968392375155adeda83b56" +SRC_URI[md5sum] = "b1c279e89d97849d5fcde31d76812f04" +SRC_URI[sha256sum] = "e9582b8e9457994bd8d50012be82c23b2f465da51460c9b2360a81da0f4e06e6" SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice/0001-configure.ac-explicitly-link-to-jpeg-lib.patch b/meta-openembedded/meta-networking/recipes-support/spice/spice/0001-configure.ac-explicitly-link-to-jpeg-lib.patch new file mode 100644 index 000000000..2d05143db --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/spice/spice/0001-configure.ac-explicitly-link-to-jpeg-lib.patch @@ -0,0 +1,48 @@ +From 6ffd9db8e02e411bda2f421abf7951dab6cf0e38 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 5 Feb 2021 01:43:44 -0800 +Subject: [PATCH] configure.ac: explicitly link to jpeg lib + +Since oe has added lib jpeg to the depends, explicitly link to jpeg lib +to workaround build failure with autoconf 2.7 + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1ce81f91..8bbb50de 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -191,24 +191,12 @@ AC_SUBST(SSL_CFLAGS) + AC_SUBST(SSL_LIBS) + AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"]) + +-AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, +- AC_MSG_CHECKING([for jpeglib.h]) +- AC_TRY_CPP( +-[#include <stdio.h> +-#undef PACKAGE +-#undef VERSION +-#undef HAVE_STDLIB_H +-#include <jpeglib.h>], +- JPEG_LIBS='-ljpeg' +- AC_MSG_RESULT($jpeg_ok), +- AC_MSG_ERROR([jpeglib.h not found])), +- AC_MSG_ERROR([libjpeg not found])) ++JPEG_LIBS='-ljpeg' + AC_SUBST(JPEG_LIBS) + + AC_CHECK_LIB(z, deflate, Z_LIBS='-lz', AC_MSG_ERROR([zlib not found])) + AC_SUBST(Z_LIBS) + +- + AC_ARG_ENABLE([manual], + AS_HELP_STRING([--enable-manual=@<:@auto/yes/no@:>@], + [Build SPICE manual]), +-- +2.29.2 + diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb index fad8b639e..52dad7124 100644 --- a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb @@ -25,6 +25,7 @@ SRC_URI = " \ git://anongit.freedesktop.org/spice/spice-common;destsuffix=git/subprojects/spice-common;name=spice-common \ file://0001-Convert-pthread_t-to-be-numeric.patch \ file://0001-Fix-compile-errors-on-Linux-32bit-system.patch \ + file://0001-configure.ac-explicitly-link-to-jpeg-lib.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.1.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb index 095a93df3..dd50fba3d 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb @@ -12,8 +12,8 @@ SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ " -SRC_URI[md5sum] = "1f4db969d072e120dc12d1c116a0f658" -SRC_URI[sha256sum] = "a337c9fb63d973b8440827755c784031648bf423b7114a04918b0b00fd42cafb" +SRC_URI[md5sum] = "8918e6675e1be3784817641f07eadeb8" +SRC_URI[sha256sum] = "61c72f741edb2c1295a7b7ccce0317a104b3f9d39efd04c52cd05b01b55ab063" UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.57.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.58.bb index 8f6de571f..1f1ca4e6b 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.57.bb +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.58.bb @@ -6,7 +6,7 @@ SECTION = "net" # a combined work based on stunnel. Thus, the terms and conditions of the GNU # General Public License cover the whole combination. LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING.md;md5=6bae28875b3b599f8f621f4335b17955" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=223b26c62f5e7c5c8656d6c133edd5ec" DEPENDS = "autoconf-archive libnsl2 openssl" @@ -14,7 +14,7 @@ SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \ file://fix-openssl-no-des.patch \ " -SRC_URI[sha256sum] = "af5ab973dde11807c38735b87bdd87563a47d2fa1c72a07929fcfce80a600fe1" +SRC_URI[sha256sum] = "d4c14cc096577edca3f6a2a59c2f51869e35350b3988018ddf808c88e5973b79" inherit autotools diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch deleted file mode 100644 index 9b74e00c5..000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001 -From: Guy Harris <guy@alum.mit.edu> -Date: Sat, 18 Apr 2020 14:04:59 -0700 -Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large buffer. - -The buffer should be big enough to hold the captured data, but it -doesn't need to be big enough to hold the entire on-the-network packet, -if we haven't captured all of it. - -(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334) - -Upstream-Status: Backport -Signed-off-by: Stacy Gaikovaia <stacy.gaikovaia@windriver.com> - ---- - print-ppp.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/print-ppp.c b/print-ppp.c -index 89176172..33fb0341 100644 ---- a/print-ppp.c -+++ b/print-ppp.c -@@ -1367,19 +1367,29 @@ trunc: - return 0; - } - -+/* -+ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes. -+ * The length argument is the on-the-wire length, not the captured -+ * length; we can only un-escape the captured part. -+ */ - static void - ppp_hdlc(netdissect_options *ndo, - const u_char *p, int length) - { -+ u_int caplen = ndo->ndo_snapend - p; - u_char *b, *t, c; - const u_char *s; -- int i, proto; -+ u_int i; -+ int proto; - const void *se; - -+ if (caplen == 0) -+ return; -+ - if (length <= 0) - return; - -- b = (u_char *)malloc(length); -+ b = (u_char *)malloc(caplen); - if (b == NULL) - return; - -@@ -1388,10 +1398,10 @@ ppp_hdlc(netdissect_options *ndo, - * Do this so that we dont overwrite the original packet - * contents. - */ -- for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) { -+ for (s = p, t = b, i = caplen; i != 0; i--) { - c = *s++; - if (c == 0x7d) { -- if (i <= 1 || !ND_TTEST(*s)) -+ if (i <= 1) - break; - i--; - c = *s++ ^ 0x20; --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch new file mode 100644 index 000000000..bb56c4d4c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch @@ -0,0 +1,33 @@ +From 867bf5c9d0fb64e1b4e64cb13b983674c270a6bf Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Fri, 19 Feb 2021 00:52:35 -0500 +Subject: [PATCH] aclocal.m4: Skip checking for pcap-config + +Bitbake triggers an configure error +saying we should look for pkg-config instead. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +--- + aclocal.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index bd4e27a5..136cb8ca 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -584,8 +584,8 @@ AC_DEFUN(AC_LBL_LIBPCAP, + # No pkg-config + # Look for an installed pcap-config. + # +- AC_PATH_TOOL(PCAP_CONFIG, pcap-config) +- if test -n "$PCAP_CONFIG" ; then ++ # AC_PATH_TOOL(PCAP_CONFIG, pcap-config) ++ if false; then + # + # Found - use it to get the include flags for + # libpcap and the flags to link with libpcap. +-- +2.29.2 + diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index f8ff354fe..c46de4b96 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch @@ -1,6 +1,6 @@ -From 8c9c728757f89ebe6c4019114b83a63c63596f69 Mon Sep 17 00:00:00 2001 -From: "Hongjun.Yang" <hongjun.yang@windriver.com> -Date: Wed, 2 Oct 2019 16:57:06 -0400 +From 5f0f70192b0e20336e642b02ca9662ba2fef66cf Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Fri, 19 Feb 2021 15:21:18 -0500 Subject: [PATCH] Add ptest for tcpdump Upstream-Status: Pending @@ -8,15 +8,21 @@ Upstream-Status: Pending Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com> Signed-off-by: Peiran Hong <peiran.hong@windriver.com> +remove perl script not required by ptest causing QA problems + +reference upstream issue/commit: +https://github.com/the-tcpdump-group/tcpdump/issues/26 + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> --- - Makefile.in | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) + Makefile.in | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 3b589184..7b10e38c 100644 +index ea1ef1d0..e7987bd8 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -437,9 +437,17 @@ distclean: +@@ -445,9 +445,18 @@ distclean: tests/failure-outputs.txt rm -rf autom4te.cache tests/DIFF tests/NEW @@ -24,14 +30,18 @@ index 3b589184..7b10e38c 100644 +buildtest-TESTS: tcpdump + +runtest-PTEST: - (mkdir -p tests && SRCDIR=`cd ${srcdir}; pwd` && export SRCDIR && $$SRCDIR/tests/TESTrun.sh ) + $(srcdir)/tests/TESTrun +install-ptest: + cp -r tests $(DESTDIR) ++ rm $(DESTDIR)/tests/setkey2esp-secrets.pl + cp -r config.h $(DESTDIR) + install -m 0755 Makefile $(DESTDIR) -+ ln -sf /usr/sbin/tcpdump $(DESTDIR)/tcpdump ++ ln -s /usr/bin/tcpdump $(DESTDIR)/tcpdump + extags: $(TAGFILES) ctags $(TAGFILES) +-- +2.29.2 + diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch deleted file mode 100644 index 977ab95b7..000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 02085028cdaf075943c27ebc02bb6de0289ec1d3 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Wed, 2 Oct 2019 16:43:48 -0400 -Subject: [PATCH] avoid absolute path when searching for libdlpi - -Let the build environment control library search paths. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> -Signed-off-by: Peiran Hong <peiran.hong@windriver.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3401a7a3..6a52485a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -528,7 +528,7 @@ don't.]) - fi - - # libdlpi is needed for Solaris 11 and later. --AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) -+AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi") - - dnl - dnl Check for "pcap_list_datalinks()", "pcap_set_datalink()", --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch deleted file mode 100644 index 8793bf7a3..000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch +++ /dev/null @@ -1,40 +0,0 @@ -From dd023c133980fcc0cff5896e85377675e0571894 Mon Sep 17 00:00:00 2001 -From: Roy Li <rongqing.li@windriver.com> -Date: Tue, 8 Jul 2014 13:20:47 +0800 -Subject: [PATCH] unnecessary to check libpcap - -since the check of libpcap did not consider the cross-compile, lead to the -below error: - This autoconf log indicates errors, it looked at host include and/or - library paths while determining system capabilities. - -In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to -check if libpcap existed. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> -Signed-off-by: Peiran Hong <peiran.hong@windriver.com> ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 56e2a624..3401a7a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -404,7 +404,9 @@ dnl Some platforms may need -lnsl for getrpcbynumber. - AC_SEARCH_LIBS(getrpcbynumber, nsl, - AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()])) - --AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) -+# Simplified (more cross compile friendly) check for libpcap. All we really -+# need is to sanity check that libpcap is available and add -lpcap to LIBS. -+AC_CHECK_LIB(pcap, pcap_compile, LIBS="$LIBS -lpcap") - - # - # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb index afcb4d508..66510b7fd 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb @@ -2,26 +2,33 @@ SUMMARY = "A sophisticated network protocol analyzer" HOMEPAGE = "http://www.tcpdump.org/" SECTION = "net" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453" DEPENDS = "libpcap" RDEPENDS_${PN}-ptest += " make perl \ perl-module-file-basename \ + perl-module-file-spec \ + perl-module-file-spec-unix \ + perl-module-file-path \ + perl-module-file-glob \ + perl-module-data-dumper \ + perl-module-bytes \ perl-module-posix \ - perl-module-carp" + perl-module-carp \ + perl-module-cwd \ + perl-module-constant \ +" SRC_URI = " \ http://www.tcpdump.org/release/${BP}.tar.gz \ - file://unnecessary-to-check-libpcap.patch \ - file://avoid-absolute-path-when-searching-for-libdlpi.patch \ file://add-ptest.patch \ file://run-ptest \ - file://0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch \ + file://0001-aclocal.m4-Skip-checking-for-pcap-config.patch \ " -SRC_URI[md5sum] = "a4ead41d371f91aa0a2287f589958bae" -SRC_URI[sha256sum] = "2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410" +SRC_URI[md5sum] = "b10aa2f497def7283bc060f626879ce5" +SRC_URI[sha256sum] = "8cf2f17a9528774a7b41060323be8b73f76024f7778f59c34efa65d49d80b842" UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.(?!99)\d+)+)\.tar" @@ -46,7 +53,7 @@ do_configure_prepend() { do_install_append() { # make install installs an unneeded extra copy of the tcpdump binary - rm -f ${D}${sbindir}/tcpdump.${PV} + rm ${D}${bindir}/tcpdump.${PV} } do_compile_ptest() { diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch new file mode 100644 index 000000000..0b83ca4ae --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch @@ -0,0 +1,44 @@ +From 0a9ab056ce7582033a21d6bc541ece520bf2b0b6 Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Thu, 26 Nov 2020 05:38:31 -0800 +Subject: [PATCH] wireshark-src: improve reproducibility + +Cut absolute path for filename in generated code +comments. + +Upstream-Status: Pending +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> +--- + tools/make-plugin-reg.py | 2 +- + tools/ncp2222.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/make-plugin-reg.py b/tools/make-plugin-reg.py +index 66b4656..c52b3fc 100755 +--- a/tools/make-plugin-reg.py ++++ b/tools/make-plugin-reg.py +@@ -28,7 +28,7 @@ preamble = """\ + * + * Generated automatically from %s. + */ +-""" % (sys.argv[0]) ++""" % (os.path.basename(sys.argv[0])) + + # Create the proper list of filenames + filenames = [] +diff --git a/tools/ncp2222.py b/tools/ncp2222.py +index 1dea4ec..dc376e3 100755 +--- a/tools/ncp2222.py ++++ b/tools/ncp2222.py +@@ -5858,7 +5858,7 @@ def produce_code(): + + print("/*") + print(" * Do not modify this file. Changes will be overwritten.") +- print(" * Generated automatically from %s" % (sys.argv[0])) ++ print(" * Generated automatically from %s" % (os.path.basename(sys.argv[0]))) + print(" */\n") + + print(""" +-- +2.26.2.Cisco + diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch new file mode 100644 index 000000000..069b5793d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch @@ -0,0 +1,46 @@ +From 3e571e24c730f747d18ed02ba7451e9e00480fc7 Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Thu, 26 Nov 2020 12:00:43 -0800 +Subject: [PATCH] flex: Remove #line directives + +Append --noline option to flex to not +generate #line directives with absolute file patch. + +Upstream-Status: Pending +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> +--- + cmake/modules/FindLEX.cmake | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake +index 0008bc4..ec68f84 100644 +--- a/cmake/modules/FindLEX.cmake ++++ b/cmake/modules/FindLEX.cmake +@@ -32,11 +32,19 @@ MACRO(ADD_LEX_FILES _source _generated) + SET(_outc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.c) + SET(_outh ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_lex.h) + +- ADD_CUSTOM_COMMAND( +- OUTPUT ${_outc} ${_outh} +- COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in} +- DEPENDS ${_in} +- ) ++ IF (DEFINED ENV{SOURCE_DATE_EPOCH}) ++ ADD_CUSTOM_COMMAND( ++ OUTPUT ${_outc} ${_outh} ++ COMMAND ${LEX_EXECUTABLE} --noline -o${_outc} --header-file=${_outh} ${_in} ++ DEPENDS ${_in} ++ ) ++ ELSE () ++ ADD_CUSTOM_COMMAND( ++ OUTPUT ${_outc} ${_outh} ++ COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in} ++ DEPENDS ${_in} ++ ) ++ ENDIF () + LIST(APPEND ${_source} ${_in}) + LIST(APPEND ${_generated} ${_outc}) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +-- +2.26.2.Cisco + diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch new file mode 100644 index 000000000..824761a3d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch @@ -0,0 +1,59 @@ +From 42abf1d299fed8e00a189f6f9c55fb344e5bb775 Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Wed, 27 Jan 2021 04:01:34 -0800 +Subject: [PATCH] bison: Remove #line directives + +Append --no-lines option to bison to not +generate #line directives with absolute file path. + +Upstream-Status: Pending +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> +--- + cmake/modules/FindYACC.cmake | 31 ++++++++++++++++++++++--------- + 1 file changed, 22 insertions(+), 9 deletions(-) + +diff --git a/cmake/modules/FindYACC.cmake b/cmake/modules/FindYACC.cmake +index c96f87b..54a73cb 100644 +--- a/cmake/modules/FindYACC.cmake ++++ b/cmake/modules/FindYACC.cmake +@@ -29,15 +29,28 @@ MACRO(ADD_YACC_FILES _source _generated) + + SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.c) + +- ADD_CUSTOM_COMMAND( +- OUTPUT ${_out} +- COMMAND ${YACC_EXECUTABLE} +- -d +- -p ${_basename} +- -o${_out} +- ${_in} +- DEPENDS ${_in} +- ) ++ IF (DEFINED ENV{SOURCE_DATE_EPOCH}) ++ ADD_CUSTOM_COMMAND( ++ OUTPUT ${_out} ++ COMMAND ${YACC_EXECUTABLE} ++ --no-lines ++ -d ++ -p ${_basename} ++ -o${_out} ++ ${_in} ++ DEPENDS ${_in} ++ ) ++ ELSE () ++ ADD_CUSTOM_COMMAND( ++ OUTPUT ${_out} ++ COMMAND ${YACC_EXECUTABLE} ++ -d ++ -p ${_basename} ++ -o${_out} ++ ${_in} ++ DEPENDS ${_in} ++ ) ++ ENDIF () + LIST(APPEND ${_source} ${_in}) + LIST(APPEND ${_generated} ${_out}) + ENDFOREACH (_current_FILE) +-- +2.26.2.Cisco + diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch new file mode 100644 index 000000000..c1a528f90 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch @@ -0,0 +1,77 @@ +From 17f05a8d02c589e4867906f70381e63e46a67870 Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Wed, 27 Jan 2021 06:47:13 -0800 +Subject: [PATCH] lemon: Remove #line directives + +In case of reproducible build remove #line +directives with extra option '-l'. + +Upstream-Status: Pending +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> +--- + cmake/modules/UseLemon.cmake | 49 +++++++++++++++++++++++++----------- + 1 file changed, 34 insertions(+), 15 deletions(-) + +diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake +index 849ffc1..ca38ab7 100644 +--- a/cmake/modules/UseLemon.cmake ++++ b/cmake/modules/UseLemon.cmake +@@ -7,21 +7,40 @@ MACRO(ADD_LEMON_FILES _source _generated) + + SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}) + +- ADD_CUSTOM_COMMAND( +- OUTPUT +- ${_out}.c +- # These files are generated as side-effect +- ${_out}.h +- ${_out}.out +- COMMAND lemon +- -T${_lemonpardir}/lempar.c +- -d. +- ${_in} +- DEPENDS +- ${_in} +- lemon +- ${_lemonpardir}/lempar.c +- ) ++ IF (DEFINED ENV{SOURCE_DATE_EPOCH}) ++ ADD_CUSTOM_COMMAND( ++ OUTPUT ++ ${_out}.c ++ # These files are generated as side-effect ++ ${_out}.h ++ ${_out}.out ++ COMMAND lemon ++ -l ++ -T${_lemonpardir}/lempar.c ++ -d. ++ ${_in} ++ DEPENDS ++ ${_in} ++ lemon ++ ${_lemonpardir}/lempar.c ++ ) ++ ELSE () ++ ADD_CUSTOM_COMMAND( ++ OUTPUT ++ ${_out}.c ++ # These files are generated as side-effect ++ ${_out}.h ++ ${_out}.out ++ COMMAND lemon ++ -T${_lemonpardir}/lempar.c ++ -d. ++ ${_in} ++ DEPENDS ++ ${_in} ++ lemon ++ ${_lemonpardir}/lempar.c ++ ) ++ ENDIF () + + LIST(APPEND ${_source} ${_in}) + LIST(APPEND ${_generated} ${_out}.c) +-- +2.26.2.Cisco + 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.4.3.bb index d28482414..e730b18a0 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.3.bb @@ -4,15 +4,22 @@ 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 = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares" DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" +SRC_URI += " \ + file://0001-wireshark-src-improve-reproducibility.patch \ + file://0002-flex-Remove-line-directives.patch \ + file://0003-bison-Remove-line-directives.patch \ + file://0004-lemon-Remove-line-directives.patch \ +" + UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "1e9e239f2449f240a7910ed598084ccaf8ea308b2b46b196c5adbec59612226c" +SRC_URI[sha256sum] = "f467cc77f0fc73fce0b854cdbc292f132d4879fca69d417eccad5f967fbf262b" PE = "1" diff --git a/meta-openembedded/meta-oe/README b/meta-openembedded/meta-oe/README index 8d787df68..98f671d7c 100644 --- a/meta-openembedded/meta-oe/README +++ b/meta-openembedded/meta-oe/README @@ -14,6 +14,9 @@ e.g. on archlinux based distributions install prerequisites like below pacman -S lib32-gcc-libs lib32-glibc +Ubuntu +sudo apt-get install gcc-multilib + Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe]' in the subject' When sending single patches, please use something like: diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 1f6086164..3de301550 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -98,3 +98,5 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ " DEFAULT_TEST_SUITES_pn-meta-oe-ptest-image = " ${PTESTTESTSUITE}" + +NON_MULTILIB_RECIPES_append = " crash" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-include-needed-c-header.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-include-needed-c-header.patch new file mode 100644 index 000000000..581c2390e --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-include-needed-c-header.patch @@ -0,0 +1,29 @@ +From 383b1dda4800c2514cb31446cd7478692d7d26cf Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 3 Mar 2021 12:43:16 -0800 +Subject: [PATCH] include needed c++ header + +Fixes +plan_stats.h:214:10: error: 'optional' in namespace 'std' does not name a template type + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mongo/db/exec/plan_stats.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/mongo/db/exec/plan_stats.h b/src/mongo/db/exec/plan_stats.h +index ea75f673b8..0cc9b4636d 100644 +--- a/src/mongo/db/exec/plan_stats.h ++++ b/src/mongo/db/exec/plan_stats.h +@@ -31,6 +31,7 @@ + + #include <cstdint> + #include <cstdlib> ++#include <optional> + #include <string> + #include <vector> + +-- +2.30.1 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index a15349848..d0c4eba7e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4 \ file://1296.patch \ file://0001-Fix-compilation-with-fno-common.patch \ file://0001-stacktrace-Define-ARCH_BITS-for-x86.patch \ + file://0001-include-needed-c-header.patch \ " SRC_URI_append_libc-musl ="\ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-remove-JS_VOLATIME_ARM.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-remove-JS_VOLATIME_ARM.patch new file mode 100644 index 000000000..a20873cb0 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-remove-JS_VOLATIME_ARM.patch @@ -0,0 +1,111 @@ +# HG changeset patch +# User Lars T Hansen <lhansen@mozilla.com> +# Date 1538489772 -7200 +# Node ID bb430eaf5521aa8ab233a45b585ff9e5dfecf4c9 +# Parent e87d7028568e721e8d297ce62f9622e74d29bb37 +Bug 1495731 - remove JS_VOLATILE_ARM, it is no longer relevant. r=waldo + +JS_VOLATILE_ARM was a workaround for a gcc 4.7 bug on B2G where it +would generate unaligned word accesses that should have been +individual byte accesses. We now require at least gcc 6.1 (and ARM +systems support unaligned accesses). + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [https://hg.mozilla.org/integration/mozilla-inbound/rev/bb430eaf5521] + +--- a/js/src/vm/TypedArrayObject-inl.h ++++ b/js/src/vm/TypedArrayObject-inl.h +@@ -259,68 +259,61 @@ class ElementSpecific { + return true; + } + +- // Inhibit unaligned accesses on ARM (bug 1097253, a compiler bug). +-#if defined(__arm__) && defined(__GNUC__) && !defined(__clang__) +-#define JS_VOLATILE_ARM volatile +-#else +-#define JS_VOLATILE_ARM +-#endif +- + SharedMem<void*> data = Ops::extract(source); + switch (source->type()) { + case Scalar::Int8: { +- SharedMem<JS_VOLATILE_ARM int8_t*> src = +- data.cast<JS_VOLATILE_ARM int8_t*>(); ++ SharedMem<int8_t*> src = ++ data.cast<int8_t*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Uint8: + case Scalar::Uint8Clamped: { +- SharedMem<JS_VOLATILE_ARM uint8_t*> src = +- data.cast<JS_VOLATILE_ARM uint8_t*>(); ++ SharedMem<uint8_t*> src = ++ data.cast<uint8_t*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Int16: { +- SharedMem<JS_VOLATILE_ARM int16_t*> src = +- data.cast<JS_VOLATILE_ARM int16_t*>(); ++ SharedMem<int16_t*> src = ++ data.cast<int16_t*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Uint16: { +- SharedMem<JS_VOLATILE_ARM uint16_t*> src = +- data.cast<JS_VOLATILE_ARM uint16_t*>(); ++ SharedMem<uint16_t*> src = ++ data.cast<uint16_t*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Int32: { +- SharedMem<JS_VOLATILE_ARM int32_t*> src = +- data.cast<JS_VOLATILE_ARM int32_t*>(); ++ SharedMem<int32_t*> src = ++ data.cast<int32_t*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Uint32: { +- SharedMem<JS_VOLATILE_ARM uint32_t*> src = +- data.cast<JS_VOLATILE_ARM uint32_t*>(); ++ SharedMem<uint32_t*> src = ++ data.cast<uint32_t*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Float32: { +- SharedMem<JS_VOLATILE_ARM float*> src = +- data.cast<JS_VOLATILE_ARM float*>(); ++ SharedMem<float*> src = ++ data.cast<float*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; + } + case Scalar::Float64: { +- SharedMem<JS_VOLATILE_ARM double*> src = +- data.cast<JS_VOLATILE_ARM double*>(); ++ SharedMem<double*> src = ++ data.cast<double*>(); + for (uint32_t i = 0; i < count; ++i) + Ops::store(dest++, ConvertNumber<T>(Ops::load(src++))); + break; +@@ -329,8 +322,6 @@ class ElementSpecific { + MOZ_CRASH("setFromTypedArray with a typed array with bogus type"); + } + +-#undef JS_VOLATILE_ARM +- + return true; + } + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb index 130ff13ec..7367c30a5 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb @@ -18,6 +18,7 @@ SRC_URI = " \ file://0011-To-fix-build-error-on-arm32BE.patch \ file://0012-JS_PUBLIC_API.patch \ file://0013-riscv-Disable-atomic-operations.patch \ + file://0014-remove-JS_VOLATIME_ARM.patch \ " SRC_URI_append_libc-musl = " \ file://musl/0001-support-musl.patch \ @@ -125,6 +126,8 @@ MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js60-config" do_install_append() { oe_multilib_header mozjs-60/js-config.h + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${bindir}/js60-config } PACKAGES =+ "lib${BPN}" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch new file mode 100644 index 000000000..739fd20fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch @@ -0,0 +1,31 @@ +From cc4499cd4cfcb655fc44c3f3571eee20663dafde Mon Sep 17 00:00:00 2001 +From: Andrey Zhizhikin <andrey.z@gmail.com> +Date: Wed, 3 Feb 2021 20:44:34 +0000 +Subject: [PATCH] configure.ac: check for CPP prog + +Absence of check for CPP_PROG causes following build errors: +| checking TCP_CONGESTION socket option... ../git/configure: line 14427: CPP: command not found +| ../git/configure: line 14553: ac_fn_c_try_cpp: command not found +| ../git/configure: line 14553: ac_fn_c_try_cpp: command not found + +Upstream-Status: Pending +Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 939cf0a..f75b398 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -47,6 +47,7 @@ AC_CANONICAL_HOST + # Checks for tools: c compiler, ranlib (used for creating static libraries), + # symlinks and libtool + AC_PROG_CC ++AC_PROG_CPP + AC_PROG_RANLIB + AC_PROG_LN_S + AC_PROG_LIBTOOL +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb index d969555c2..be75837be 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b7fb682e9941a49f1214dcd7441410d7" SRC_URI = "git://github.com/esnet/iperf.git \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ + file://0001-configure.ac-check-for-CPP-prog.patch \ " SRCREV = "1f8fb13297f3e3e40169ebcd12e171167e394473" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch new file mode 100644 index 000000000..78a4cb0fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch @@ -0,0 +1,31 @@ +From b6dba773491bbb7b4664dacdd87a12af860f1bd8 Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Thu, 28 Jan 2021 05:43:33 -0800 +Subject: [PATCH] tests/makefile: Append CPPFLAGS rather then override + +CPPFLAGS overrided and we could miss some options needed. + +Upstream-Status: Submitted +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> +--- + tests/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/Makefile b/tests/Makefile +index 0ca3716..d262932 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -33,8 +33,8 @@ HELPERS = get_hugetlbfs_path compare_kvers + HELPER_LIBS = libheapshrink.so + BADTOOLCHAIN = bad-toolchain.sh + +-CFLAGS = -O2 -Wall -g +-CPPFLAGS = -I.. ++CFLAGS += -O2 -Wall -g ++CPPFLAGS += -I.. + STATIC_LIBHUGE = -Wl,--whole-archive -lhugetlbfs -Wl,--no-whole-archive + STATIC_LDLIBS = -Wl,--no-as-needed -lpthread + LDLIBS = $(STATIC_LDLIBS) -ldl -lhugetlbfs_privutils +-- +2.26.2.Cisco + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index 2f07c938b..fa63316b0 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -26,6 +26,7 @@ SRC_URI = " \ file://0006-include-limits.h-for-PATH_MAX.patch \ file://0001-huge_page_setup_helper-use-python3-interpreter.patch \ file://0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch \ + file://0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch new file mode 100644 index 000000000..d49dac5b2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch @@ -0,0 +1,30 @@ +From 9bf2b363c5173c03adecf366f116415dbc559017 Mon Sep 17 00:00:00 2001 +From: Yanfei Xu <yanfei.xu@windriver.com> +Date: Tue, 23 Feb 2021 10:54:26 +0800 +Subject: [PATCH 1/2] doc: Fix typos in lat_unix_connect manual page + +Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com> +--- + doc/lat_unix_connect.8 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/doc/lat_unix_connect.8 b/doc/lat_unix_connect.8 +index b42e9a4..5ab1a51 100644 +--- a/doc/lat_unix_connect.8 ++++ b/doc/lat_unix_connect.8 +@@ -25,9 +25,9 @@ is a client/server program that measures interprocess + connection latencies. The benchmark times the creation and connection of + an AF_UNIX socket to a local server. + .LP +-.B lat_connect +-has three forms of usage: as a server (-s), as a client (lat_connect), +-and as a shutdown (lat_connect -S). ++.B lat_unix_connect ++has three forms of usage: as a server (-s), as a client (lat_unix_connect), ++and as a shutdown (lat_unix_connect -S). + .SH OUTPUT + The reported time is in microseconds per connection. + Output format is like so +-- +2.27.0 + 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 21e81ecf2..e9d1067d4 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 @@ -29,6 +29,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ 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 \ + file://0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch \ " SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" @@ -73,6 +74,7 @@ do_install () { -C src install mv ${D}${bindir}/line ${D}${bindir}/lm_line install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ + install -m 0755 ${S}/bin/${TARGET_SYS}/cache ${D}${bindir}/ sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${BPN},;' \ -e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \ ${D}${bindir}/lmbench-run diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-Modify-parameter-of-function-sctp_gensio_alloc.patch b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-Modify-parameter-of-function-sctp_gensio_alloc.patch deleted file mode 100644 index 22a452508..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-Modify-parameter-of-function-sctp_gensio_alloc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b94eff3461e4fb99cd761d6858e8ed94cb6c5412 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <wangmy@cn.fujitsu.com> -Date: Tue, 8 Dec 2020 11:58:06 +0900 -Subject: [PATCH] 0001-Modify-parameter-of-function-sctp_gensio_alloc.patch - -parameter type of declearation is const, definition should also be -const. - -Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> ---- - lib/gensio_sctp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/gensio_sctp.c b/lib/gensio_sctp.c -index bd9437f..4278ff8 100644 ---- a/lib/gensio_sctp.c -+++ b/lib/gensio_sctp.c -@@ -1092,7 +1092,7 @@ str_to_sctp_gensio_accepter(const char *str, const char * const args[], - #else - - int --sctp_gensio_alloc(struct gensio_addr *iai, const char * const args[], -+sctp_gensio_alloc(const struct gensio_addr *iai, const char * const args[], - struct gensio_os_funcs *o, - gensio_event cb, void *user_data, - struct gensio **new_gensio) --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.4.bb index 424e176ca..a02442862 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.4.bb @@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ " -SRCREV = "4ec19138aa968dea34e4bc4e022c1ad7ed4c43c0" +SRCREV = "95cfb8f6d8985e2fb8ba51c4887dd70aa7551a03" -SRC_URI = "git://github.com/cminyard/gensio;protocol=https \ - file://0001-Modify-parameter-of-function-sctp_gensio_alloc.patch" +SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=2.2.x" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.10.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb index b2495348f..ccdc65ac6 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.10.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb @@ -5,8 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" DEPENDS = "ell" -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" -SRCREV = "d8dc5a9bd19c5b98d8692801d3cf4e8af495930a" +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ + " +SRCREV = "bde3e0f6e3364e9c884b6b93a944d8138345b8e5" S = "${WORKDIR}/git" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.6.bb index 148b3ca8d..6fe6a2e4f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.6.bb @@ -13,5 +13,5 @@ inherit autotools pkgconfig bash-completion gobject-introspection SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "4b4b12ab7153d7c999289b5dfc2d25db" -SRC_URI[sha256sum] = "dd488ee6176243a6adb27a5872897336272ea7bea33a3ad501ba268e5a58b285" +SRC_URI[md5sum] = "38d228548eae3ee144e19a42b028eab0" +SRC_URI[sha256sum] = "760465caaa1ccd699c14290e9791da456d5300dd11ebf4c1486151033e875dfd" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb index 5c19e65b0..e9e35b165 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb @@ -4,12 +4,11 @@ SECTION = "base" LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c6036d0eb7edbfced28c4160e5d3fa94" -SRC_URI = "http://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.bz2 \ +SRC_URI = "http://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ file://0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch \ file://dont.call.git.rev-parse.on.parent.dir.patch" -SRC_URI[md5sum] = "b957713a6cfbcd8ac0e94420aeddcf1a" -SRC_URI[sha256sum] = "3e160cca504a53679f2b3254f31c53a4fb38a021bc50fed8eb57a436d33dfa07" +SRC_URI[sha256sum] = "dffc631c611520478b8a286f57c67a35e8cb5802d376c6ca13b057365432389c" do_compile() { oe_runmake @@ -24,4 +23,3 @@ inherit update-alternatives ALTERNATIVE_${PN} = "rfkill" ALTERNATIVE_PRIORITY = "60" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.3.bb index 6293d1229..87b5b15b7 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.3.bb @@ -9,7 +9,7 @@ DEPENDS = "gensio libyaml" SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[sha256sum] = "5e407d684d0aa0919ddd15af368f890c5940cddd6034b7efc363823f38f6ff0c" +SRC_URI[sha256sum] = "f5be52033a690bd0dd711209a64ebaec024ee4542b1357350aad8489dc2bf720" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb index 297185de7..57267a8de 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb @@ -18,7 +18,7 @@ PV = "3.00" S = "${WORKDIR}/git" -inherit autotools gettext update-rc.d systemd mime-xdg +inherit autotools-brokensep gettext update-rc.d systemd mime-xdg PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" @@ -33,12 +33,16 @@ TRANSMISSION_GROUP ??= "root" # Configure aborts with: # config.status: error: po/Makefile.in.in was not created by intltoolize. -B = "${S}" -do_configure_prepend() { +do_configure() { sed -i /AM_GLIB_GNU_GETTEXT/d ${S}/configure.ac cd ${S} ./update-version-h.sh intltoolize --copy --force --automake + aclocal + libtoolize --automake --copy --force + autoconf + automake -a + oe_runconf } do_install_append() { diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.3.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.6.bb index e6129e246..f4c5aa396 100644 --- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.6.bb @@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" DEPENDS = "mm-common" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-${PV}.tar.xz" -SRC_URI[md5sum] = "ea68c7afc23a4b89a2dfa78344460785" -SRC_URI[sha256sum] = "0b68dfc6313c6cc90ac989c6d722a1bf0585ad13846e79746aa87cb265904786" +SRC_URI[sha256sum] = "dda176dc4681bda9d5a2ac1bc55273bdd381662b7a6d49e918267d13e8774e1b" S = "${WORKDIR}/libsigc++-${PV}" -inherit autotools +inherit meson FILES_${PN}-dev += "${libdir}/sigc++-*/" FILES_${PN}-doc += "${datadir}/devhelp" diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb index 78c1cb444..04106fcc9 100644 --- a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb @@ -21,8 +21,7 @@ SRC_URI = " \ file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ " -SRC_URI[md5sum] = "4efa5551d230165981b105e7c6a50aa7" -SRC_URI[sha256sum] = "4a197a4f1a05785d7453dd829b231352fb2d09171bd86c5ffaafbb2dd6791351" +SRC_URI[md5sum] = "8a25d23f3ae732af300a56fa33cacff2" EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \ --with-logo=${LOGO} \ @@ -41,7 +40,7 @@ PACKAGECONFIG[initrd] = ",,," LOGO ??= "${datadir}/plymouth/bizcom.png" -inherit autotools pkgconfig systemd +inherit autotools pkgconfig systemd gettext do_install_append() { # Remove /var/run from package as plymouth will populate it on startup diff --git a/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb index 46e694be4..0c5fc9319 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb @@ -14,4 +14,15 @@ UPSTREAM_CHECK_REGEX = "Libmcrypt/(?P<pver>\d+(\.\d+)+)/" inherit autotools-brokensep gettext binconfig +do_configure() { + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + aclocal + libtoolize --automake --copy --force + autoconf + autoheader + automake -a + oe_runconf +} + CLEANBROKEN = "1" 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 index 3cb2090d1..6e87b9d91 100644 --- 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 @@ -18,3 +18,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> ) + +replace github.com/pkg/term => github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627 +--- a/go.sum ++++ b/go.sum +@@ -215,6 +215,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dA + github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= + github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= + github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= ++github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627 h1:3/XXm86KqrOZEJvEmFlzl3NTFA99n5Pd/cSXl60LmuA= ++github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627/go.mod h1:BYR4E+NOQrH+NhXE71KuBNmyR1lQ+yDvP+O3IIHO5bM= + github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= + github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= + github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch index 865ad3287..0dc6ece6d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch @@ -9,8 +9,6 @@ extending the existing aarch64 macro works. src/include/storage/s_lock.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h -index 3fe29ce..7cd578f 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -316,11 +316,12 @@ tas(volatile slock_t *lock) @@ -36,6 +34,3 @@ index 3fe29ce..7cd578f 100644 /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ --- -2.9.3 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch index 60b7910c5..e9bc6240d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch @@ -22,11 +22,9 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> src/common/Makefile | 3 --- 1 file changed, 3 deletions(-) -diff --git a/src/common/Makefile b/src/common/Makefile -index 16619e4..665eaa1 100644 --- a/src/common/Makefile +++ b/src/common/Makefile -@@ -31,9 +31,6 @@ include $(top_builddir)/src/Makefile.global +@@ -31,9 +31,6 @@ include $(top_builddir)/src/Makefile.glo # don't include subdirectory-path-dependent -I and -L switches STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS)) STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS)) @@ -36,6 +34,3 @@ index 16619e4..665eaa1 100644 override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch new file mode 100644 index 000000000..970d750b1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch @@ -0,0 +1,27 @@ +From 7177d8334a3c28ab0ec5c90e0656f43414929659 Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Fri, 5 Feb 2021 17:15:42 -0500 +Subject: [PATCH] configure.in: bypass autoconf 2.69 version check + +for upgrade to autoconf 2.71 + +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +--- + configure.in | 4 ---- + 1 file changed, 4 deletions(-) + +--- a/configure.in ++++ b/configure.in +@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un + + AC_INIT([PostgreSQL], [13.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.in' but it is then +-your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2020, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config) diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch index 22b62d9de..ba2ee29f0 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch @@ -19,11 +19,9 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index b98b9bb..8584677 100644 --- a/configure.in +++ b/configure.in -@@ -2211,7 +2211,7 @@ Use --without-tcl to disable building PL/Tcl.]) +@@ -2206,7 +2206,7 @@ Use --without-tcl to disable building PL fi # check for <perl.h> @@ -32,6 +30,3 @@ index b98b9bb..8584677 100644 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $perl_includespec" AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])], --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb deleted file mode 100644 index aeeddc647..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc4ce21960f0c561460d750bc270d11f" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0001-Improve-reproducibility.patch \ -" - -SRC_URI[sha256sum] = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.2.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.2.bb new file mode 100644 index 000000000..ca8a6c7ce --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.2.bb @@ -0,0 +1,12 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=255f15687738db8068fbe9b938c90217" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0001-Improve-reproducibility.patch \ + file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \ +" + +SRC_URI[sha256sum] = "5fd7fcd08db86f5b2aed28fcfaf9ae0aca8e9428561ac547764c2a2b0f41adfc" diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.15.5.bb index 117a16b9e..acef05b01 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.15.5.bb @@ -6,9 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "f3e33549c151f30ac4eb7c22356c6d0331f37652" -SRCBRANCH = "6.12.fb" -PV = "6.12.7" +SRCREV = "abd4b1ff1504ae2a7ed6e60bc9c9797b880c33a5" +SRCBRANCH = "6.15.fb" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ file://0001-cmake-Add-check-for-atomic-support.patch \ 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 cc7bf01d7..9557c9345 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 @@ -17,8 +17,6 @@ SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ S = "${WORKDIR}/git" -DEPENDS_append_libc-musl = " libexecinfo " - ASNEEDED_class-native = "" ASNEEDED_class-nativesdk = "" @@ -26,6 +24,7 @@ inherit cmake EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ -DBUILD_TESTING=OFF \ + -DCMAKE_CXX_STANDARD=14 \ " BBCLASSEXTEND = "native nativesdk" @@ -33,28 +32,3 @@ ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "${libdir}/libabsl_*.so ${libdir}/cmake" FILES_${PN}-dev = "${includedir}" - -python () { - arch = d.getVar("TARGET_ARCH") - - if arch == "aarch64": - tunes = d.getVar("TUNE_FEATURES") - if not tunes: - raise bb.parse.SkipRecipe("%s-%s Needs support for crypto on armv8" % (pkgn, pkgv)) - return - pkgn = d.getVar("PN") - pkgv = d.getVar("PV") - if "crypto" not in tunes: - raise bb.parse.SkipRecipe("%s-%s Needs support for crypto on armv8" % (pkgn, pkgv)) - - if arch == "x86_64": - tunes = d.getVar("TUNE_FEATURES") - if not tunes: - raise bb.parse.SkipRecipe("%s-%s Needs support for corei7 on x86_64" % (pkgn, pkgv)) - return - pkgn = d.getVar("PN") - pkgv = d.getVar("PV") - if "corei7" not in tunes: - raise bb.parse.SkipRecipe("%s-%s Needs support for corei7 on x86_64" % (pkgn, pkgv)) - -} diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index ae1463942..d93a7f723 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -3,7 +3,7 @@ SECTION = "console/utils" LICENSE = "Apache-2.0 & GPL-2.0 & BSD-2-Clause & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ - file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ + file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \ file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb b/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb index 6d4635b66..107a4a833 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb @@ -4,9 +4,9 @@ SECTION = "libs" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/CPPAlliance/url.git" +SRC_URI = "git://github.com/CPPAlliance/url.git;branch=develop" -SRCREV = "a56ae0df6d3078319755fbaa67822b4fa7fd352b" +SRCREV = "2c867fbe284ae532f1329b87a86ad3f8cd382867" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20200427.bb b/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20201006.bb index ff781f694..1b42590f4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20200427.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20201006.bb @@ -3,13 +3,13 @@ DESCRIPTION = "cpuid dumps detailed information about the CPU(s) gathered \ from the CPUID instruction, and also determines the exact model of CPU(s). \ It supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, \ UMC, NexGen, Rise, and SiS CPUs" +HOMEPAGE="http://www.etallen.com/cpuid.html" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \ " -SRC_URI[md5sum] = "daa93ee2fdaf461e515b4713e7337076" -SRC_URI[sha256sum] = "c1a9463f1f2175086120e9079e318bbd383dc1e574fafb2f724879f1d11061d4" +SRC_URI[sha256sum] = "13c53f16408341d11ed489b352f218ec4dbb5bedb796a9d059e924770a9c56a6" COMPATIBLE_HOST = "(i.86|x86_64).*-linux" diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch deleted file mode 100644 index 25e5ac4ea..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001 -From: Dominik Schmidt <dominik@schm1dt.ch> -Date: Sun, 23 Feb 2020 19:15:30 +0100 -Subject: [PATCH] Make libgit2 version preprocessor conditionals compatible - with libgit2-0.99 - -LIBGIT2_SOVERSION is defined as string literal, e.g. "0.99", -from libgit2-0.99 and beyond. Arithmetic checks against this -variable whill hence fail. This patch switches the checks to -compare against the LIBGIT2_VER_* family, which should be more stable. ---- - git-changebar/src/gcb-plugin.c | 6 +++--- - workbench/src/plugin_main.c | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c -index b7083199..a911815f 100644 ---- a/git-changebar/src/gcb-plugin.c -+++ b/git-changebar/src/gcb-plugin.c -@@ -32,11 +32,11 @@ - #include <geany.h> - #include <document.h> - --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) ) - # define git_libgit2_init git_threads_init - # define git_libgit2_shutdown git_threads_shutdown - #endif --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) ) - /* 0.23 added @p binary_cb */ - # define git_diff_buffers(old_buffer, old_len, old_as_path, \ - new_buffer, new_len, new_as_path, options, \ -@@ -45,7 +45,7 @@ - new_buffer, new_len, new_as_path, options, \ - file_cb, hunk_cb, line_cb, payload) - #endif --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) ) - # define git_buf_dispose git_buf_free - # define git_error_last giterr_last - #endif -diff --git a/workbench/src/plugin_main.c b/workbench/src/plugin_main.c -index 6fa6fc84..25ecdf6d 100644 ---- a/workbench/src/plugin_main.c -+++ b/workbench/src/plugin_main.c -@@ -36,7 +36,7 @@ - #include "tm_control.h" - - --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22)) - # define git_libgit2_init git_threads_init - # define git_libgit2_shutdown git_threads_shutdown - #endif diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.37.bb index 3cf260573..890bbdb44 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.37.bb @@ -31,10 +31,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ file://0001-Use-pkg-config-to-find-gpgme.patch \ - file://0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch \ " -SRC_URI[md5sum] = "91fb4634953702f914d9105da7048a33" -SRC_URI[sha256sum] = "ebe18dd699292174622e8cb8745b020ada8a5be3b604ab980af36e8518df7ce6" +SRC_URI[sha256sum] = "c98f9b1303f4ab9bed7587e749cd0b5594d9136a1bf8ba110900d46a17fa9cd8" do_configure_prepend() { rm -f ${S}/build/cache/glib-gettext.m4 diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch b/meta-openembedded/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch new file mode 100644 index 000000000..b96684719 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch @@ -0,0 +1,22 @@ +From 51e145b43e66134aa4b33c9af0319331ec8a5bce Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 5 Feb 2021 23:15:45 -0800 +Subject: [PATCH] configure: Use AC_PROG_INTLTOOL + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/configure.ac ++++ b/configure.ac +@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects]) + AC_CONFIG_HEADERS([config.h]) +- ++AC_PROG_INTLTOOL + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + + GEANY_PREFIX diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.37.1.bb index 039999f6b..b361b1187 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.37.1.bb @@ -9,9 +9,10 @@ inherit features_check autotools pkgconfig perlnative gettext mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "https://download.geany.org/${BP}.tar.bz2" -SRC_URI[md5sum] = "53216a43345e2b6dbefa02ac24885753" -SRC_URI[sha256sum] = "9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e" +SRC_URI = "https://download.geany.org/${BP}.tar.bz2 \ + file://0001-configure-Upgrade-to-a-modern-Gettext.patch \ + " +SRC_URI[sha256sum] = "18c5756444c1d8bcd737c8ecfd4ef0b3607c924fc02560d4e8b78f6121531a18" FILES_${PN} += "${datadir}/icons" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch deleted file mode 100644 index 6cad53396..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6d606f1101c1a172fb6d738d6f1865aa61849e68 Mon Sep 17 00:00:00 2001 -From: Alexey Firago <alexey_firago@mentor.com> -Date: Fri, 20 Oct 2017 00:04:19 +0300 -Subject: [PATCH] CMakeLists.txt: Fix grpc_cpp_plugin path during cross-compiling or native build - -Signed-off-by: Alexey Firago <alexey_firago@mentor.com> -Signed-off-by: Hiram Lew <lew@avast.com> -Signed-off-by: Jan Kaisrlik <jan.kaisrlik@avast.com> ---- - CMakeLists.txt | 9 ++++++++- - templates/CMakeLists.txt.template | 9 ++++++++- - 2 files changed, 16 insertions(+), 2 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -193,6 +193,13 @@ function(protobuf_generate_grpc_cpp) - return() - endif() - -+ #if cross-compiling or nativesdk, find host plugin -+ if(CMAKE_CROSSCOMPILING) -+ find_program(gRPC_CPP_PLUGIN grpc_cpp_plugin) -+ else() -+ set(gRPC_CPP_PLUGIN $<TARGET_FILE:grpc_cpp_plugin>) -+ endif() -+ - set(_protobuf_include_path -I . -I ${_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR}) - foreach(FIL ${ARGN}) - get_filename_component(ABS_FIL ${FIL} ABSOLUTE) ---- a/templates/CMakeLists.txt.template -+++ b/templates/CMakeLists.txt.template -@@ -233,6 +233,13 @@ - return() - endif() - -+ #if cross-compiling or nativesdk, find host plugin -+ if(CMAKE_CROSSCOMPILING) -+ find_program(gRPC_CPP_PLUGIN grpc_cpp_plugin) -+ else() -+ set(gRPC_CPP_PLUGIN $<TARGET_FILE:grpc_cpp_plugin>) -+ endif() -+ - set(_protobuf_include_path -I . -I <%text>${_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR}</%text>) - foreach(FIL <%text>${ARGN}</%text>) - get_filename_component(ABS_FIL <%text>${FIL}</%text> ABSOLUTE) diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch deleted file mode 100644 index e517355d3..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 2279e30be5796e9b185545543ea54fe68633cbdd Mon Sep 17 00:00:00 2001 -From: Alexey Firago <alexey_firago@mentor.com> -Date: Mon, 30 Oct 2017 23:24:49 +0300 -Subject: [PATCH] CMakeLists.txt: Fix libraries installation for Linux - -* Set libs versions as in Makefile - -Signed-off-by: Alexey Firago <alexey_firago@mentor.com> - ---- - CMakeLists.txt | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 59 insertions(+) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,6 +30,15 @@ set(PACKAGE_TARNAME "${PACKAGE_NAME}-$ - set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") - project(${PACKAGE_NAME} C CXX) - -+set (CORE_VERSION_MAJOR "6") -+set (CORE_VERSION "6.0.0") -+ -+set (CPP_VERSION_MAJOR "1") -+set (CPP_VERSION "${PACKAGE_VERSION}") -+ -+set (CSHARP_VERSION_MAJOR "1") -+set (CSHARP_VERSION "${PACKAGE_VERSION}") -+ - set(gRPC_INSTALL_BINDIR "bin" CACHE STRING "Installation directory for executables") - set(gRPC_INSTALL_LIBDIR "lib" CACHE STRING "Installation directory for libraries") - set(gRPC_INSTALL_INCLUDEDIR "include" CACHE STRING "Installation directory for headers") -@@ -777,6 +786,10 @@ if(WIN32 AND MSVC) - endif() - endif() - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET address_sorting PROPERTY VERSION ${CORE_VERSION}) -+ set_property(TARGET address_sorting PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) -+endif() - - target_include_directories(address_sorting - PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -903,6 +916,10 @@ if(WIN32 AND MSVC) - endif() - endif() - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET gpr PROPERTY VERSION ${CORE_VERSION}) -+ set_property(TARGET gpr PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) -+endif() - - target_include_directories(gpr - PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -1367,6 +1384,10 @@ if(WIN32 AND MSVC) - endif() - endif() - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET grpc PROPERTY VERSION ${CORE_VERSION}) -+ set_property(TARGET grpc PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) -+endif() - - target_include_directories(grpc - PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -1782,6 +1803,10 @@ if(WIN32 AND MSVC) - endif() - endif() - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET grpc_cronet PROPERTY VERSION ${CORE_VERSION}) -+ set_property(TARGET grpc_cronet PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) -+endif() - - target_include_directories(grpc_cronet - PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -2869,6 +2894,10 @@ if(WIN32 AND MSVC) - endif() - endif() - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET grpc_unsecure PROPERTY VERSION ${CORE_VERSION}) -+ set_property(TARGET grpc_unsecure PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) -+endif() - - target_include_directories(grpc_unsecure - PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -3206,6 +3235,10 @@ if(WIN32 AND MSVC) - endif() - endif() - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET grpc++ PROPERTY VERSION ${CPP_VERSION}) -+ set_property(TARGET grpc++ PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) -+endif() - - target_include_directories(grpc++ - PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -3589,6 +3622,11 @@ protobuf_generate_grpc_cpp( - src/proto/grpc/status/status.proto - ) - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET grpc++_error_details PROPERTY VERSION ${CPP_VERSION}) -+ set_property(TARGET grpc++_error_details PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) -+endif() -+ - target_include_directories(grpc++_error_details - PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -@@ -3727,6 +3765,11 @@ protobuf_generate_grpc_cpp( - src/proto/grpc/reflection/v1alpha/reflection.proto - ) - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET grpc++_reflection PROPERTY VERSION ${CPP_VERSION}) -+ set_property(TARGET grpc++_reflection PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) -+endif() -+ - target_include_directories(grpc++_reflection - PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -@@ -3816,6 +3859,10 @@ target_link_libraries(grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} - ) - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET grpc++_cronet PROPERTY VERSION ${CPP_VERSION}) -+ set_property(TARGET grpc++_cronet PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) -+endif() - - endif (gRPC_BUILD_TESTS) - if (gRPC_BUILD_TESTS) -@@ -4307,6 +4354,10 @@ if(WIN32 AND MSVC) - endif() - endif() - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET grpc++_unsecure PROPERTY VERSION ${CPP_VERSION}) -+ set_property(TARGET grpc++_unsecure PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) -+endif() - - target_include_directories(grpc++_unsecure - PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -4745,6 +4796,10 @@ if(WIN32 AND MSVC) - endif() - endif() - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET grpc_plugin_support PROPERTY VERSION ${CORE_VERSION}) -+ set_property(TARGET grpc_plugin_support PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) -+endif() - - target_include_directories(grpc_plugin_support - PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -4813,6 +4868,11 @@ protobuf_generate_grpc_cpp( - src/proto/grpc/channelz/channelz.proto - ) - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET grpcpp_channelz PROPERTY VERSION ${CPP_VERSION}) -+ set_property(TARGET grpcpp_channelz PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) -+endif() -+ - target_include_directories(grpcpp_channelz - PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -@@ -5367,6 +5427,10 @@ if(WIN32 AND MSVC) - endif() - endif() - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET grpc_csharp_ext PROPERTY VERSION ${CSHARP_VERSION}) -+ set_property(TARGET grpc_csharp_ext PROPERTY SOVERSION ${CSHARP_VERSION_MAJOR}) -+endif() - - target_include_directories(grpc_csharp_ext - PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.36.1.bb index c25ce360e..358ec80e8 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.36.1.bb @@ -6,22 +6,15 @@ SECTION = "libs" LICENSE = "Apache-2" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -DEPENDS = "gflags c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2" +DEPENDS = "c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2 abseil-cpp re2" DEPENDS_append_class-target = " googletest grpc-native " DEPENDS_append_class-nativesdk = " grpc-native " S = "${WORKDIR}/git" -SRCREV_grpc = "2de2e8dd8921e1f7d043e01faf7fe8a291fbb072" -SRCREV_upb = "9effcbcb27f0a665f9f345030188c0b291e32482" -BRANCH = "v1.24.x" +SRCREV_grpc = "3b7f86e3516746c5f0db1947e0d65e94159bcb12" +BRANCH = "v1.36.x" SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ - git://github.com/protocolbuffers/upb;name=upb;destsuffix=git/third_party/upb \ - file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ " -SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch \ - " -SRC_URI_append_class-nativesdk = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch" - # Fixes build with older compilers 4.8 especially on ubuntu 14.04 CXXFLAGS_append_class-native = " -Wl,--no-as-needed" @@ -32,7 +25,8 @@ EXTRA_OECMAKE = " \ -DgRPC_ZLIB_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_PROTOBUF_PROVIDER=package \ - -DgRPC_GFLAGS_PROVIDER=package \ + -DgRPC_ABSL_PROVIDER=package \ + -DgRPC_RE2_PROVIDER=package \ -DgRPC_INSTALL=ON \ -DCMAKE_CROSSCOMPILING=ON \ -DBUILD_SHARED_LIBS=ON \ @@ -40,6 +34,20 @@ EXTRA_OECMAKE = " \ -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \ " +PACKAGECONFIG ??= "cpp" +PACKAGECONFIG[cpp] = "-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF" +PACKAGECONFIG[csharp] = "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF" +PACKAGECONFIG[node] = "-DgRPC_BUILD_GRPC_NODE_PLUGIN=ON,-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF" +PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF" +PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF" +PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF" +PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF" +PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF,protobuf-lite" + +do_configure_prepend() { + sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt +} + do_configure_prepend_mipsarch() { sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt } diff --git a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch index f123b3f55..a29c8ce87 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch @@ -1,8 +1,7 @@ From 528009f5ca0685c95ef27f6c8957160499c0576a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 10 May 2013 10:42:45 -0700 -Subject: [PATCH] Do not strip automatically, this leaves the stripping - busines to OE +Subject: [PATCH] Do not strip automatically, this leaves the stripping busines to OE Upstream-Status: Inappropriate [OE-Specific] diff --git a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb index 6573efcd9..753835261 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=abe9020de9c00909317d02d5c803810e" HOMEPAGE = "http://luajit.org" SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ @@ -8,9 +8,9 @@ SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://clang.patch \ " -# Set PV to a version tag and date associated with SRCREV if it is later. -PV = "2.1.0~beta3-200809" -SRCREV = "94d4abcca966df2cc423e821bcacd04898f73117" +# Set PV to a version tag and date (YYMMDD) associated with SRCREV if it is later. +PV = "2.1.0~beta3-210112" +SRCREV = "ec6edc5c39c25e4eb3fca51b753f9995e97215da" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.2.bb deleted file mode 100644 index 51b313cef..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.2.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Message Passing Interface (MPI) implementation" -HOMEPAGE = "http://www.mpich.org/" -SECTION = "devel" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2106f0435056f3dd9349747a766e5816" - -SRC_URI = " \ - http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "f414cfa77099cd1fa1a5ae4e22db508a" -SRC_URI[sha256sum] = "0778679a6b693d7b7caff37ff9d2856dc2bfc51318bf8373859bfa74253da3dc" - -RDEPENDS_${PN} += "bash perl libxml2" -S = "${WORKDIR}/${BP}" - -EXTRA_OECONF = "--enable-debuginfo \ - --enable-fast \ - --enable-shared \ - --with-pm=gforker \ - --disable-rpath \ - --disable-f77 \ - --disable-fc \ - --disable-fortran \ - --disable-cxx \ - BASH_SHELL='${USRBINPATH}/env bash' \ - PERL='${USRBINPATH}/env perl' \ -" - -inherit autotools-brokensep gettext - -do_configure_prepend() { - for d in confdb test/mpi/confdb src/openpa/confdb src/pm/hydra/confdb src/pm/hydra/tools/topo/hwloc/hwloc/config src/pm/hydra/mpl/confdb src/mpl/confdb src/mpi/romio/confdb; do - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/$d - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/$d - done - - autoreconf --verbose --install --force -I . -I confdb/ -I maint/ - oe_runconf - exit -} - -do_install_append() { - sed -i 's,${S}/,,g' ${D}/${libdir}/libmpi.la - sed -i 's,${DEBUG_PREFIX_MAP},,g' ${D}/${libdir}/pkgconfig/mpich.pc -} diff --git a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb new file mode 100644 index 000000000..77e080c8b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb @@ -0,0 +1,54 @@ +SUMMARY = "Message Passing Interface (MPI) implementation" +HOMEPAGE = "http://www.mpich.org/" +SECTION = "devel" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bd4d7ab13df98988b1ca2a4e01c8c163" + +SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" +SRC_URI[sha256sum] = "8836939804ef6d492bcee7d54abafd6477d2beca247157d92688654d13779727" + +RDEPENDS_${PN} += "bash perl libxml2" + +EXTRA_OECONF = "--enable-debuginfo \ + --enable-fast \ + --enable-shared \ + --with-pm=gforker \ + --disable-rpath \ + --disable-f77 \ + --disable-fc \ + --disable-fortran \ + --disable-cxx \ + BASH_SHELL='${USRBINPATH}/env bash' \ + PERL='${USRBINPATH}/env perl' \ + --with-device=ch3:nemesis \ + --with-rdmacm=no \ + --disable-numa \ +" + +PACKAGECONFIG += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ +" +PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" + +inherit autotools gettext pkgconfig + +do_configure() { + for d in confdb test/mpi test/mpi/confdb src/pm/hydra/confdb \ + src/pm/hydra/tools/topo/hwloc/hwloc/config src/pm/hydra/mpl/confdb \ + modules/yaksa/m4 modules/json-c modules/ucx test/mpi/dtpools/confdb \ + src/mpl/confdb src/mpi/romio/confdb; do + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/$d + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/$d + done +# cd ${S} +# autoupdate +# autoreconf --verbose --install --force +# cd ${B} + oe_runconf +} + +do_install_append() { + sed -i 's,${S}/,,g' ${D}/${libdir}/libmpi.la + sed -i 's,${DEBUG_PREFIX_MAP},,g' ${D}/${libdir}/pkgconfig/mpich.pc +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.20.1.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.20.2.bb index 0673a3202..6acc36b4f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.20.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.20.2.bb @@ -26,7 +26,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ SRC_URI_append_class-target = " \ file://0002-Using-native-binaries.patch \ " -SRC_URI[sha256sum] = "e00eee325d705b2bfa9929b7d061eb2315402d7e8548945eac9870bf84321853" +SRC_URI[sha256sum] = "961ad600f0706c396390ebc7767fb01d5e3792a5022dc2e7774796756eec6d3c" S = "${WORKDIR}/node-v${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.15.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.16.bb index 7b1a8a639..b6bc80784 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.15.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.16.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=12;md5=b2562f94907eeb42 SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz" -SRC_URI[md5sum] = "060103c6d6e4d9833fa7715860f2923b" -SRC_URI[sha256sum] = "43f9cc0f87620bbb159e0890e196b23a8e6419cbd04224c10f3dcee948f6b51a" +SRC_URI[md5sum] = "5ee30bf7c76f00cc69f92388ad776e2a" +SRC_URI[sha256sum] = "8f1a09c070738adc695df903f2e7f74308dd8d991b914c0bc390a0e6021294dd" S = "${WORKDIR}/IO-Tty-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libjson-perl_4.02000.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb index 4e5a8a6ff..4e7aeb128 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libjson-perl_4.02000.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb @@ -11,7 +11,7 @@ DEPENDS += "perl" SRC_URI = "git://github.com/makamaka/JSON.git;protocol=https" -SRCREV = "42a6324df654e92419512cee80c0b49155d9e56d" +SRCREV = "ebbae181c5e311fa80ee4c6379b598c7a6400570" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb index 25b813792..f8a8755b9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb @@ -205,7 +205,7 @@ php_sysroot_preprocess () { MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp', '', d)}" -PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-opcache ${PN}" +PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-phpdbg ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-opcache ${PN}" RDEPENDS_${PN} += "libgcc" RDEPENDS_${PN}-pear = "${PN}" @@ -221,6 +221,7 @@ FILES_${PN}-dbg =+ "${bindir}/.debug \ ${libexecdir}/apache2/modules/.debug" FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc" FILES_${PN}-cli = "${bindir}/php" +FILES_${PN}-phpdbg = "${bindir}/phpdbg" FILES_${PN}-phar = "${bindir}/phar*" FILES_${PN}-cgi = "${bindir}/php-cgi" FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${systemd_unitdir}/system/php-fpm.service ${sysconfdir}/php-fpm.d/www.conf.default" 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 deleted file mode 100644 index 7e4aa103a..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-m4-pthread-update.patch +++ /dev/null @@ -1,731 +0,0 @@ -From 8cfb4284b4e8b2893bd30e9c764d45f288e71efb Mon Sep 17 00:00:00 2001 -From: Adam Cozzette <acozzette@google.com> -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 <adrian.herrera@arm.com> -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 <stevenj@alum.mit.edu> - # Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG> -+# Copyright (c) 2019 Marc Stevens <marc.stevens@cwi.nl> - # - # 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 <http://www.gnu.org/licenses/>. -+# with this program. If not, see <https://www.gnu.org/licenses/>. - # - # 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 <pthread.h> -+# 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 <pthread.h> --# 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 <pthread.h>], -- [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 <pthread.h>]], -- [[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 <pthread.h>], -+ [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 <pthread.h>]], -+ [[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.15.2.bb index 00f1e99d3..0392f9339 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.15.2.bb @@ -10,14 +10,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10" +SRCREV = "d7e943b8d2bc444a8c770644e73d090b486f8b37" SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ file://run-ptest \ 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/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch deleted file mode 100644 index 745f5d013..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8d272e53a4d1dc405e08ce2dd50159c58f4451e9 Mon Sep 17 00:00:00 2001 -From: Ruslan Bilovol <rbilovol@cisco.com> -Date: Thu, 24 Jan 2019 18:11:39 +0200 -Subject: [PATCH] CMake: remove hardcoded CMAKECONFIG_INSTALL_DIR path - -Currently this path is hardcoded to lib/cmake. -Some distributions have different library path (like lib64). -So reuse LIB_INSTALL_DIR for that to make CMAKECONFIG_INSTALL_DIR -configurable and usable in such distros. - -Upstream-Status: Backport [https://github.com/Tencent/rapidjson/commit/8d272e53a4d1dc405e08ce2dd50159c58f4451e9] - -Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com> ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c60407..0275672 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -199,9 +199,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}ConfigVersion.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake @ONLY) - - # ... for the install tree --SET( CMAKECONFIG_INSTALL_DIR lib/cmake/${PROJECT_NAME} ) -+SET( CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} ) - FILE( RELATIVE_PATH REL_INCLUDE_DIR -- "${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR}" -+ "${CMAKECONFIG_INSTALL_DIR}" - "${CMAKE_INSTALL_PREFIX}/include" ) - - SET( ${PROJECT_NAME}_INCLUDE_DIR "\${${PROJECT_NAME}_CMAKE_DIR}/${REL_INCLUDE_DIR}" ) --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch deleted file mode 100644 index cf3e16ea5..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 827155e5e659b2a5065b00d701bc59b57feab2bf Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Mon, 19 Dec 2016 01:37:11 -0800 -Subject: [PATCH] remove -march=native from CMAKE_CXX_FLAGS - -Not appropriate when cross compiling. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: git/CMakeLists.txt -=================================================================== ---- git.orig/CMakeLists.txt -+++ git/CMakeLists.txt -@@ -51,10 +51,10 @@ endif(CCACHE_FOUND) - - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - else() - #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER. -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror") - set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion) -@@ -84,7 +84,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "C - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") - else() - #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER. -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers") - set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough -Weverything) diff --git a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch new file mode 100644 index 000000000..bda90edb2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch @@ -0,0 +1,39 @@ +From 6b1cbe8b4dcc45103d69bc7337e5eb33d1fd21f3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 3 Feb 2021 14:22:51 -0800 +Subject: [PATCH] Do not use AC_HEADER_STDC + +This macro is removed in autotools 2.70+ and it can be expected that C90 +headers are always available [1] + +Upstream-Status: Pending + +[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.70/autoconf.html#index-AC_005fHEADER_005fSTDC + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 01b61097..2823ecd7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,14 +101,8 @@ AM_WITH_DMALLOC + # + # Checks for header files. + # +-AC_HEADER_STDC + AC_CHECK_HEADERS([strings.h libgen.h unistd.h direct.h sys/stat.h]) + +-# REQUIRE standard C headers +-if test "$ac_cv_header_stdc" != yes; then +- AC_MSG_ERROR([Standard (ANSI/ISO C89) header files are required.]) +-fi +- + # + # Checks for typedefs, structures, and compiler characteristics. + # +-- +2.30.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb index 53856263f..cacdd74c4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb @@ -9,7 +9,9 @@ DEPENDS += "flex-native bison-native xmlto-native" PV = "1.3.0+git${SRCPV}" # v1.3.0 SRCREV = "ba463d3c26c0ece2e797b8d6381b161633b5971a" -SRC_URI = "git://github.com/yasm/yasm.git" +SRC_URI = "git://github.com/yasm/yasm.git \ + file://0001-Do-not-use-AC_HEADER_STDC.patch \ +" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch deleted file mode 100644 index ad4493f0b..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4f2dd929618f149087249f3c90cc056d5080b1e4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 3 Nov 2016 01:20:33 -0700 -Subject: [PATCH] boinc: Add recipe for boinc-client - -Do not add prefix/lib to library search path -let sysroot take care of that - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Inappropriate[Cross-compile specific] - ---- - m4/ax_check_gl.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4 -index e26ce5b930..1e60c9266a 100644 ---- a/m4/ax_check_gl.m4 -+++ b/m4/ax_check_gl.m4 -@@ -58,7 +58,7 @@ else - else - ax_try_lib="${ax_lib}" - fi -- LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}" -+ LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[ - # if HAVE_WINDOWS_H && defined(_WIN32) diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb index db90f06f4..d2e81ee78 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb @@ -29,11 +29,10 @@ DEPENDS = "curl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \ nettle \ " -SRCREV = "e0e033af9fca3cca84a3417ea6531ae25be73a7a" -BRANCH = "client_release/7/${PV}" +SRCREV = "df0239e6f074207798a8ecf1358a74545dda9132" +BRANCH = "client_release/7/7.16" SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://boinc-AM_CONDITIONAL.patch \ - file://opengl_m4_check.patch \ file://gtk-configure.patch \ " @@ -56,11 +55,12 @@ EXTRA_OECONF += "\ --without-wxdir \ --without-x \ --with-boinc-platform=${TARGET_SYS} \ + ac_cv_c_undeclared_builtin_options='none' \ " export PKG_CONFIG = "${STAGING_BINDIR_NATIVE}/pkg-config" do_configure_prepend () { - if "${@bb.utils.contains('DEPENDS', 'gtk+', '1', '0', d)}" = "0" + if [ "${@bb.utils.contains('DEPENDS', 'gtk+', '1', '0', d)}" = "0" ] then export GTK2_CFLAGS="" export GTK2_LIBS="" diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch new file mode 100644 index 000000000..a6ff5991c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch @@ -0,0 +1,43 @@ +From 3d7390c89c2205d1eed0384be0bb65adb675e60d Mon Sep 17 00:00:00 2001 +From: Ramon Fried <ramon@neureality.ai> +Date: Tue, 9 Feb 2021 18:59:59 +0200 +Subject: [PATCH] bin: fix SIGSEGV caused by using flb_free instead of + mk_mem_free + +Upstream-Status: Accepted +Signed-off-by: Ramon Fried <ramon@neureality.ai> +--- + src/fluent-bit.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/fluent-bit.c b/src/fluent-bit.c +index c0c73b4..989cfde 100644 +--- a/src/fluent-bit.c ++++ b/src/fluent-bit.c +@@ -289,7 +289,7 @@ static int input_set_property(struct flb_input_instance *in, char *kv) + in->p->name, key); + } + +- flb_free(key); ++ mk_mem_free(key); + return ret; + } + +@@ -314,7 +314,7 @@ static int output_set_property(struct flb_output_instance *out, char *kv) + } + + ret = flb_output_set_property(out, key, value); +- flb_free(key); ++ mk_mem_free(key); + return ret; + } + +@@ -340,7 +340,7 @@ static int filter_set_property(struct flb_filter_instance *filter, char *kv) + } + + ret = flb_filter_set_property(filter, key, value); +- flb_free(key); ++ mk_mem_free(key); + return ret; + } + diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch new file mode 100644 index 000000000..91675dfc6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch @@ -0,0 +1,82 @@ +From 7c3b1dfb174312594d3317c24ed71c60398f653f Mon Sep 17 00:00:00 2001 +From: Ramon Fried <ramon@neureality.ai> +Date: Wed, 10 Feb 2021 04:23:36 +0200 +Subject: [PATCH] parser: Fix SIGSEGV caused by using flb_free instead of + mk_mem_free + +Upstream-Status: Backport (fix only for 1.3.5) +Signed-off-by: Ramon Fried <ramon@neureality.ai> +--- + src/flb_parser.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/src/flb_parser.c b/src/flb_parser.c +index d35c568..7c20e12 100644 +--- a/src/flb_parser.c ++++ b/src/flb_parser.c +@@ -490,7 +490,7 @@ int flb_parser_conf_file(const char *file, struct flb_config *config) + MK_RCONF_STR); + if (str) { + time_keep = flb_utils_bool(str); +- flb_free(str); ++ mk_mem_free(str); + } + else { + time_keep = FLB_FALSE; +@@ -522,23 +522,23 @@ int flb_parser_conf_file(const char *file, struct flb_config *config) + + flb_debug("[parser] new parser registered: %s", name); + +- flb_free(name); +- flb_free(format); ++ mk_mem_free(name); ++ mk_mem_free(format); + + if (regex) { +- flb_free(regex); ++ mk_mem_free(regex); + } + if (time_fmt) { +- flb_free(time_fmt); ++ mk_mem_free(time_fmt); + } + if (time_key) { +- flb_free(time_key); ++ mk_mem_free(time_key); + } + if (time_offset) { +- flb_free(time_offset); ++ mk_mem_free(time_offset); + } + if (types_str) { +- flb_free(types_str); ++ mk_mem_free(types_str); + } + + decoders = NULL; +@@ -548,19 +548,19 @@ int flb_parser_conf_file(const char *file, struct flb_config *config) + return 0; + + fconf_error: +- flb_free(name); +- flb_free(format); ++ mk_mem_free(name); ++ mk_mem_free(format); + if (regex) { +- flb_free(regex); ++ mk_mem_free(regex); + } + if (time_fmt) { +- flb_free(time_fmt); ++ mk_mem_free(time_fmt); + } + if (time_key) { +- flb_free(time_key); ++ mk_mem_free(time_key); + } + if (types_str) { +- flb_free(types_str); ++ mk_mem_free(types_str); + } + if (decoders) { + flb_parser_decoder_list_destroy(decoders); diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb index bc4cd0cf9..eac267041 100644 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb @@ -16,12 +16,16 @@ SRC_URI = "http://fluentbit.io/releases/1.3/fluent-bit-${PV}.tar.gz \ file://cross-build-init-system-detection.patch \ file://builtin-nan.patch \ file://0001-ppc-Fix-signature-for-co_create-API.patch \ - " + file://0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch \ + file://0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch \ + " SRC_URI[md5sum] = "6eae6dfd0a874e5dd270c36e9c68f747" SRC_URI[sha256sum] = "e037c76c89269c8dc4027a08e442fefd2751b0f1e0f9c38f9a4b12d781a9c789" S = "${WORKDIR}/fluent-bit-${PV}" DEPENDS = "zlib bison-native flex-native" +DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + DEPENDS_append_libc-musl = " fts " INSANE_SKIP_${PN}-dev += "dev-elf" diff --git a/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb b/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb index 3e7fb2a07..3a7413d8a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "git://github.com/pixel/hexedit.git \ " -SRCREV = "800e4b2e6280531a84fd23ee0b48e16baeb90878" +SRCREV = "baf45a289360a39a05253949fb9d1b50e4668d8a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb index 68beec670..3933355ab 100644 --- a/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb +++ b/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb @@ -1,6 +1,6 @@ SUMMARY = "inputattach configuration file" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://inputattach.conf" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.24.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.25.bb index 99cdee5bb..2c8fdc75c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.24.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.25.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools gobject-introspection SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch" -SRCREV = "f5a4ba8bb298f8cbc435707d0b19b4b2ff836a8e" +SRCREV = "c50869272b54bf4b4bc3825e8c3332a54678b43f" S = "${WORKDIR}/git" FILES_${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages" @@ -37,4 +37,3 @@ PACKAGECONFIG[kbd] = "--with-kbd,--without-kbd,libbytesize" PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" - 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 70ea82eb9..a4a258145 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 @@ -9,6 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29" SRC_URI = "https://hyperrealm.github.io/libconfig/dist/libconfig-${PV}.tar.gz" +UPSTREAM_CHECK_URI = "https://github.com/hyperrealm/libconfig/releases" +UPSTREAM_CHECK_REGEX = "Version (?P<pver>\d+(\.\d+)+)" + inherit autotools-brokensep pkgconfig SRC_URI[md5sum] = "6bd98ee3a6e6b9126c82c916d7a9e690" @@ -16,4 +19,3 @@ SRC_URI[sha256sum] = "7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a PACKAGE_BEFORE_PN = "${PN}++" FILES_${PN}++ = "${libdir}/${BPN}++*${SOLIBS}" - diff --git a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch new file mode 100644 index 000000000..46493bb9e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch @@ -0,0 +1,33 @@ +From a8502c5a7e336f1e5068f9dd3bdb359d787f9bdc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 5 Feb 2021 18:35:12 -0800 +Subject: [PATCH] configure.ac: Do not use single line comment + +autoconf 2.70+ does not like it and regenerating configure script fails + +| ../libstatgrab-0.92/configure: line 7818: syntax error near unexpected token `ac_fn_check_decl' +| ../libstatgrab-0.92/configure: line 7818: `fi ac_fn_check_decl "$LINENO" "__sun" "ac_cv_have_decl___sun" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"' + +Upstream-Status: Submitted [https://github.com/libstatgrab/libstatgrab/pull/128] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99518f8..74e7f0f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,8 @@ AC_TYPE_UNSIGNED_LONG_LONG_INT + + dnl Check for extra flags to enable some kind of behavior + AC_CHECK_DECL([_AIX],[ac_cv_need_minus_d_linux_source_compat="yes"; ac_cv_need_minus_d_all_source="yes"]) +-AC_CHECK_DECL([__linux],[ac_cv_need_minus_d_gnu_source="yes"]) dnl probably required by kfreebsd, too? ++dnl probably required by kfreebsd, too? ++AC_CHECK_DECL([__linux],[ac_cv_need_minus_d_gnu_source="yes"]) + AC_CHECK_DECL([__sun],[ac_cv_need_minus_d_extensions="yes"; ac_cv_need_minus_d_posix_pthread_semantics="yes"]) + AC_CHECK_DECL([__hpux],[ac_cv_need_minus_d_hpux_source="yes"]) + +-- +2.30.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb index 27fe0e2c4..a47d3bf00 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb @@ -10,6 +10,7 @@ PACKAGES_prepend = "statgrab statgrab-dbg saidar saidar-dbg ${PN}-mrtg " # don't use the git tag unless docbooc2x is available to build the manpages SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_0_92/libstatgrab-0.92.tar.gz \ + file://0001-configure.ac-Do-not-use-single-line-comment.patch \ " SRC_URI[md5sum] = "5362b2ddbec54b3901e7d70c22cda249" SRC_URI[sha256sum] = "5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012d5a196" diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-cxxopts-Add-limits-header.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-cxxopts-Add-limits-header.patch new file mode 100644 index 000000000..ef26c475d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-cxxopts-Add-limits-header.patch @@ -0,0 +1,34 @@ +From fda0713ce3e07786757a057abe7ebf2146d33780 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Mar 2021 18:31:45 -0800 +Subject: [PATCH] cxxopts: Add limits header + +needed for numeric_limits + +Upstream-Status: Submitted [https://github.com/apache/nifi-minifi-cpp/pull/1021] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + thirdparty/cxxopts/include/cxxopts.hpp | 1 + + 1 file changed, 1 insertion(+) + +--- a/thirdparty/cxxopts/include/cxxopts.hpp ++++ b/thirdparty/cxxopts/include/cxxopts.hpp +@@ -29,6 +29,7 @@ THE SOFTWARE. + #include <cctype> + #include <exception> + #include <iostream> ++#include <limits> + #include <map> + #include <memory> + #include <regex> +--- a/libminifi/src/utils/StringUtils.cpp ++++ b/libminifi/src/utils/StringUtils.cpp +@@ -21,6 +21,8 @@ + #include <Windows.h> + #endif + ++#include <limits> ++ + namespace org { + namespace apache { + namespace nifi { diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index b3ea44c3c..322b58477 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -28,6 +28,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ file://0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch \ file://0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch \ file://0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch \ + file://0001-cxxopts-Add-limits-header.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ @@ -75,6 +76,7 @@ TARGET_CFLAGS_append_riscv64 = " -fpic" TARGET_CXXFLAGS_append_riscv64 = " -fpic" do_install[cleandirs] += "${WORKDIR}/minifi-install" +PSEUDO_CONSIDER_PATHS .= ",${WORKDIR}/minifi-install" do_install() { DESTDIR='${WORKDIR}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb index 4059fd47e..8b7a8d06e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} += "hiredis" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "a9f9c301f8de1c181e6d45c573b5d1fe7b8200b1" +SRCREV = "8ac506e6eb0e5c5b2625785b67400bde705773a1" SRC_URI = "git://github.com/sewenew/redis-plus-plus" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson/0001-fix-jump-misses-init-gcc-8-warning.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson/0001-fix-jump-misses-init-gcc-8-warning.patch deleted file mode 100644 index 25e5efa4b..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson/0001-fix-jump-misses-init-gcc-8-warning.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d697182f18a421b7f80ea9de4914251b55d82532 Mon Sep 17 00:00:00 2001 -From: Rainer Gerhards <rgerhards@adiscon.com> -Date: Sun, 15 Jul 2018 17:24:59 +0200 -Subject: [PATCH] "fix" "jump-misses-init" gcc-8 warning - -Actually, that warning is overly conservative, and so we -have changed the code in a somewhat suboptimal way to "fix" -it. In this spots, it's not that bad and we wanted to avoid -totally disabling this warning. - -If it were more costly in terms of cleanness, we would probaly -have done that. Just mention it to tell anyone else the -cure is not really a good one, just selected due to the -circumstances in this special case. - -Upstream-Status: Backport - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - json_object.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/json_object.c b/json_object.c -index 35338e1..6e67891 100644 ---- a/json_object.c -+++ b/json_object.c -@@ -396,6 +396,7 @@ fjson_child_get_empty_etry(struct fjson_object *const __restrict__ jso) - { - struct _fjson_child *chld = NULL; - struct _fjson_child_pg *pg; -+ int pg_idx; - - if (jso->o.c_obj.ndeleted > 0) { - /* we first fill deleted spots */ -@@ -415,7 +416,7 @@ fjson_child_get_empty_etry(struct fjson_object *const __restrict__ jso) - goto done; - } - -- const int pg_idx = jso->o.c_obj.nelem % FJSON_OBJECT_CHLD_PG_SIZE; -+ pg_idx = jso->o.c_obj.nelem % FJSON_OBJECT_CHLD_PG_SIZE; - if (jso->o.c_obj.nelem > 0 && pg_idx == 0) { - if((pg = calloc(1, sizeof(struct _fjson_child_pg))) == NULL) { - errno = ENOMEM; --- -2.11.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.8.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb index b84dde3d3..88ba9edaa 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb @@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a958bb07122368f3e1d9b2efe07d231f" DEPENDS = "" -SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https \ - file://0001-fix-jump-misses-init-gcc-8-warning.patch" +SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https" -SRCREV = "4758b1caf69ada911ef79e1d80793fe489b98dff" +SRCREV = "0293afb3913f760c449348551cca4d2df59c1a00" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.service b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.service new file mode 100644 index 000000000..0aacff32d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.service @@ -0,0 +1,21 @@ +[Unit] +Description=System Logging Service +Requires=syslog.socket +Wants=network.target network-online.target +After=network.target network-online.target +Documentation=man:rsyslogd(8) +Documentation=http://www.rsyslog.com/doc/ + +[Service] +Type=notify +ExecStart=@sbindir@/rsyslogd -n -iNONE +StandardOutput=null +Restart=on-failure + +# Increase the default a bit in order to allow many simultaneous +# files to be monitored, we might need a lot of fds. +LimitNOFILE=16384 + +[Install] +WantedBy=multi-user.target +Alias=syslog.service diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2102.0.bb index b6c2a991f..22059d140 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2102.0.bb @@ -21,6 +21,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t file://initscript \ file://rsyslog.conf \ file://rsyslog.logrotate \ + file://rsyslog.service \ file://use-pkgconfig-to-check-libgcrypt.patch \ file://run-ptest \ " @@ -29,8 +30,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "33de768941953ceeca9d1a437b47891b" -SRC_URI[sha256sum] = "d9589e64866f2fdc5636af4cae9d60ebf1e3257bb84b81ee953ede6a05878e97" +SRC_URI[md5sum] = "1f6150dfd2ef38db37c2165e98d2f2b1" +SRC_URI[sha256sum] = "94ee0d0312c2edea737665594cbe4a9475e4e3b593e12b5b8ae3a743ac9c72a7" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" @@ -77,6 +78,7 @@ PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," PACKAGECONFIG[valgrind] = ",--without-valgrind-testbench,valgrind," +PACKAGECONFIG[imhttp] = "--enable-imhttp,--disable-imhttp,civetweb," do_configure_prepend() { sed -i -e 's|python |python3 |g' ${S}/tests/*.sh @@ -147,8 +149,9 @@ do_install_append() { echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - sed -i -e "s#;Requires=syslog.socket#Requires=syslog.socket#g" ${D}${systemd_system_unitdir}/rsyslog.service - sed -i -e "s#;Alias=syslog.service#Alias=syslog.service#g" ${D}${systemd_system_unitdir}/rsyslog.service + install -d ${D}${systemd_system_unitdir} + install -m 644 ${WORKDIR}/rsyslog.service ${D}${systemd_system_unitdir} + sed -i -e "s,@sbindir@,${sbindir},g" ${D}${systemd_system_unitdir}/rsyslog.service fi } diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.2.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb index 6f3685c4b..e8b2e3721 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb @@ -16,7 +16,7 @@ PV .= "+git${SRCPV}" SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch;patchdir=../ \ " -SRCREV = "01b727adf1ce3c0ed5b95299d60f62bc66d98eb5" +SRCREV = "3a750fed849405c745dcb7b4ceb85f662c53d8d0" S = "${WORKDIR}/git/python" diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb b/meta-openembedded/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb index 369e2f6f4..4fd516bc2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb @@ -13,7 +13,7 @@ PACKAGECONFIG ??= "decode" inherit autotools pkgconfig mime-xdg SRC_URI = "http://sigrok.org/download/source/sigrok-cli/sigrok-cli-${PV}.tar.gz" -SRC_URI[md5sum] = "3f45ce664bad529d8b3f78a61b017d75" -SRC_URI[sha256sum] = "f52413429f47d457c333db0fd068416ab7a3f9e35ca76de8624dc5ac6fb07797" +SRC_URI[md5sum] = "856fd496cd99d1091aa128405c522a36" +SRC_URI[sha256sum] = "71d0443f36897bf565732dec206830dbea0f2789b6601cf10536b286d1140ab8" FILES_${PN} += "${datadir}/icons/hicolor" diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch new file mode 100644 index 000000000..87c0e1458 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch @@ -0,0 +1,84 @@ +From b621a313e0bc67803abfba18e1ae15e7a8b9b59f Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Mon, 22 Feb 2021 17:21:33 +0200 +Subject: [PATCH] smartmontools: Improve reproducibility + +Backport changes added to master smartmontools. +https://github.com/smartmontools/smartmontools/commit/24838916b4c0e91f5c897d44fcdeedb22848f684 + +Upstream-Status: Backported +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> +--- + ChangeLog | 8 ++++++++ + configure.ac | 12 ++++++++++++ + utility.cpp | 10 ++++++++++ + 3 files changed, 30 insertions(+) + +diff --git a/ChangeLog b/ChangeLog +index 39eac2d..6a3b4ee 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,5 +1,13 @@ + $Id: ChangeLog 5155 2020-12-30 16:49:18Z chrfranke $ + ++2021-02-07 Christian Franke <franke@computer.org> ++ ++ Improve reproducibility if SOURCE_DATE_EPOCH if set (GH pull/89). ++ configure.ac: Define SOURCE_DATE_EPOCH in CPPFLAGS. ++ utility.cpp: Print SOURCE_DATE_EPOCH value if specified. ++ Don't include configure arguments then. ++ cppcheck.sh: Silence related 'ConfigurationNotChecked' message. ++ + 2020-12-30 Christian Franke <franke@computer.org> + + smartmontools 7.2 +diff --git a/configure.ac b/configure.ac +index ee6f0e5..c37c9bc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -61,6 +61,18 @@ case "${host}" in + ;; + esac + ++AC_MSG_CHECKING([whether reproducible build is selected (SOURCE_DATE_EPOCH)]) ++res=no ++if test -n "$SOURCE_DATE_EPOCH"; then ++ res=yes ++ test -z "`echo "$SOURCE_DATE_EPOCH" | sed 's,[[0-9]]*,,'`" || res=error ++fi ++AC_MSG_RESULT([$res]) ++case $res in ++ error) AC_MSG_ERROR([Malformed SOURCE_DATE_EPOCH]) ;; ++ yes) CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-DSOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH" ;; ++esac ++ + # Check for SVN. + AC_MSG_CHECKING([whether this is a build from SVN]) + is_svn_build=no +diff --git a/utility.cpp b/utility.cpp +index 0483c6f..8ab38c9 100644 +--- a/utility.cpp ++++ b/utility.cpp +@@ -134,9 +134,19 @@ std::string format_version_info(const char * prog_name, bool full /*= false*/) + #endif + "\n" + "smartmontools configure arguments:" ++#ifdef SOURCE_DATE_EPOCH ++ " [hidden in reproducible builds]\n" ++ "reproducible build SOURCE_DATE_EPOCH: " ++#endif + ; ++#ifdef SOURCE_DATE_EPOCH ++ char ts[32]; struct tm tmbuf; ++ strftime(ts, sizeof(ts), "%Y-%m-%d %H:%M:%S", time_to_tm_local(&tmbuf, SOURCE_DATE_EPOCH)); ++ info += strprintf("%u (%s)", (unsigned)SOURCE_DATE_EPOCH, ts); ++#else + info += (sizeof(SMARTMONTOOLS_CONFIGURE_ARGS) > 1 ? + SMARTMONTOOLS_CONFIGURE_ARGS : " [no arguments given]"); ++#endif + info += '\n'; + + return info; +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb index 3c01e589c..cd9793359 100644 --- a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb @@ -16,6 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \ file://initd.smartd \ file://smartmontools.default \ file://smartd.service \ + file://0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d)}" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb index bc930ac9d..3b2b6a9da 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -14,6 +14,33 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig update-alternatives +PACKAGES =+ "${PN}-access ${PN}-isotp ${PN}-j1939 ${PN}-cantest ${PN}-slcan ${PN}-log" + +FILES_${PN}-access = " \ + ${bindir}/cangw \ + ${bindir}/canlogserver \ + ${bindir}/bcmserver \ + ${bindir}/socketcand \ + ${bindir}/cannelloni \ +" + +FILES_${PN}-isotp = "${bindir}/isotp*" + +FILES_${PN}-j1939 = " \ + ${bindir}/j* \ + ${bindir}/testj1939 \ +" + +FILES_${PN}-cantest = " \ + ${bindir}/canbusload \ + ${bindir}/can-calc-bit-timing \ + ${bindir}/canfdtest \ +" + +FILES_${PN}-slcan = "${bindir}/slcan*" + +FILES_${PN}-log = "${bindir}/*log*" + ALTERNATIVE_${PN} = "candump cansend cansequence" ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb index cd0b471e1..d0cc625aa 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb @@ -9,6 +9,8 @@ LICENSE = "BSD-3-Clause & GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" +inherit lib_package + SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1 \ file://0001-Fix-legacy-build-after-2103.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb index d6da51b0d..f7fbedd6e 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb @@ -3,8 +3,8 @@ DESCRIPTION = "This recipe provides m4 macros from gnome-doc-utils project, so \ that dependent recipes can build. Gnome-doc-utils itself is no longer packaged because \ it requires libxml2 and python 2 at the same time, which can no longer be satisfied. " LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ + file://${COREBASE}/meta/files/common-licenses/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780" SRC_URI = "file://gnome-doc-utils.m4" PROVIDES = "gnome-doc-utils" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch b/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch deleted file mode 100644 index 176e97998..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6914eccee34376f9067b0ee9f17039fe182125e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sat, 31 Mar 2018 22:29:16 +0200 -Subject: [PATCH] do not build demos -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -They are not installed anyway and add libepoxy dependency - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - Makefile.am | 3 ++- - configure.ac | 3 --- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 984b6a7..6c754a6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -28,7 +28,8 @@ doc_subdirs = docs - else - doc_subdirs = - endif --SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests demos $(doc_subdirs) -+ -+SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests $(doc_subdirs) - - gdkmm_includedir = $(includedir)/$(GDKMM_MODULE_NAME) - gdkmm_include_HEADERS = gdk/gdkmm.h -diff --git a/configure.ac b/configure.ac -index e5e82dc..c1c7658 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -109,11 +109,8 @@ AS_IF([test "x$gtkmm_enable_api_atkmm" != xno], - [GTKMM_MODULES="atkmm-1.6 >= 2.24.2 $GTKMM_MODULES"]) - AC_SUBST([GTKMM_MODULES]) - --AC_SUBST([GTKMM_DEMOS_EXTRA_MODULES], ['epoxy >= 1.2']) -- - PKG_CHECK_MODULES([GDKMM], [$GDKMM_MODULES]) - PKG_CHECK_MODULES([GTKMM], [$GTKMM_MODULES]) --PKG_CHECK_MODULES([GTKMM_DEMOS_EXTRA], [$GTKMM_DEMOS_EXTRA_MODULES]) - - MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0]) - MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0]) --- -2.14.3 - diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.32.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb index 682d31e49..0c2e353a9 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.32.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb @@ -13,8 +13,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \ " -SRC_URI[md5sum] = "d5742aa42275203a499b59b4c382a784" -SRC_URI[sha256sum] = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e" +SRC_URI[sha256sum] = "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da" EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch new file mode 100644 index 000000000..46a691643 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch @@ -0,0 +1,52 @@ +From 152d295a28567ac87b0e6db2e62c0d914b1d7ef9 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Tue, 23 Feb 2021 08:47:54 +0000 +Subject: [PATCH] meson.build: use relative path + +Fixes: +Fatal error: can't create +gdk/gdkmm/libgdkmm-3.0.so.1.1.0.p/_buildarea1_master-wr_build_Userspace_auto-usrmerge_standalone_usrmerge_next_210222_lxbuilds_Har12345_platform_up_intel-x86-64-standard-glibc-std_wrlinux_build_tmp-glibc_work_corei7-64-wrs-linux_gtkmm3_3.24.3-r0_gtkmm-3.24.3_untracked_gdk_gdkmm_timecoord.cc.o: File name too long + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtkmm/-/merge_requests/61] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + gdk/gdkmm/meson.build | 4 ++-- + gtk/gtkmm/meson.build | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gdk/gdkmm/meson.build b/gdk/gdkmm/meson.build +index afccaea..240ce4d 100644 +--- a/gdk/gdkmm/meson.build ++++ b/gdk/gdkmm/meson.build +@@ -200,9 +200,9 @@ else # not maintainer_mode + gdkmm_hg_ccg_basenames, + ) + +- built_cc_files = [ src_untracked_gdkmm / 'wrap_init.cc' ] ++ built_cc_files = [ '../..' / untracked_gdkmm / 'wrap_init.cc' ] + foreach file : gdkmm_used_hg_ccg_basenames +- built_cc_files += src_untracked_gdkmm / file + '.cc' ++ built_cc_files += '../..' / untracked_gdkmm / file + '.cc' + endforeach + + gdk_gen_sources = built_cc_files +diff --git a/gtk/gtkmm/meson.build b/gtk/gtkmm/meson.build +index ab96a22..cc0c050 100644 +--- a/gtk/gtkmm/meson.build ++++ b/gtk/gtkmm/meson.build +@@ -464,9 +464,9 @@ else # not maintainer_mode + gtkmm_hg_ccg_basenames, + ) + +- built_cc_files = [ src_untracked_gtkmm / 'wrap_init.cc' ] ++ built_cc_files = [ '../..' / untracked_gtkmm / 'wrap_init.cc' ] + foreach file : gtkmm_used_hg_ccg_basenames +- built_cc_files += src_untracked_gtkmm / file + '.cc' ++ built_cc_files += '../..' / untracked_gtkmm / file + '.cc' + endforeach + + gtk_gen_sources = built_cc_files +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb index adc38d8cf..1648e37fa 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb @@ -6,18 +6,21 @@ LICENSE = "LGPLv2.1 & GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "atkmm pangomm glibmm gtk+3 cairomm" +DEPENDS = "glib-2.0-native atkmm pangomm glibmm gtk+3 cairomm" BPN = "gtkmm" +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "e311db484ca9c53f1689d35f5f58a06b" -SRC_URI[archive.sha256sum] = "6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3" -SRC_URI += "file://0001-do-not-build-demos.patch" +SRC_URI += "file://0001-meson.build-use-relative-path.patch \ +" + +SRC_URI[archive.sha256sum] = "60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435" -EXTRA_OECONF = " --disable-documentation " +EXTRA_OEMESON = "-Dbuild-demos=false" FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.4.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.6.bb index 9f4a7636d..bbfba55a3 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.4.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.6.bb @@ -11,7 +11,7 @@ SRC_URI = "\ git://github.com/hughsie/libjcat.git \ file://run-ptest \ " -SRCREV = "55872cea013755a170a581333077b23e322f388b" +SRCREV = "c4f032468c56a5750e1e15b01fa31539b5c7ae51" S = "${WORKDIR}/git" inherit gobject-introspection gtk-doc meson ptest-gnome vala diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch deleted file mode 100644 index 2eb50a5a3..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 461861cd2e34294830b121db834c05ff39424f6f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 27 Dec 2019 18:42:51 -0800 -Subject: [PATCH] Fix Wimplicit-int-float-conversion warnings with clang 10+ - -This is a new warning in clang which will be available in clang 10 -onwards - -Fixes -error: implicit conversion from 'const int' to 'float' may lose precision [-Werror,-Wimplicit-int-float-conversion] - -Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/986] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - glm/gtx/scalar_multiplication.hpp | 2 +- - test/gtx/gtx_fast_trigonometry.cpp | 32 +++++++++++++++--------------- - 2 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp -index f391f8de..496ba193 100644 ---- a/glm/gtx/scalar_multiplication.hpp -+++ b/glm/gtx/scalar_multiplication.hpp -@@ -54,7 +54,7 @@ namespace glm - template<typename T> \ - return_type_scalar_multiplication<T, Vec> \ - operator/(Vec lh, T const& s){ \ -- return lh *= 1.0f / s; \ -+ return lh *= 1.0f / static_cast<float>(s); \ - } - - GLM_IMPLEMENT_SCAL_MULT(vec2) -diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp -index f3bf17bf..f3c4e957 100644 ---- a/test/gtx/gtx_fast_trigonometry.cpp -+++ b/test/gtx/gtx_fast_trigonometry.cpp -@@ -239,12 +239,12 @@ namespace taylorCos - std::vector<glm::vec4> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * i)); -+ Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * float(i))); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -280,12 +280,12 @@ namespace taylorCos - std::vector<glm::vec4> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * i)); -+ Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * float(i))); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -327,12 +327,12 @@ namespace taylorCos - std::vector<glm::vec4> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * i)); -+ Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * float(i))); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -349,12 +349,12 @@ namespace taylorCos - std::vector<glm::vec4> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * i)); -+ Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * float(i))); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -371,12 +371,12 @@ namespace taylorCos - std::vector<glm::vec4> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * i)); -+ Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * float(i))); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -466,12 +466,12 @@ namespace taylor2 - std::vector<float> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = taylorCosA(AngleShift.x + Begin + Steps * i); -+ Results[i] = taylorCosA(AngleShift.x + Begin + Steps * float(i)); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -488,12 +488,12 @@ namespace taylor2 - std::vector<float> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = taylorCosB(AngleShift.x + Begin + Steps * i); -+ Results[i] = taylorCosB(AngleShift.x + Begin + Steps * float(i)); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -510,12 +510,12 @@ namespace taylor2 - std::vector<float> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = taylorCosC(AngleShift.x + Begin + Steps * i); -+ Results[i] = taylorCosC(AngleShift.x + Begin + Steps * float(i)); - - std::clock_t const TimeStampEnd = std::clock(); - --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch new file mode 100644 index 000000000..25e851883 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch @@ -0,0 +1,50 @@ +From 5b83983b246cff440de4421696b6b5dd9072ed2d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 6 Feb 2021 11:36:23 -0800 +Subject: [PATCH] Silence clang warnings + +Fixes +glm/gtc/random.inl:25:17: error: implicit conversion loses integer precision: 'int' to 'unsigned char' [-Werror,-Wimplicit-int-conversion] +| std::rand() % std::numeric_limits<uint8>::max()); +| ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +glm/gtc/../ext/quaternion_common.inl:76:87: error: unused parameter 'k' [-Werror,-Wunused-parameter] + GLM_FUNC_QUALIFIER qua<T, Q> slerp(qua<T, Q> const& x, qua<T, Q> const& y, T a, S k) + ^ + +Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/1055] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + glm/ext/quaternion_common.inl | 2 +- + glm/gtc/random.inl | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/glm/ext/quaternion_common.inl b/glm/ext/quaternion_common.inl +index 0e4a3bb2..8f9dccef 100644 +--- a/glm/ext/quaternion_common.inl ++++ b/glm/ext/quaternion_common.inl +@@ -104,7 +104,7 @@ namespace glm + { + // Graphics Gems III, page 96 + T angle = acos(cosTheta); +- T phi = angle + k * glm::pi<T>(); ++ T phi = angle + static_cast<float>(k) * glm::pi<T>(); + return (sin(angle - a * phi)* x + sin(a * phi) * z) / sin(angle); + } + } +diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl +index 70485098..a4af2a06 100644 +--- a/glm/gtc/random.inl ++++ b/glm/gtc/random.inl +@@ -22,7 +22,7 @@ namespace detail + GLM_FUNC_QUALIFIER static vec<1, uint8, P> call() + { + return vec<1, uint8, P>( +- std::rand() % std::numeric_limits<uint8>::max()); ++ static_cast<uint8>(std::rand()) % std::numeric_limits<uint8>::max()); + } + }; + +-- +2.30.0 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb index e2f4dbebc..c5a7c5bff 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb @@ -6,17 +6,17 @@ HOMEPAGE = "https://glm.g-truc.net" BUGTRACKER = "https://github.com/g-truc/glm/issues" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://copying.txt;md5=4a735e33f271f57404fda17e80085411" +LIC_FILES_CHKSUM = "file://copying.txt;md5=462e4b97f73ef12f8171c3c546ce4e8d" SRC_URI = " \ git://github.com/g-truc/glm;branch=master \ - file://0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch \ + file://0001-Silence-clang-warnings.patch \ file://glmConfig.cmake.in \ file://glmConfigVersion.cmake.in \ file://glm.pc.in \ file://glmTargets.cmake \ " -SRCREV = "4db8f89aace8f04c839b606e15b39fb8383ec732" +SRCREV = "bf71a834948186f4097caa076cd2663c69a10e1e" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.26.bb b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.27.bb index a425287a8..791ea8db1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.26.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.27.bb @@ -11,8 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \ file://0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch \ " -SRC_URI[gphoto2.md5sum] = "f663b10bca639290fdb150b6ffe23e93" -SRC_URI[gphoto2.sha256sum] = "7653213b05329c1dc2779efea3eff00504e12011436587aedc9aaa1e8665ab2f" +SRC_URI[gphoto2.md5sum] = "92d39b383c0e0354b4d3af1af7b8b416" +SRC_URI[gphoto2.sha256sum] = "30054e93a1bb59f501aabd5018713177ea04ce0cb28935319bd6ca80061e8d38" inherit autotools pkgconfig gettext diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.26.bb b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.27.bb index e9a300282..ebb0c3416 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.26.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.27.bb @@ -14,8 +14,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ " -SRC_URI[libgphoto2.md5sum] = "7e7e18abe6a764cb4becb2728d86ed84" -SRC_URI[libgphoto2.sha256sum] = "7740fea3cbb78489071cdfec06c07fab528e69e27ac82734eae6a73eaeeabcd4" +SRC_URI[libgphoto2.md5sum] = "83a2f96dade72e95dffb8e5fa9628d7e" +SRC_URI[libgphoto2.sha256sum] = "f8b85478c44948a0b0b52c4d4dfda2de1d7bcb7b262c76bd1ae306d9c63240d7" inherit autotools pkgconfig gettext lib_package diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb index bc46a11d3..8fe837b75 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb @@ -20,13 +20,6 @@ DEPENDS_append_class-nativesdk = " ${BPN}-native" inherit autotools-brokensep pkgconfig gettext -# The source tarball suggested at -# https://graphviz.gitlab.io/_pages/Download/Download_source.html has no -# version in its name. So once graphviz is updgraded, only first time users will -# get checksum errors. Fedora people seem to expect same so they use a versioned -# source - see https://src.fedoraproject.org/cgit/rpms/graphviz.git/tree/graphviz.spec - -SRCREV = "771bc4dbff3e6f358fa75cdc7774a413ccacad51" SRC_URI = "https://www2.graphviz.org/Packages/stable/portable_source/${BP}.tar.gz \ file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.24.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.25.bb index 2071c1fbd..0bad670df 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.24.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.25.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https" -SRCREV = "9a2835a81ce9c41a48f36dadce79f110da8d6c75" +SRCREV = "9092dcb7f7680204ef523c73eb6132162b4358e3" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch new file mode 100644 index 000000000..0605b32e3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch @@ -0,0 +1,34 @@ +From 9363c98528ef850235852e44f678df6b5c011ee1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 7 Feb 2021 18:08:36 -0800 +Subject: [PATCH] configure.in: Undefine AC_CONFIG_AUX_DIR + +This helps reconfiguring with autotools 2.70+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.in | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/configure.in ++++ b/configure.in +@@ -1,7 +1,6 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(README.txt) + AC_CONFIG_AUX_DIR(build-scripts) +- + dnl Set various version strings - taken gratefully from the GTk sources + + # Making releases: +@@ -40,10 +39,6 @@ AC_SUBST(LT_CURRENT) + AC_SUBST(LT_REVISION) + AC_SUBST(LT_AGE) + +-dnl Detect the canonical build and host environments +-AC_CONFIG_AUX_DIRS($srcdir/build-scripts) +-dnl AC_CANONICAL_HOST +- + dnl Check for tools + AC_PROG_LIBTOOL + AC_PROG_CC diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb index 8f1960d8a..6b6a531d3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb @@ -4,18 +4,18 @@ DEPENDS = "virtual/libsdl2 flac libmikmod libvorbis" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=516daf7a177ad4c8874bb9efa1a69c1f" -SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz" - -SRC_URI[md5sum] = "a36e8410cac46b00a4d01752b32c3eb1" +SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz \ + file://0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch \ + " SRC_URI[sha256sum] = "b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419" S = "${WORKDIR}/SDL2_mixer-${PV}" inherit autotools-brokensep pkgconfig -EXTRA_AUTORECONF += "--include=acinclude" EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --disable-music-ogg-shared LIBS=-L${STAGING_LIBDIR}" +PACKAGECONFIG ??= "" PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" do_configure_prepend () { diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch index 045f3cafa..1affe84f6 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch @@ -16,8 +16,6 @@ Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> src/ncursesw.h | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) -diff --git a/src/NCApplication.cc b/src/NCApplication.cc -index 5bcf969..510f034 100644 --- a/src/NCApplication.cc +++ b/src/NCApplication.cc @@ -23,7 +23,7 @@ @@ -29,8 +27,6 @@ index 5bcf969..510f034 100644 #define YUILogComponent "ncurses" #include <yui/YUILog.h> -diff --git a/src/NCstyle.h b/src/NCstyle.h -index a40d5a8..3657917 100644 --- a/src/NCstyle.h +++ b/src/NCstyle.h @@ -25,7 +25,7 @@ @@ -42,8 +38,6 @@ index a40d5a8..3657917 100644 #include <iosfwd> #include <string> -diff --git a/src/NCurses.h b/src/NCurses.h -index a07c6bf..d17d3c3 100644 --- a/src/NCurses.h +++ b/src/NCurses.h @@ -34,7 +34,7 @@ @@ -55,8 +49,6 @@ index a07c6bf..d17d3c3 100644 #include <wchar.h> #include "ncursesw.h" -diff --git a/src/ncursesp.h b/src/ncursesp.h -index d478347..2fcfea5 100644 --- a/src/ncursesp.h +++ b/src/ncursesp.h @@ -28,7 +28,7 @@ @@ -68,8 +60,6 @@ index d478347..2fcfea5 100644 class NCursesPanel : public NCursesWindow { -diff --git a/src/ncursesw.cc b/src/ncursesw.cc -index 3c771af..bb83210 100644 --- a/src/ncursesw.cc +++ b/src/ncursesw.cc @@ -47,7 +47,7 @@ @@ -81,21 +71,19 @@ index 3c771af..bb83210 100644 #undef line #undef columns -diff --git a/src/ncursesw.h b/src/ncursesw.h -index d25923a..c140d37 100644 --- a/src/ncursesw.h +++ b/src/ncursesw.h -@@ -27,8 +27,8 @@ +@@ -27,11 +27,11 @@ #include <iosfwd> -#include <ncursesw/curses.h> --#include <ncursesw/etip.h> +#include <curses.h> + #ifndef NCURSES_CXX_IMPEXP + #define NCURSES_CXX_IMPEXP NCURSES_EXPORT_GENERAL_IMPORT + #endif +-#include <ncursesw/etip.h> +#include <etip.h> #include <cstdio> #include <cstdarg> #include <climits> --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0003-Simplify-ncurses-finding-module.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0003-Simplify-ncurses-finding-module.patch deleted file mode 100644 index 2520ac46f..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0003-Simplify-ncurses-finding-module.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c2291fe28dc5682f81804941512431642975cf21 Mon Sep 17 00:00:00 2001 -From: Pascal Bach <pascal.bach@siemens.com> -Date: Mon, 29 Oct 2018 18:17:32 +0100 -Subject: [PATCH] Simplify ncurses finding module - -CMake will automatically look in the right locations, there is no need to -re-implement the logic with a for loop and NO_DEFAULT_PATH. - -It is already done like this to file the headers. - -Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/73] -Signed-off-by: Pascal Bach <pascal.bach@siemens.com> ---- - cmake/Modules/FindCurses6.cmake | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/cmake/Modules/FindCurses6.cmake b/cmake/Modules/FindCurses6.cmake -index 0bf02c3..e298d5d 100644 ---- a/cmake/Modules/FindCurses6.cmake -+++ b/cmake/Modules/FindCurses6.cmake -@@ -5,11 +5,9 @@ - # CURSES6_LIBRARIES - The libraries needed to use Curses6 - # CURSES6_DEFINITIONS - Compiler switches required for using Curses6 - --FOREACH(path ${CMAKE_LIBRARY_PATH} /usr/${LIB_DIR}) -- FIND_LIBRARY(CURSES6_NCURSESW_LIBRARY NAMES ncursesw PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH) -- FIND_LIBRARY(CURSES6_PANELW_LIBRARY NAMES panelw PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH) -- FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH) --ENDFOREACH() -+FIND_LIBRARY(CURSES6_NCURSESW_LIBRARY NAMES ncursesw PATH_SUFFIXES ncurses6) -+FIND_LIBRARY(CURSES6_PANELW_LIBRARY NAMES panelw PATH_SUFFIXES ncurses6) -+FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATH_SUFFIXES ncurses6) - - SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY}) - # tinfo is optional (in 12.1 is not there) diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.0.0.bb index 15c40ee31..a3a4a1506 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.0.0.bb @@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ - file://0003-Simplify-ncurses-finding-module.patch \ " SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" -SRCREV = "e89fcc53c27c3a3bf559d43190289c3ce4f335b1" +SRCREV = "37d3a1e815a47f536b4f694f139f279cc93a3854" S = "${WORKDIR}/git" @@ -20,21 +19,18 @@ DEPENDS += "boost libyui ncurses" BBCLASSEXTEND = "nativesdk" -EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" -EXTRA_OECMAKE_append_toolchain-clang = " -DENABLE_WERROR=OFF" +EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" + +CXXFLAGS += "-DNCURSES_WIDECHAR" do_configure_prepend () { cd ${S} - git checkout bootstrap.sh - sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" bootstrap.sh - ./bootstrap.sh if [ -e ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so ]; then mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ fi cd - sed -i -e "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt - sed -i -e "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake } do_install_append () { diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch index b03723ac0..d3463ca05 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch @@ -329,10 +329,10 @@ Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/123] /** --- a/src/YMenuButton.h +++ b/src/YMenuButton.h -@@ -29,7 +29,7 @@ +@@ -28,7 +28,7 @@ + #include "YMenuWidget.h" #include "YMenuItem.h" - class YMenuItem; -class YMenuButtonPrivate; +struct YMenuButtonPrivate; @@ -428,7 +428,7 @@ Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/123] typedef YRadioButtonList::iterator YRadioButtonListIterator; --- a/src/YRichText.h +++ b/src/YRichText.h -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "ImplPtr.h" @@ -538,7 +538,7 @@ Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/123] /** --- a/src/YTimezoneSelector.cc +++ b/src/YTimezoneSelector.cc -@@ -32,7 +32,7 @@ +@@ -34,7 +34,7 @@ using std::string; class YTimezoneSelectorPrivate { @@ -560,7 +560,7 @@ Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/123] /** --- a/src/YUILog.h +++ b/src/YUILog.h -@@ -64,7 +64,7 @@ +@@ -66,7 +66,7 @@ using std::endl; diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-relative-install-paths-for-CMake.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-relative-install-paths-for-CMake.patch index 11a1678a4..fc7f819d3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-relative-install-paths-for-CMake.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-relative-install-paths-for-CMake.patch @@ -16,13 +16,13 @@ _PREFIX variants. Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/140] Signed-off-by: Pascal Bach <pascal.bach@siemens.com> --- - buildtools/LibyuiCommon.cmake | 35 ++++++++++++++--------------------- + legacy-buildtools/LibyuiCommon.cmake | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) -diff --git a/buildtools/LibyuiCommon.cmake b/buildtools/LibyuiCommon.cmake +diff --git a/legacy-buildtools/LibyuiCommon.cmake b/legacy-buildtools/LibyuiCommon.cmake index e6fbefd..5e2fc0d 100644 ---- a/buildtools/LibyuiCommon.cmake -+++ b/buildtools/LibyuiCommon.cmake +--- a/legacy-buildtools/LibyuiCommon.cmake ++++ b/legacy-buildtools/LibyuiCommon.cmake @@ -258,13 +258,6 @@ MACRO( SET_ENVIRONMENT ) # setup the environment vars SET( INSTALL_DOC_DIR "${DOC_DIR}" ) diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.10.0.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb index d7f529e31..bba17962e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb @@ -10,24 +10,18 @@ SRC_URI = "git://github.com/libyui/libyui.git \ file://0001-Use-relative-install-paths-for-CMake.patch \ " -SRCREV = "de9134007d2d029fe5809ce48f57fe218e6ffe16" -SRCREV_FORMAT = "default" +SRCREV = "af06143017fc5f18c4b6488ba4aed26bcc43ff6e" + S = "${WORKDIR}/git" inherit cmake gettext pkgconfig DEPENDS += "boost" -EXTRA_OECMAKE += "-DENABLE_WERROR=OFF" +EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" BBCLASSEXTEND = "native nativesdk" -do_configure_prepend () { - (cd ${S} && - ./bootstrap.sh && - cd -) -} - do_install_append () { if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then mv ${D}/usr/lib64 ${D}/usr/lib diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-greeter-set-visible-when-switch-to-input-user.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-greeter-set-visible-when-switch-to-input-user.patch new file mode 100644 index 000000000..e01dc7fa7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-greeter-set-visible-when-switch-to-input-user.patch @@ -0,0 +1,33 @@ +From f6b8e141e00c4837239f5b69af4e7bee1204abba Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Thu, 17 Dec 2020 10:18:58 +0800 +Subject: [PATCH 1/8] greeter: set visible when switch to input user + +It switches back to input user entry if press Esc key when input the +password. At this time, the user name input is shown as '*' rather than +plain text. Set the visibility to fix this issue. And clean the text as +well. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/greeter.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/greeter.c b/src/greeter.c +index 2c6e5be..f100c72 100644 +--- a/src/greeter.c ++++ b/src/greeter.c +@@ -139,6 +139,8 @@ static void switch_to_input_user(void) + pass=NULL; + } + gtk_label_set_text( GTK_LABEL(prompt), _("User:")); ++ gtk_entry_set_text(GTK_ENTRY(login_entry), ""); ++ gtk_entry_set_visibility(GTK_ENTRY(login_entry), TRUE); + gtk_widget_show(prompt); + if(user_list) + { +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0002-greeter-gdk.c-fix-typo.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0002-greeter-gdk.c-fix-typo.patch new file mode 100644 index 000000000..da0212975 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0002-greeter-gdk.c-fix-typo.patch @@ -0,0 +1,28 @@ +From 3a3c5c644c9790cb3f88f3ce3757c2803cff90c5 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Thu, 17 Dec 2020 14:32:40 +0800 +Subject: [PATCH 2/8] greeter-gdk.c: fix typo + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/greeter-gdk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/greeter-gdk.c b/src/greeter-gdk.c +index 1b27d2e..5aa3e7f 100644 +--- a/src/greeter-gdk.c ++++ b/src/greeter-gdk.c +@@ -299,7 +299,7 @@ void ui_prepare(void) + attr.wclass = GDK_INPUT_OUTPUT; + win = gdk_window_new(root, &attr, mask); + gdk_window_set_decorations(win,0); +- gdk_window_set_title(win,"lxdm-greter-gdk"); ++ gdk_window_set_title(win,"lxdm-greeter-gdk"); + + scr=gdk_screen_get_default(); + g_signal_connect(scr, "size-changed", G_CALLBACK(on_screen_size_changed), win); +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-whether-password-expired-with-pam.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-whether-password-expired-with-pam.patch new file mode 100644 index 000000000..c64854373 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-whether-password-expired-with-pam.patch @@ -0,0 +1,46 @@ +From 497e0fc7010969759c8247f7013a89589c44234a Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Thu, 17 Dec 2020 18:12:29 +0800 +Subject: [PATCH 3/8] check whether password expired with pam + +Introduce a new enum AuthResult type AUTH_PASSWD_EXPIRE. When user's +password is expired, return it. Only work with pam. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/lxdm.h | 1 + + src/pam.c | 4 ++++ + 2 files changed, 5 insertions(+) + +diff --git a/src/lxdm.h b/src/lxdm.h +index 568573f..1c2f837 100644 +--- a/src/lxdm.h ++++ b/src/lxdm.h +@@ -41,6 +41,7 @@ enum AuthResult + AUTH_SUCCESS, + AUTH_BAD_USER, + AUTH_FAIL, ++ AUTH_PASSWD_EXPIRE, + AUTH_PRIV, + AUTH_ERROR + }; +diff --git a/src/pam.c b/src/pam.c +index 43bd687..16a36f0 100644 +--- a/src/pam.c ++++ b/src/pam.c +@@ -257,6 +257,10 @@ int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,i + return AUTH_FAIL; + } + ret=pam_acct_mgmt(a->handle,PAM_SILENT); ++ if (ret == PAM_NEW_AUTHTOK_REQD) { ++ g_debug("user %s account has expired\n", user); ++ return AUTH_PASSWD_EXPIRE; ++ } + if(ret!=PAM_SUCCESS) + { + g_debug("user %s acct mgmt fail with %d\n",user,ret); +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0004-lxdm.c-add-function-to-change-password-with-pam.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0004-lxdm.c-add-function-to-change-password-with-pam.patch new file mode 100644 index 000000000..29c1000d1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0004-lxdm.c-add-function-to-change-password-with-pam.patch @@ -0,0 +1,124 @@ +From d4de5497bd89c408377194b9fa9026ba8e68b634 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Mon, 11 Jan 2021 14:11:05 +0800 +Subject: [PATCH 4/8] lxdm.c: add function to change password with pam + +Add function to change user's password when pam is enabled. It is useful +to change user's password when the password is expired. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/lxdm.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/lxdm.h | 1 + + 2 files changed, 69 insertions(+) + +diff --git a/src/lxdm.c b/src/lxdm.c +index 638c30f..fe17a71 100644 +--- a/src/lxdm.c ++++ b/src/lxdm.c +@@ -104,6 +104,10 @@ static int old_tty=1,def_tty = 7,nr_tty=0; + static int def_display=0; + static GSList *session_list; + ++#if HAVE_LIBPAM ++static const char *new_passwd = NULL; ++#endif ++ + static void lxdm_startx(LXSession *s); + + static int get_active_vt(void) +@@ -759,6 +763,69 @@ int lxdm_auth_user(int type,char *user, char *pass, struct passwd **ppw) + return ret; + } + ++ ++#if HAVE_LIBPAM ++ ++static int do_conv(int num, const struct pam_message **msg,struct pam_response **resp, void *arg) ++{ ++ int result = PAM_SUCCESS; ++ int i; ++ ++ *resp = (struct pam_response *) calloc(num, sizeof(struct pam_response)); ++ for(i = 0; i < num; i++) ++ { ++ switch (msg[i]->msg_style) { ++ case PAM_PROMPT_ECHO_ON: ++ break; ++ case PAM_PROMPT_ECHO_OFF: ++ resp[i]->resp = strdup(new_passwd); ++ break; ++ case PAM_ERROR_MSG: ++ case PAM_TEXT_INFO: ++ break; ++ default: ++ break; ++ } ++ } ++ return result; ++} ++ ++static int lxdm_change_passwd_pam(const char *service, const char *user, const char *pass) ++{ ++ pam_handle_t *pamh = NULL; ++ static struct pam_conv conv = { ++ do_conv, ++ NULL ++ }; ++ ++ int ret = pam_start("lxdm", user, &conv, &pamh); ++ if (PAM_SUCCESS != ret) { ++ g_warning("pam_start failed."); ++ return 1; ++ } ++ ++ new_passwd = pass; ++ ret = pam_chauthtok(pamh, 0); ++ if (PAM_SUCCESS != ret) { ++ g_warning("pam_chauthtok failed: %s", pam_strerror(pamh, ret)); ++ return 1; ++ } ++ ++ (void)pam_end(pamh, PAM_SUCCESS); ++ ++ return 0; ++} ++#endif ++ ++int lxdm_change_passwd(const char *user, const char *pass) ++{ ++#if HAVE_LIBPAM ++ return lxdm_change_passwd_pam("lxdm", user, pass); ++#else ++ return 0; ++#endif ++} ++ + static void close_left_fds(void) + { + struct dirent **list; +@@ -1446,6 +1513,7 @@ int lxdm_do_auto_login(void) + lxdm_do_login(pw,session,lang,option); + success=1; + } ++ + g_free(user);g_free(session);g_free(lang); + } + g_free(last_lang); +diff --git a/src/lxdm.h b/src/lxdm.h +index 1c2f837..be3c81f 100644 +--- a/src/lxdm.h ++++ b/src/lxdm.h +@@ -30,6 +30,7 @@ G_BEGIN_DECLS + extern GKeyFile *config; + + int lxdm_auth_user(int type,char *user,char *pass,struct passwd **ppw); ++int lxdm_change_passwd(const char *user, const char *pass); + void lxdm_do_login(struct passwd *pw,char *session,char *lang,char *option); + void lxdm_do_reboot(void); + void lxdm_do_shutdown(void); +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0005-ui.c-handle-password-expire-and-update-new-password.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0005-ui.c-handle-password-expire-and-update-new-password.patch new file mode 100644 index 000000000..ecbe68d14 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0005-ui.c-handle-password-expire-and-update-new-password.patch @@ -0,0 +1,53 @@ +From 54b2ed18ca52fa682ade2fe84e1b0d19d1b78cc4 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Mon, 11 Jan 2021 16:48:26 +0800 +Subject: [PATCH 5/8] ui.c: handle password-expire and update-new-password + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/ui.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/src/ui.c b/src/ui.c +index f233589..3ddb484 100644 +--- a/src/ui.c ++++ b/src/ui.c +@@ -161,6 +161,9 @@ static gboolean on_greeter_input(GIOChannel *source, GIOCondition condition, gpo + ui_drop(); + lxdm_do_login(pw, session, lang,NULL); + } ++ else if (AUTH_PASSWD_EXPIRE == ret) { ++ xwrite(greeter_pipe[0], "password-expire\n", 16); ++ } + else + { + if(pass!=NULL) +@@ -205,6 +208,23 @@ static gboolean on_greeter_input(GIOChannel *source, GIOCondition condition, gpo + g_free(session); + g_free(lang); + } ++ else if (!strncmp(str, "update-new-password", 19)) { ++ xwrite(greeter_pipe[0], "update-new-password\n", 20); ++ char *user = greeter_param(str, "user"); ++ char *pass = greeter_param(str, "newpass"); ++ char *session = greeter_param(str, "session"); ++ char *lang = greeter_param(str, "lang"); ++ ++ int ret = lxdm_change_passwd(user, pass); ++ if (ret) { ++ xwrite(greeter_pipe[0], "invalid-new-password\n", 21); ++ } else { ++ struct passwd *pw; ++ ret = lxdm_auth_user(AUTH_TYPE_NORMAL, user, pass, &pw); ++ ui_drop(); ++ lxdm_do_login(pw, session, lang, NULL); ++ } ++ } + g_free(str); + return TRUE; + } +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0006-themes-Industrial-add-info-label-in-ui.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0006-themes-Industrial-add-info-label-in-ui.patch new file mode 100644 index 000000000..4cadc3d9b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0006-themes-Industrial-add-info-label-in-ui.patch @@ -0,0 +1,124 @@ +From 8414d63343cc7909bc7a972941c678509d5d5be6 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Mon, 11 Jan 2021 10:15:45 +0800 +Subject: [PATCH 6/8] themes/Industrial: add info label in ui + +Adjust the layout and add a new label "info" under the labe "prompt" in +themes/Industrial to tell user some useful information such as +"Authentication failed" or "Invalid password". + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + data/themes/Industrial/greeter-gtk3.ui | 27 +++++++++++++++++++++++++- + data/themes/Industrial/greeter.ui | 27 +++++++++++++++++++++++++- + data/themes/Industrial/gtk.css | 5 +++++ + 3 files changed, 57 insertions(+), 2 deletions(-) + +diff --git a/data/themes/Industrial/greeter-gtk3.ui b/data/themes/Industrial/greeter-gtk3.ui +index 2f4e631..e59eee3 100644 +--- a/data/themes/Industrial/greeter-gtk3.ui ++++ b/data/themes/Industrial/greeter-gtk3.ui +@@ -45,7 +45,12 @@ + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> +- <object class="GtkHBox" id="hbox3"> ++ <object class="GtkVBox" id="vbox3"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">12</property> ++ <child> ++ <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> +@@ -91,6 +96,26 @@ + </packing> + </child> + </object> ++ </child> ++ <child> ++ <object class="GtkHBox" id="hbox4"> ++ <property name="visible">True</property> ++ <property name="spacing">12</property> ++ <child> ++ <object class="GtkLabel" id="info"> ++ <property name="visible">True</property> ++ <property name="label" translatable="yes"></property> ++ <property name="yalign">0.2</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> + </child> + </object> + <packing> +diff --git a/data/themes/Industrial/greeter.ui b/data/themes/Industrial/greeter.ui +index 3413922..6a02d8d 100644 +--- a/data/themes/Industrial/greeter.ui ++++ b/data/themes/Industrial/greeter.ui +@@ -47,7 +47,12 @@ + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> +- <object class="GtkHBox" id="hbox3"> ++ <object class="GtkVBox" id="vbox3"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">12</property> ++ <child> ++ <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> +@@ -93,6 +98,26 @@ + </packing> + </child> + </object> ++ </child> ++ <child> ++ <object class="GtkHBox" id="hbox4"> ++ <property name="visible">True</property> ++ <property name="spacing">12</property> ++ <child> ++ <object class="GtkLabel" id="info"> ++ <property name="visible">True</property> ++ <property name="label" translatable="yes"></property> ++ <property name="yalign">0.2</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> + </child> + </object> + <packing> +diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css +index 7621345..be15f43 100644 +--- a/data/themes/Industrial/gtk.css ++++ b/data/themes/Industrial/gtk.css +@@ -22,3 +22,8 @@ + font: Sans 12; + color: #9E9D9B; + } ++ ++#info { ++ font: Sans 14; ++ font-style: italic; ++} +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0007-greeter.c-support-to-update-expired-password.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0007-greeter.c-support-to-update-expired-password.patch new file mode 100644 index 000000000..84a9faebb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0007-greeter.c-support-to-update-expired-password.patch @@ -0,0 +1,180 @@ +From bae6a2b3a2232abd16a8d8558dda542d4970f1bb Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Tue, 12 Jan 2021 09:23:05 +0800 +Subject: [PATCH 7/8] greeter.c: support to update expired password + +Update greeter to work with ui to handle expired password. It checks +whether password is expired after input user and password. If expired, +force user to update password immediately. It allows 3 times to try. If +exceeds, reset to input user. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/greeter.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 81 insertions(+), 2 deletions(-) + +diff --git a/src/greeter.c b/src/greeter.c +index f100c72..804fca0 100644 +--- a/src/greeter.c ++++ b/src/greeter.c +@@ -77,6 +77,8 @@ static GtkWidget *lang_menu; + + static char* user = NULL; + static char* pass = NULL; ++static char* new_pass = NULL; ++static gboolean pass_expired = FALSE; + + static char* ui_file = NULL; + static char *ui_nobody = NULL; +@@ -167,10 +169,19 @@ static void switch_to_input_passwd(void) + else + gtk_widget_hide(user_list); + } +- gtk_label_set_text( GTK_LABEL(prompt), _("Password:") ); ++ if (pass_expired) { ++ if (!new_pass) { ++ gtk_label_set_text(GTK_LABEL(prompt), _("New password:")); ++ } else { ++ gtk_label_set_text(GTK_LABEL(prompt), _("Retype new password:")); ++ } ++ } else { ++ gtk_label_set_text( GTK_LABEL(prompt), _("Password:") ); ++ } + gtk_entry_set_text(GTK_ENTRY(login_entry), ""); + gtk_entry_set_visibility(GTK_ENTRY(login_entry), FALSE); + gtk_widget_show(login_entry); ++ gtk_widget_show(prompt); + gtk_widget_grab_focus(login_entry); + } + +@@ -189,6 +200,8 @@ static void try_login_user(const char *user) + + static void on_entry_activate(GtkEntry* entry) + { ++ static int count = 0; ++ + char* tmp; + if( !user ) + { +@@ -217,6 +230,46 @@ static void on_entry_activate(GtkEntry* entry) + } + else + { ++ if (pass_expired) { ++ if (!new_pass) { ++ new_pass = g_strdup(gtk_entry_get_text(entry)); ++ switch_to_input_passwd(); ++ } else { ++ tmp = g_strdup(gtk_entry_get_text(entry)); ++ if (strcmp(new_pass, tmp)) { ++ g_free(new_pass); ++ new_pass = NULL; ++ // if new passwords not match, retry for 3 times at most ++ if (++count < 3) { ++ switch_to_input_passwd(); ++ } else { ++ count = 0; ++ pass_expired = FALSE; ++ switch_to_input_user(); ++ } ++ } else if (!strcmp(pass, g_base64_encode((guchar*)new_pass, strlen(new_pass) + 1))) { ++ // if new password is same as old one ++ g_free(new_pass); ++ new_pass = NULL; ++ if (++count < 3) { ++ switch_to_input_passwd(); ++ } else { ++ count = 0; ++ pass_expired = FALSE; ++ switch_to_input_user(); ++ } ++ } else { ++ char *session_exec=get_session_exec(); ++ char *session_lang=get_session_lang(); ++ ++ printf("update-new-password user=%s newpass=%s session=%s lang=%s\n", ++ user, new_pass, session_exec, session_lang); ++ } ++ } ++ ++ return ; ++ } ++ + char *session_exec=get_session_exec(); + char *session_lang=get_session_lang(); + +@@ -227,6 +280,7 @@ static void on_entry_activate(GtkEntry* entry) + printf("login user=%s pass=%s session=%s lang=%s\n", + user, pass, session_exec, session_lang); + ++#if 0 + /* password check failed */ + g_free(user); + user = NULL; +@@ -241,6 +295,7 @@ static void on_entry_activate(GtkEntry* entry) + gtk_label_set_text( GTK_LABEL(prompt), _("User:") ); + gtk_entry_set_text(GTK_ENTRY(entry), ""); + gtk_entry_set_visibility(GTK_ENTRY(entry), TRUE); ++#endif + } + } + +@@ -1091,8 +1146,12 @@ static void on_screen_size_changed(GdkScreen *screen,GtkWidget *win) + + static gint login_entry_on_key_press (GtkWidget *widget,GdkEventKey *event) + { +- if(event->keyval == GDK_Escape) ++ if(event->keyval == GDK_Escape) { ++ g_free(new_pass); ++ new_pass = NULL; ++ pass_expired = FALSE; + switch_to_input_user(); ++ } + return FALSE; + } + +@@ -1285,8 +1344,10 @@ static void create_win() + + static gboolean on_lxdm_command(GIOChannel *source, GIOCondition condition, gpointer data) + { ++ + GIOStatus ret; + char *str; ++ static int count = 0; + + if( !(G_IO_IN & condition) ) + return FALSE; +@@ -1300,10 +1361,28 @@ static gboolean on_lxdm_command(GIOChannel *source, GIOCondition condition, gpoi + { + switch_to_input_user(); + } ++ else if (!strncmp(str, "password-expire", 15)) ++ { ++ pass_expired = TRUE; ++ switch_to_input_passwd(); ++ } + else if( !strncmp(str, "password", 8)) + { + switch_to_input_passwd(); + } ++ else if (!strncmp(str, "invalid-new-password", 20)) ++ { ++ g_free(new_pass); ++ new_pass = NULL; ++ ++ if (count++ < 3) { ++ switch_to_input_passwd(); ++ } else { ++ count = 0; ++ pass_expired = FALSE; ++ switch_to_input_user(); ++ } ++ } + g_free(str); + return TRUE; + } +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0008-greeter.c-show-information-on-gtk-label-info.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0008-greeter.c-show-information-on-gtk-label-info.patch new file mode 100644 index 000000000..eab9fd5e2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0008-greeter.c-show-information-on-gtk-label-info.patch @@ -0,0 +1,99 @@ +From bb4ff4b134383bfdadf7cb5353d3553a8a72d47e Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 13 Jan 2021 10:45:48 +0800 +Subject: [PATCH 8/8] greeter.c: show information on gtk label 'info' + +Show information on a gtk label 'info' which is added under label +'prompt' in the .glade or .ui files. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/greeter.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/src/greeter.c b/src/greeter.c +index 804fca0..a4a2336 100644 +--- a/src/greeter.c ++++ b/src/greeter.c +@@ -64,6 +64,7 @@ static GtkWidget* win; + static GtkWidget* alignment2; + static GtkWidget* prompt; + static GtkWidget* login_entry; ++static GtkWidget* info; + static GtkWidget* user_list_scrolled; + static GtkWidget* user_list; + +@@ -241,10 +242,12 @@ static void on_entry_activate(GtkEntry* entry) + new_pass = NULL; + // if new passwords not match, retry for 3 times at most + if (++count < 3) { ++ gtk_label_set_text((GtkLabel *)info, _("Passwords do not match, please retry.")); + switch_to_input_passwd(); + } else { + count = 0; + pass_expired = FALSE; ++ gtk_label_set_text((GtkLabel *)info, _("Maximum number of failed update password attempts exceeded.")); + switch_to_input_user(); + } + } else if (!strcmp(pass, g_base64_encode((guchar*)new_pass, strlen(new_pass) + 1))) { +@@ -252,6 +255,7 @@ static void on_entry_activate(GtkEntry* entry) + g_free(new_pass); + new_pass = NULL; + if (++count < 3) { ++ gtk_label_set_text((GtkLabel *)info, _("New password is same as old one, password unchanged.")); + switch_to_input_passwd(); + } else { + count = 0; +@@ -1146,6 +1150,9 @@ static void on_screen_size_changed(GdkScreen *screen,GtkWidget *win) + + static gint login_entry_on_key_press (GtkWidget *widget,GdkEventKey *event) + { ++ ++ gtk_label_set_text(GTK_LABEL(info), ""); ++ + if(event->keyval == GDK_Escape) { + g_free(new_pass); + new_pass = NULL; +@@ -1211,11 +1218,14 @@ static void create_win() + login_entry = (GtkWidget*)gtk_builder_get_object(builder, "login_entry"); + if(login_entry!=NULL) + { +- g_signal_connect_after(login_entry,"key-press-event",G_CALLBACK(login_entry_on_key_press),NULL); ++ g_signal_connect(login_entry,"key-press-event",G_CALLBACK(login_entry_on_key_press),NULL); + } + + g_signal_connect(login_entry, "activate", G_CALLBACK(on_entry_activate), NULL); + ++ info = (GtkWidget *)gtk_builder_get_object(builder, "info"); ++ gtk_label_set_text(GTK_LABEL(info), ""); ++ + if( g_key_file_get_integer(config, "display", "bottom_pane", 0)==1) + { + /* hacks to let GtkEventBox paintable with gtk pixmap engine. */ +@@ -1359,11 +1369,13 @@ static gboolean on_lxdm_command(GIOChannel *source, GIOCondition condition, gpoi + gtk_main_quit(); + else if( !strncmp(str, "reset", 5) ) + { ++ gtk_label_set_text(GTK_LABEL(info), _("Authentication failed.")); + switch_to_input_user(); + } + else if (!strncmp(str, "password-expire", 15)) + { + pass_expired = TRUE; ++ gtk_label_set_text(GTK_LABEL(info), _("You are required to change your password immediately.")); + switch_to_input_passwd(); + } + else if( !strncmp(str, "password", 8)) +@@ -1376,6 +1388,7 @@ static gboolean on_lxdm_command(GIOChannel *source, GIOCondition condition, gpoi + new_pass = NULL; + + if (count++ < 3) { ++ gtk_label_set_text(GTK_LABEL(info), _("Invalid new password. Please input new password again.")); + switch_to_input_passwd(); + } else { + count = 0; +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0009-greeter.c-disallow-empty-new-password.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0009-greeter.c-disallow-empty-new-password.patch new file mode 100644 index 000000000..3b12defb0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0009-greeter.c-disallow-empty-new-password.patch @@ -0,0 +1,53 @@ +From af1c347a31ae243d29c6087da8ffb423b23c74f2 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Mon, 1 Feb 2021 09:54:48 +0800 +Subject: [PATCH] greeter.c: disallow empty new password + +Do not clear text of label 'promt' when skip_password is set. When user +is required to update password, it only shows input box without label +for about 1 second. + +And disallow empty new password when user is required to update it. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/2/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/greeter.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/greeter.c b/src/greeter.c +index 7e4a168..c0e6b64 100644 +--- a/src/greeter.c ++++ b/src/greeter.c +@@ -220,7 +220,6 @@ static void on_entry_activate(GtkEntry* entry) + } + if(g_key_file_get_integer(config,"base","skip_password",NULL)!=0) + { +- gtk_label_set_text( GTK_LABEL(prompt), ""); + try_login_user(user); + } + else +@@ -235,6 +239,10 @@ static void on_entry_activate(GtkEntry* entry) + if (pass_expired) { + if (!new_pass) { + new_pass = g_strdup(gtk_entry_get_text(entry)); ++ if (strlen(new_pass) == 0) { ++ new_pass = NULL; ++ gtk_label_set_text((GtkLabel *)info, _("Empty password is not allowed.")); ++ } + switch_to_input_passwd(); + } else { + tmp = g_strdup(gtk_entry_get_text(entry)); +@@ -251,7 +259,7 @@ static void on_entry_activate(GtkEntry* entry) + gtk_label_set_text((GtkLabel *)info, _("Maximum number of failed update password attempts exceeded.")); + switch_to_input_user(); + } +- } else if (!strcmp(pass, g_base64_encode((guchar*)new_pass, strlen(new_pass) + 1))) { ++ } else if (pass && !strcmp(pass, g_base64_encode((guchar*)new_pass, strlen(new_pass) + 1))) { + // if new password is same as old one + g_free(new_pass); + new_pass = NULL; +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index db4767bb3..216bbb624 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb @@ -9,6 +9,15 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar. file://0002-let-autotools-create-lxdm.conf.patch \ file://0003-check-for-libexecinfo-providing-backtrace-APIs.patch \ file://0004-fix-css-under-gtk-3.20.patch \ + file://0001-greeter-set-visible-when-switch-to-input-user.patch \ + file://0002-greeter-gdk.c-fix-typo.patch \ + file://0003-check-whether-password-expired-with-pam.patch \ + file://0004-lxdm.c-add-function-to-change-password-with-pam.patch \ + file://0005-ui.c-handle-password-expire-and-update-new-password.patch \ + file://0006-themes-Industrial-add-info-label-in-ui.patch \ + file://0007-greeter.c-support-to-update-expired-password.patch \ + file://0008-greeter.c-show-information-on-gtk-label-info.patch \ + file://0009-greeter.c-disallow-empty-new-password.patch \ " SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0" SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f" diff --git a/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb b/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb index 108c339bf..3eb23dc0f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb @@ -4,9 +4,8 @@ HOMEPAGE = "http://fukuchi.org/works/qrencode/" SECTION = "libs" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -PV = "4.0.1+git${SRCPV}" -SRCREV = "7c83deb8f562ae6013fea4c3e65278df93f98fb7" +SRCREV = "715e29fd4cd71b6e452ae0f4e36d917b43122ce8" SRC_URI = "git://github.com/fukuchi/libqrencode.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb index 75c2bc00e..fd2973bc2 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb @@ -1,9 +1,9 @@ SUMMARY = "tesseract-ocr language files" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=9648bd7af63bd3cc4f5ac046d12c49e4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "590567f20dc044f6948a8e2c61afc714c360ad0e" +SRCREV = "4767ea922bcc460e70b87b1d303ebdfed0897da8" SRC_URI = "git://github.com/tesseract-ocr/tessdata.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_1.500.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.000.bb index ce003e922..d3dd417dc 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_1.500.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.000.bb @@ -3,15 +3,13 @@ require ttf.inc SUMMARY = "Ethiopia and Eritrea (Amharic) font - TTF Edition" HOMEPAGE = "http://software.sil.org/abyssinica/" LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://OFL.txt;md5=1694c7fc245cdc85c9971db707928159" +LIC_FILES_CHKSUM = "file://OFL.txt;md5=80cc8cdcdc3f8ce96957bbac946b70ae" SRCNAME = "AbyssinicaSIL" SRC_URI = "http://software.sil.org/downloads/r/abyssinica/${SRCNAME}-${PV}.zip" S = "${WORKDIR}/${SRCNAME}-${PV}" -SRC_URI[md5sum] = "a3d943d18e303197c8d3d92d2de54d1e" -SRC_URI[sha256sum] = "e48a77d5ab8ee0b06464a5b29be70f292aa25dc1e73eb39ec933bd7fa47bbd86" +SRC_URI[sha256sum] = "274204a53b30f64cca662d78c7199e3c0325ea95ad4109886b47af734c92d0f9" FONT_PACKAGES = "${PN}" FILES_${PN} = "${datadir}" - diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Do-not-error-on-uninitialized-warnings.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Do-not-error-on-uninitialized-warnings.patch new file mode 100644 index 000000000..4f3c7554c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Do-not-error-on-uninitialized-warnings.patch @@ -0,0 +1,28 @@ +From f9906a3a1b7f1ade7a6c4e1a8aa67cb3a5e663a9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 3 Mar 2021 11:33:15 -0800 +Subject: [PATCH] Do not error on uninitialized warnings + +code in verifier.cc violates C/C++ aliasing rules so code should be +perhaps changed to use a union + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + external/amber/src/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/external/amber/src/CMakeLists.txt b/external/amber/src/CMakeLists.txt +index 80a0df7..4323c81 100644 +--- a/external/amber/src/CMakeLists.txt ++++ b/external/amber/src/CMakeLists.txt +@@ -133,6 +133,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + -Werror + -Wextra + -Wno-unknown-pragmas ++ -Wno-error=uninitialized + -Wpedantic + -pedantic-errors) + elseif(MSVC) +-- +2.30.1 diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb index 801bd05c9..184547aa7 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb @@ -9,6 +9,8 @@ SRCREV_spirv-headers = "e4322e3be589e1ddd44afb20ea842a977c1319b8" SRCREV_spirv-tools = "1eb89172a82b436d8037e8a8c29c80f7e1f7df74" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" +SRC_URI += "file://0001-Do-not-error-on-uninitialized-warnings.patch" + S = "${WORKDIR}/git" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-printk-add-support-for-lockless-ringbuffer.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-printk-add-support-for-lockless-ringbuffer.patch new file mode 100644 index 000000000..1aaf1e6b0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-printk-add-support-for-lockless-ringbuffer.patch @@ -0,0 +1,445 @@ +From a5531b24750e7949c35640d996ea14c0587938bc Mon Sep 17 00:00:00 2001 +From: John Ogness <john.ogness@linutronix.de> +Date: Fri, 20 Nov 2020 05:56:59 +0000 +Subject: [PATCH 1/2] printk: add support for lockless ringbuffer + +Linux 5.10 introduces a new lockless ringbuffer. The new ringbuffer +is structured completely different to the previous iterations. +Add support for dumping the ringbuffer with the "log" command. +The new ringbuffer is detected based on the availability of +the "prb" symbol. + +Upstream-Status: Backport [https://github.com/crash-utility/crash/commit/a5531b24750e7949c35640d996ea14c0587938bc] + +Signed-off-by: John Ogness <john.ogness@linutronix.de> +Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + Makefile | 5 ++ + defs.h | 30 +++++++ + kernel.c | 7 +- + printk.c | 256 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + symbols.c | 27 ++++++ + 5 files changed, 324 insertions(+), 1 deletion(-) + create mode 100644 printk.c + +diff --git a/Makefile b/Makefile +index d185719..f66eba7 100644 +--- a/Makefile ++++ b/Makefile +@@ -61,6 +61,7 @@ VMWARE_HFILES=vmware_vmss.h + + CFILES=main.c tools.c global_data.c memory.c filesys.c help.c task.c \ + kernel.c test.c gdb_interface.c configure.c net.c dev.c bpf.c \ ++ printk.c \ + alpha.c x86.c ppc.c ia64.c s390.c s390x.c s390dbf.c ppc64.c x86_64.c \ + arm.c arm64.c mips.c sparc64.c \ + extensions.c remote.c va_server.c va_server_v1.c symbols.c cmdline.c \ +@@ -80,6 +81,7 @@ SOURCE_FILES=${CFILES} ${GENERIC_HFILES} ${MCORE_HFILES} \ + + OBJECT_FILES=main.o tools.o global_data.o memory.o filesys.o help.o task.o \ + build_data.o kernel.o test.o gdb_interface.o net.o dev.o bpf.o \ ++ printk.o \ + alpha.o x86.o ppc.o ia64.o s390.o s390x.o s390dbf.o ppc64.o x86_64.o \ + arm.o arm64.o mips.o sparc64.o \ + extensions.o remote.o va_server.o va_server_v1.o symbols.o cmdline.o \ +@@ -363,6 +365,9 @@ task.o: ${GENERIC_HFILES} task.c + kernel.o: ${GENERIC_HFILES} kernel.c + ${CC} -c ${CRASH_CFLAGS} kernel.c ${WARNING_OPTIONS} ${WARNING_ERROR} + ++printk.o: ${GENERIC_HFILES} printk.c ++ ${CC} -c ${CRASH_CFLAGS} printk.c ${WARNING_OPTIONS} ${WARNING_ERROR} ++ + gdb_interface.o: ${GENERIC_HFILES} gdb_interface.c + ${CC} -c ${CRASH_CFLAGS} gdb_interface.c ${WARNING_OPTIONS} ${WARNING_ERROR} + +diff --git a/defs.h b/defs.h +index 9594950..e1a18e9 100644 +--- a/defs.h ++++ b/defs.h +@@ -2106,6 +2106,28 @@ struct offset_table { /* stash of commonly-used offsets */ + long irq_common_data_affinity; + long irq_desc_irq_common_data; + long uts_namespace_name; ++ long printk_info_seq; ++ long printk_info_ts_nsec; ++ long printk_info_text_len; ++ long printk_info_level; ++ long printk_info_caller_id; ++ long printk_info_dev_info; ++ long dev_printk_info_subsystem; ++ long dev_printk_info_device; ++ long prb_desc_ring; ++ long prb_text_data_ring; ++ long prb_desc_ring_count_bits; ++ long prb_desc_ring_descs; ++ long prb_desc_ring_infos; ++ long prb_desc_ring_head_id; ++ long prb_desc_ring_tail_id; ++ long prb_desc_state_var; ++ long prb_desc_text_blk_lpos; ++ long prb_data_blk_lpos_begin; ++ long prb_data_blk_lpos_next; ++ long prb_data_ring_size_bits; ++ long prb_data_ring_data; ++ long atomic_long_t_counter; + }; + + struct size_table { /* stash of commonly-used sizes */ +@@ -2265,6 +2287,9 @@ struct size_table { /* stash of commonly-used sizes */ + long xa_node; + long zram_table_entry; + long irq_common_data; ++ long printk_info; ++ long printk_ringbuffer; ++ long prb_desc; + }; + + struct array_table { +@@ -6696,6 +6721,11 @@ int vmware_guestdump_memory_dump(FILE *); + */ + int calc_kaslr_offset(ulong *, ulong *); + ++/* ++ * printk.c ++ */ ++void dump_lockless_record_log(int); ++ + /* + * gnu_binutils.c + */ +diff --git a/kernel.c b/kernel.c +index 9871637..e722ff9 100644 +--- a/kernel.c ++++ b/kernel.c +@@ -5042,6 +5042,11 @@ dump_log(int msg_flags) + struct syment *nsp; + int log_wrap, loglevel, log_buf_len; + ++ if (kernel_symbol_exists("prb")) { ++ dump_lockless_record_log(msg_flags); ++ return; ++ } ++ + if (kernel_symbol_exists("log_first_idx") && + kernel_symbol_exists("log_next_idx")) { + dump_variable_length_record_log(msg_flags); +@@ -5289,7 +5294,7 @@ dump_log_entry(char *logptr, int msg_flags) + } + + /* +- * Handle the new variable-length-record log_buf. ++ * Handle the variable-length-record log_buf. + */ + static void + dump_variable_length_record_log(int msg_flags) +diff --git a/printk.c b/printk.c +new file mode 100644 +index 0000000..f6d54ce +--- /dev/null ++++ b/printk.c +@@ -0,0 +1,256 @@ ++#include "defs.h" ++#include <ctype.h> ++ ++#define DESC_SV_BITS (sizeof(unsigned long) * 8) ++#define DESC_COMMITTED_MASK (1UL << (DESC_SV_BITS - 1)) ++#define DESC_REUSE_MASK (1UL << (DESC_SV_BITS - 2)) ++#define DESC_FLAGS_MASK (DESC_COMMITTED_MASK | DESC_REUSE_MASK) ++#define DESC_ID_MASK (~DESC_FLAGS_MASK) ++ ++/* convenience struct for passing many values to helper functions */ ++struct prb_map { ++ char *prb; ++ ++ char *desc_ring; ++ unsigned long desc_ring_count; ++ char *descs; ++ char *infos; ++ ++ char *text_data_ring; ++ unsigned long text_data_ring_size; ++ char *text_data; ++}; ++ ++static void ++init_offsets(void) ++{ ++ char *n; ++ ++ n = "printk_info"; ++ STRUCT_SIZE_INIT(printk_info, n); ++ MEMBER_OFFSET_INIT(printk_info_seq, n, "seq"); ++ MEMBER_OFFSET_INIT(printk_info_ts_nsec, n, "ts_nsec"); ++ MEMBER_OFFSET_INIT(printk_info_text_len, n, "text_len"); ++ MEMBER_OFFSET_INIT(printk_info_level, n, "level"); ++ MEMBER_OFFSET_INIT(printk_info_caller_id, n, "caller_id"); ++ MEMBER_OFFSET_INIT(printk_info_dev_info, n, "dev_info"); ++ ++ n = "dev_printk_info"; ++ MEMBER_OFFSET_INIT(dev_printk_info_subsystem, n, "subsystem"); ++ MEMBER_OFFSET_INIT(dev_printk_info_device, n, "device"); ++ ++ n = "printk_ringbuffer"; ++ STRUCT_SIZE_INIT(printk_ringbuffer, n); ++ MEMBER_OFFSET_INIT(prb_desc_ring, n, "desc_ring"); ++ MEMBER_OFFSET_INIT(prb_text_data_ring, n, "text_data_ring"); ++ ++ n = "prb_desc_ring"; ++ MEMBER_OFFSET_INIT(prb_desc_ring_count_bits, n, "count_bits"); ++ MEMBER_OFFSET_INIT(prb_desc_ring_descs, n, "descs"); ++ MEMBER_OFFSET_INIT(prb_desc_ring_infos, n, "infos"); ++ MEMBER_OFFSET_INIT(prb_desc_ring_head_id, n, "head_id"); ++ MEMBER_OFFSET_INIT(prb_desc_ring_tail_id, n, "tail_id"); ++ ++ n = "prb_desc"; ++ STRUCT_SIZE_INIT(prb_desc, n); ++ MEMBER_OFFSET_INIT(prb_desc_state_var, n, "state_var"); ++ MEMBER_OFFSET_INIT(prb_desc_text_blk_lpos, n, "text_blk_lpos"); ++ ++ n = "prb_data_blk_lpos"; ++ MEMBER_OFFSET_INIT(prb_data_blk_lpos_begin, n, "begin"); ++ MEMBER_OFFSET_INIT(prb_data_blk_lpos_next, n, "next"); ++ ++ n = "prb_data_ring"; ++ MEMBER_OFFSET_INIT(prb_data_ring_size_bits, n, "size_bits"); ++ MEMBER_OFFSET_INIT(prb_data_ring_data, n, "data"); ++ ++ n = "atomic_long_t"; ++ MEMBER_OFFSET_INIT(atomic_long_t_counter, n, "counter"); ++} ++ ++static void ++dump_record(struct prb_map *m, unsigned long id, int msg_flags) ++{ ++ unsigned short text_len; ++ unsigned long state_var; ++ unsigned int caller_id; ++ unsigned char level; ++ unsigned long begin; ++ unsigned long next; ++ char buf[BUFSIZE]; ++ uint64_t ts_nsec; ++ ulonglong nanos; ++ ulonglong seq; ++ int ilen = 0, i; ++ char *desc, *info, *text, *p; ++ ulong rem; ++ ++ desc = m->descs + ((id % m->desc_ring_count) * SIZE(prb_desc)); ++ ++ /* skip non-committed record */ ++ state_var = ULONG(desc + OFFSET(prb_desc_state_var) + ++ OFFSET(atomic_long_t_counter)); ++ if ((state_var & DESC_FLAGS_MASK) != DESC_COMMITTED_MASK) ++ return; ++ ++ info = m->infos + ((id % m->desc_ring_count) * SIZE(printk_info)); ++ ++ seq = ULONGLONG(info + OFFSET(printk_info_seq)); ++ caller_id = UINT(info + OFFSET(printk_info_caller_id)); ++ if (CRASHDEBUG(1)) ++ fprintf(fp, "seq: %llu caller_id: %x (%s: %u)\n", seq, caller_id, ++ caller_id & 0x80000000 ? "cpu" : "pid", caller_id & ~0x80000000); ++ ++ text_len = USHORT(info + OFFSET(printk_info_text_len)); ++ ++ begin = ULONG(desc + OFFSET(prb_desc_text_blk_lpos) + ++ OFFSET(prb_data_blk_lpos_begin)) % ++ m->text_data_ring_size; ++ next = ULONG(desc + OFFSET(prb_desc_text_blk_lpos) + ++ OFFSET(prb_data_blk_lpos_next)) % ++ m->text_data_ring_size; ++ ++ /* skip data-less text blocks */ ++ if (begin == next) ++ goto out; ++ ++ if ((msg_flags & SHOW_LOG_TEXT) == 0) { ++ ts_nsec = ULONGLONG(info + OFFSET(printk_info_ts_nsec)); ++ nanos = (ulonglong)ts_nsec / (ulonglong)1000000000; ++ rem = (ulonglong)ts_nsec % (ulonglong)1000000000; ++ if (msg_flags & SHOW_LOG_CTIME) { ++ time_t t = kt->boot_date.tv_sec + nanos; ++ sprintf(buf, "[%s] ", ctime_tz(&t)); ++ } else ++ sprintf(buf, "[%5lld.%06ld] ", nanos, rem/1000); ++ ++ ilen += strlen(buf); ++ fprintf(fp, "%s", buf); ++ } ++ ++ if (msg_flags & SHOW_LOG_LEVEL) { ++ level = UCHAR(info + OFFSET(printk_info_level)) >> 5; ++ sprintf(buf, "<%x>", level); ++ ilen += strlen(buf); ++ fprintf(fp, "%s", buf); ++ } ++ ++ /* handle wrapping data block */ ++ if (begin > next) ++ begin = 0; ++ ++ /* skip over descriptor ID */ ++ begin += sizeof(unsigned long); ++ ++ /* handle truncated messages */ ++ if (next - begin < text_len) ++ text_len = next - begin; ++ ++ text = m->text_data + begin; ++ ++ for (i = 0, p = text; i < text_len; i++, p++) { ++ if (*p == '\n') ++ fprintf(fp, "\n%s", space(ilen)); ++ else if (isprint(*p) || isspace(*p)) ++ fputc(*p, fp); ++ else ++ fputc('.', fp); ++ } ++ ++ if (msg_flags & SHOW_LOG_DICT) { ++ text = info + OFFSET(printk_info_dev_info) + ++ OFFSET(dev_printk_info_subsystem); ++ if (strlen(text)) ++ fprintf(fp, "\n%sSUBSYSTEM=%s", space(ilen), text); ++ ++ text = info + OFFSET(printk_info_dev_info) + ++ OFFSET(dev_printk_info_device); ++ if (strlen(text)) ++ fprintf(fp, "\n%sDEVICE=%s", space(ilen), text); ++ } ++out: ++ fprintf(fp, "\n"); ++} ++ ++/* ++ * Handle the lockless printk_ringbuffer. ++ */ ++void ++dump_lockless_record_log(int msg_flags) ++{ ++ unsigned long head_id; ++ unsigned long tail_id; ++ unsigned long kaddr; ++ unsigned long id; ++ struct prb_map m; ++ ++ if (INVALID_SIZE(printk_info)) ++ init_offsets(); ++ ++ /* setup printk_ringbuffer */ ++ get_symbol_data("prb", sizeof(char *), &kaddr); ++ m.prb = GETBUF(SIZE(printk_ringbuffer)); ++ if (!readmem(kaddr, KVADDR, m.prb, SIZE(printk_ringbuffer), ++ "printk_ringbuffer contents", RETURN_ON_ERROR|QUIET)) { ++ error(WARNING, "\ncannot read printk_ringbuffer contents\n"); ++ goto out_prb; ++ } ++ ++ /* setup descriptor ring */ ++ m.desc_ring = m.prb + OFFSET(prb_desc_ring); ++ m.desc_ring_count = 1 << UINT(m.desc_ring + OFFSET(prb_desc_ring_count_bits)); ++ ++ kaddr = ULONG(m.desc_ring + OFFSET(prb_desc_ring_descs)); ++ m.descs = GETBUF(SIZE(prb_desc) * m.desc_ring_count); ++ if (!readmem(kaddr, KVADDR, m.descs, SIZE(prb_desc) * m.desc_ring_count, ++ "prb_desc_ring contents", RETURN_ON_ERROR|QUIET)) { ++ error(WARNING, "\ncannot read prb_desc_ring contents\n"); ++ goto out_descs; ++ } ++ ++ kaddr = ULONG(m.desc_ring + OFFSET(prb_desc_ring_infos)); ++ m.infos = GETBUF(SIZE(printk_info) * m.desc_ring_count); ++ if (!readmem(kaddr, KVADDR, m.infos, SIZE(printk_info) * m.desc_ring_count, ++ "prb_info_ring contents", RETURN_ON_ERROR|QUIET)) { ++ error(WARNING, "\ncannot read prb_info_ring contents\n"); ++ goto out_infos; ++ } ++ ++ /* setup text data ring */ ++ m.text_data_ring = m.prb + OFFSET(prb_text_data_ring); ++ m.text_data_ring_size = 1 << UINT(m.text_data_ring + OFFSET(prb_data_ring_size_bits)); ++ ++ kaddr = ULONG(m.text_data_ring + OFFSET(prb_data_ring_data)); ++ m.text_data = GETBUF(m.text_data_ring_size); ++ if (!readmem(kaddr, KVADDR, m.text_data, m.text_data_ring_size, ++ "prb_text_data_ring contents", RETURN_ON_ERROR|QUIET)) { ++ error(WARNING, "\ncannot read prb_text_data_ring contents\n"); ++ goto out_text_data; ++ } ++ ++ /* ready to go */ ++ ++ tail_id = ULONG(m.desc_ring + OFFSET(prb_desc_ring_tail_id) + ++ OFFSET(atomic_long_t_counter)); ++ head_id = ULONG(m.desc_ring + OFFSET(prb_desc_ring_head_id) + ++ OFFSET(atomic_long_t_counter)); ++ ++ hq_open(); ++ ++ for (id = tail_id; id != head_id; id = (id + 1) & DESC_ID_MASK) ++ dump_record(&m, id, msg_flags); ++ ++ /* dump head record */ ++ dump_record(&m, id, msg_flags); ++ ++ hq_close(); ++ ++out_text_data: ++ FREEBUF(m.text_data); ++out_infos: ++ FREEBUF(m.infos); ++out_descs: ++ FREEBUF(m.descs); ++out_prb: ++ FREEBUF(m.prb); ++} +diff --git a/symbols.c b/symbols.c +index b2f4eb5..a51078d 100644 +--- a/symbols.c ++++ b/symbols.c +@@ -10426,6 +10426,30 @@ dump_offset_table(char *spec, ulong makestruct) + OFFSET(log_level)); + fprintf(fp, " log_flags_level: %ld\n", + OFFSET(log_flags_level)); ++ ++ fprintf(fp, " printk_info_seq: %ld\n", OFFSET(printk_info_seq)); ++ fprintf(fp, " printk_info_ts_nseq: %ld\n", OFFSET(printk_info_ts_nsec)); ++ fprintf(fp, " printk_info_text_len: %ld\n", OFFSET(printk_info_text_len)); ++ fprintf(fp, " printk_info_level: %ld\n", OFFSET(printk_info_level)); ++ fprintf(fp, " printk_info_caller_id: %ld\n", OFFSET(printk_info_caller_id)); ++ fprintf(fp, " printk_info_dev_info: %ld\n", OFFSET(printk_info_dev_info)); ++ fprintf(fp, " dev_printk_info_subsystem: %ld\n", OFFSET(dev_printk_info_subsystem)); ++ fprintf(fp, " dev_printk_info_device: %ld\n", OFFSET(dev_printk_info_device)); ++ fprintf(fp, " prb_desc_ring: %ld\n", OFFSET(prb_desc_ring)); ++ fprintf(fp, " prb_text_data_ring: %ld\n", OFFSET(prb_text_data_ring)); ++ fprintf(fp, " prb_desc_ring_count_bits: %ld\n", OFFSET(prb_desc_ring_count_bits)); ++ fprintf(fp, " prb_desc_ring_descs: %ld\n", OFFSET(prb_desc_ring_descs)); ++ fprintf(fp, " prb_desc_ring_infos: %ld\n", OFFSET(prb_desc_ring_infos)); ++ fprintf(fp, " prb_desc_ring_head_id: %ld\n", OFFSET(prb_desc_ring_head_id)); ++ fprintf(fp, " prb_desc_ring_tail_id: %ld\n", OFFSET(prb_desc_ring_tail_id)); ++ fprintf(fp, " prb_desc_state_var: %ld\n", OFFSET(prb_desc_state_var)); ++ fprintf(fp, " prb_desc_text_blk_lpos: %ld\n", OFFSET(prb_desc_text_blk_lpos)); ++ fprintf(fp, " prb_data_blk_lpos_begin: %ld\n", OFFSET(prb_data_blk_lpos_begin)); ++ fprintf(fp, " prb_data_blk_lpos_next: %ld\n", OFFSET(prb_data_blk_lpos_next)); ++ fprintf(fp, " prb_data_ring_size_bits: %ld\n", OFFSET(prb_data_ring_size_bits)); ++ fprintf(fp, " prb_data_ring_data: %ld\n", OFFSET(prb_data_ring_data)); ++ fprintf(fp, " atomit_long_t_counter: %ld\n", OFFSET(atomic_long_t_counter)); ++ + fprintf(fp, " sched_rt_entity_my_q: %ld\n", + OFFSET(sched_rt_entity_my_q)); + fprintf(fp, " task_group_parent: %ld\n", +@@ -10850,6 +10874,9 @@ dump_offset_table(char *spec, ulong makestruct) + SIZE(xarray)); + fprintf(fp, " xa_node: %ld\n", + SIZE(xa_node)); ++ fprintf(fp, " printk_info: %ld\n", SIZE(printk_info)); ++ fprintf(fp, " printk_ringbuffer: %ld\n", SIZE(printk_ringbuffer)); ++ fprintf(fp, " prb_desc: %ld\n", SIZE(prb_desc)); + + + fprintf(fp, "\n array_table:\n"); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-printk-use-committed-finalized-state-values.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-printk-use-committed-finalized-state-values.patch new file mode 100644 index 000000000..5213195c7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-printk-use-committed-finalized-state-values.patch @@ -0,0 +1,103 @@ +From 71e159c64000467e94e08aefc144f5e1cdaa4aa0 Mon Sep 17 00:00:00 2001 +From: John Ogness <john.ogness@linutronix.de> +Date: Wed, 25 Nov 2020 05:27:53 +0106 +Subject: [PATCH 2/2] printk: use committed/finalized state values + +An addendum to the previous crash commit a5531b24750e. +The ringbuffer entries use 2 state values (committed and finalized) +rather than a single flag to represent being available for reading. +Copy the definitions and state lookup function directly from the +kernel source and use the new states. + +Upstream-Status: Backport [https://github.com/crash-utility/crash/commit/71e159c64000467e94e08aefc144f5e1cdaa4aa0] + +Signed-off-by: John Ogness <john.ogness@linutronix.de> +Signed-off-by: Nikolay Borisov <nborisov@suse.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + printk.c | 48 +++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 41 insertions(+), 7 deletions(-) + +diff --git a/printk.c b/printk.c +index f6d54ce..8658016 100644 +--- a/printk.c ++++ b/printk.c +@@ -1,12 +1,6 @@ + #include "defs.h" + #include <ctype.h> + +-#define DESC_SV_BITS (sizeof(unsigned long) * 8) +-#define DESC_COMMITTED_MASK (1UL << (DESC_SV_BITS - 1)) +-#define DESC_REUSE_MASK (1UL << (DESC_SV_BITS - 2)) +-#define DESC_FLAGS_MASK (DESC_COMMITTED_MASK | DESC_REUSE_MASK) +-#define DESC_ID_MASK (~DESC_FLAGS_MASK) +- + /* convenience struct for passing many values to helper functions */ + struct prb_map { + char *prb; +@@ -21,6 +15,44 @@ struct prb_map { + char *text_data; + }; + ++/* ++ * desc_state and DESC_* definitions taken from kernel source: ++ * ++ * kernel/printk/printk_ringbuffer.h ++ */ ++ ++/* The possible responses of a descriptor state-query. */ ++enum desc_state { ++ desc_miss = -1, /* ID mismatch (pseudo state) */ ++ desc_reserved = 0x0, /* reserved, in use by writer */ ++ desc_committed = 0x1, /* committed by writer, could get reopened */ ++ desc_finalized = 0x2, /* committed, no further modification allowed */ ++ desc_reusable = 0x3, /* free, not yet used by any writer */ ++}; ++ ++#define DESC_SV_BITS (sizeof(unsigned long) * 8) ++#define DESC_FLAGS_SHIFT (DESC_SV_BITS - 2) ++#define DESC_FLAGS_MASK (3UL << DESC_FLAGS_SHIFT) ++#define DESC_STATE(sv) (3UL & (sv >> DESC_FLAGS_SHIFT)) ++#define DESC_ID_MASK (~DESC_FLAGS_MASK) ++#define DESC_ID(sv) ((sv) & DESC_ID_MASK) ++ ++/* ++ * get_desc_state() taken from kernel source: ++ * ++ * kernel/printk/printk_ringbuffer.c ++ */ ++ ++/* Query the state of a descriptor. */ ++static enum desc_state get_desc_state(unsigned long id, ++ unsigned long state_val) ++{ ++ if (id != DESC_ID(state_val)) ++ return desc_miss; ++ ++ return DESC_STATE(state_val); ++} ++ + static void + init_offsets(void) + { +@@ -74,6 +106,7 @@ dump_record(struct prb_map *m, unsigned long id, int msg_flags) + unsigned short text_len; + unsigned long state_var; + unsigned int caller_id; ++ enum desc_state state; + unsigned char level; + unsigned long begin; + unsigned long next; +@@ -90,7 +123,8 @@ dump_record(struct prb_map *m, unsigned long id, int msg_flags) + /* skip non-committed record */ + state_var = ULONG(desc + OFFSET(prb_desc_state_var) + + OFFSET(atomic_long_t_counter)); +- if ((state_var & DESC_FLAGS_MASK) != DESC_COMMITTED_MASK) ++ state = get_desc_state(id, state_var); ++ if (state != desc_committed && state != desc_finalized) + return; + + info = m->infos + ((id % m->desc_ring_count) * SIZE(printk_info)); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.9.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.9.bb index 4394b6fc6..0b6883a49 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.9.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.9.bb @@ -25,6 +25,8 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git \ file://remove-unrecognized-gcc-option-m32-for-mips.patch \ file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ + file://0001-printk-add-support-for-lockless-ringbuffer.patch \ + file://0002-printk-use-committed-finalized-state-values.patch \ " SRCREV = "a25aa4b649d339dd25c20d5413d81b851a77e0b2" diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 7c36dfc60..4caf217c2 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -18,7 +18,7 @@ SRC_URI += "file://run-ptest \ # we will append other kernel selftest in the future # bpf was added in 4.10 with: https://github.com/torvalds/linux/commit/5aa5bd14c5f8660c64ceedf14a549781be47e53d # if you have older kernel than that you need to remove it from PACKAGECONFIG -PACKAGECONFIG ??= "bpf firmware vm" +PACKAGECONFIG ??= "firmware vm" PACKAGECONFIG_remove_x86 = "bpf" PACKAGECONFIG_remove_arm = "bpf vm" # host ptrace.h is used to compile BPF target but mips ptrace.h is needed diff --git a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf/0001-install-don-t-preserve-file-owner.patch b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf/0001-install-don-t-preserve-file-owner.patch new file mode 100644 index 000000000..942314196 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf/0001-install-don-t-preserve-file-owner.patch @@ -0,0 +1,31 @@ +From 7df10d91db6f533cc0f6c09f4ae8ad92918c6160 Mon Sep 17 00:00:00 2001 +From: Matteo Croce <mcroce@microsoft.com> +Date: Tue, 26 Jan 2021 12:41:47 +0100 +Subject: [PATCH] install: don't preserve file owner + +'cp -p' preserve file ownership, this may leave files owned by the +current in user in /lib . + +Upstream-status: Submitted (0.4 release) [https://github.com/libbpf/libbpf/commit/767d82caab7e54238f2fc6f40ab1e4af285f2abe] + +Signed-off-by: Matteo Croce <mcroce@microsoft.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index da33613..ab66edc 100644 +--- a/Makefile ++++ b/Makefile +@@ -130,7 +130,7 @@ define do_s_install + $(Q)if [ ! -d '$(DESTDIR)$2' ]; then \ + $(INSTALL) -d -m 755 '$(DESTDIR)$2'; \ + fi; +- $(Q)cp -fpR $1 '$(DESTDIR)$2' ++ $(Q)cp -fR $1 '$(DESTDIR)$2' + endef + + install: all install_headers install_pkgconfig +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.3.bb b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.3.bb new file mode 100644 index 000000000..5714ddb61 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.3.bb @@ -0,0 +1,44 @@ +SUMMARY = "Library for BPF handling" +DESCRIPTION = "Library for BPF handling" +HOMEPAGE = "https://github.com/libbpf/libbpf" +SECTION = "libs" +LICENSE = "LGPLv2.1+" + +# There is a typo in the filename, LPGL should really be LGPL. +# Keep this until the correct name is set upstream. +LIC_FILES_CHKSUM = "file://../LICENSE.LPGL-2.1;md5=b370887980db5dd40659b50909238dbd" + +DEPENDS = "zlib elfutils" + +SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https" +SRCREV = "051a4009f94d5633a8f734ca4235f0a78ee90469" + +# Backported from version 0.4 +SRC_URI += "file://0001-install-don-t-preserve-file-owner.patch" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64).*-linux" + +S = "${WORKDIR}/git/src" + +EXTRA_OEMAKE += "DESTDIR=${D} LIBDIR=${libdir}" + +do_compile() { + if grep -q "CONFIG_BPF_SYSCALL=y" ${STAGING_KERNEL_BUILDDIR}/.config + then + oe_runmake + else + bbnote "BFP syscall is not enabled" + fi +} + +do_install() { + if grep -q "CONFIG_BPF_SYSCALL=y" ${STAGING_KERNEL_BUILDDIR}/.config + then + oe_runmake install + else + bbnote "no files to install" + fi +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.2.bb b/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb index 73e8e3f56..0cae7c54b 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" SRC_URI = "http://files.libburnia-project.org/releases/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "096f4acfba00f1210a84fb7650f7693d" -SRC_URI[sha256sum] = "7b32db1719d7f6516cce82a9d00dfddfb3581725db732ea87d41ea8ef0ce5227" +SRC_URI[md5sum] = "454d03ce31addb5b7dca62d213c9660e" +SRC_URI[sha256sum] = "525059d10759c5cb8148eebc863bb510e311c663603da7bd2d21c46b7cf63b54" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210101.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210129.bb index 817e52dca..1e7a674f4 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210101.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210129.bb @@ -16,7 +16,7 @@ SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz # only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" -SRC_URI[sha256sum] = "a26a2fb43c56719e5e94bbde7d2c492eb8306aa457a5a08034c6b942c4a3b0d4" +SRC_URI[sha256sum] = "85ab8d4337d414482586089b6f64fc39af64ff4be5b51976b54b0e10dceb333b" S = "${WORKDIR}/live" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb deleted file mode 100644 index 173b695e1..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +++ /dev/null @@ -1,77 +0,0 @@ -SUMMARY = "Multimedia processing server for Linux" -AUTHOR = "Wim Taymans <wtaymans@redhat.com>" -HOMEPAGE = "https://pipewire.org" -SECTION = "multimedia" -LICENSE = "MIT" -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ - file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ -" -DEPENDS = "alsa-lib dbus udev" -SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac" -PV = "0.3.1" - -SRC_URI = "git://github.com/PipeWire/pipewire" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig systemd manpages - -PACKAGECONFIG ??= "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \ - jack gstreamer \ -" - -PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" -PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack" -PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" -PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" -PACKAGECONFIG[pulseaudio] = "-Dpipewire-pulseaudio=true,-Dpipewire-pulseaudio=false,pulseaudio" -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -PACKAGECONFIG[vulkan] = "-Dvulkan=true,-Dvulkan=false,vulkan-loader" - -LDFLAGS_append_mipsarch = " -latomic" -LDFLAGS_append_x86 = " -latomic" -LDFLAGS_append_riscv32 = " -latomic" - -PACKAGES =+ "\ - ${PN}-spa-plugins \ - ${PN}-alsa \ - ${PN}-config \ - gstreamer1.0-${PN} \ - lib${PN} \ - lib${PN}-modules \ - lib${PN}-jack \ -" - -RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" - -FILES_${PN} = "\ - ${sysconfdir}/pipewire/pipewire.conf \ - ${bindir}/pw-* \ - ${bindir}/pipewire* \ - ${systemd_user_unitdir}/* \ -" -FILES_lib${PN} = "\ - ${libdir}/libpipewire-*.so.* \ - ${libdir}/libjack-*.so.* \ - ${libdir}/libpulse-*.so.* \ -" -FILES_lib${PN}-modules = "\ - ${libdir}/pipewire-*/* \ -" -FILES_${PN}-spa-plugins = "\ - ${bindir}/spa-* \ - ${libdir}/spa-*/* \ -" -FILES_${PN}-alsa = "\ - ${libdir}/alsa-lib/* \ -" -FILES_gstreamer1.0-${PN} = "\ - ${libdir}/gstreamer-1.0/* \ -" - -CONFFILES_${PN} = "\ - ${sysconfdir}/pipewire/pipewire.conf \ -" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb index 51d7e2a2e..6c07eff76 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb @@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" # AM_GLIB_GNU_GETTEXT macro in configure.ac. That macro is deprecated, so the # glib-2.0-native dependency may go away at some point (something to keep in # mind when doing version upgrades). -DEPENDS = "intltool-native glib-2.0-native gtkmm3 libcanberra pulseaudio" +DEPENDS = "libxml-parser-perl-native intltool-native glib-2.0-native gtkmm3 libcanberra pulseaudio" -inherit autotools features_check +inherit autotools features_check perlnative REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch index 8033fcacf..a849d465c 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch @@ -14,7 +14,7 @@ diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am index 0188fe2..dac07f3 100644 --- a/contrib/test/Makefile.am +++ b/contrib/test/Makefile.am -@@ -40,7 +40,7 @@ sdlcam_CFLAGS = -I../.. $(SDL2_CFLAGS) +@@ -42,7 +42,7 @@ sdlcam_CFLAGS = -I../.. $(SDL2_CFLAGS) sdlcam_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la mc_nextgen_test_CFLAGS = $(LIBUDEV_CFLAGS) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch deleted file mode 100644 index 57948add6..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 137ce23ae677b11e5483ef810751edae7bf96bb9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 30 Nov 2019 18:40:06 -0800 -Subject: [PATCH] Define error_t and include sys/types.h - -Fix 'unknown type name' for error_t and u_int32_t. -u_int32_t is defined in sys/type.h - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/ir-ctl/keymap.h | 4 ++++ - utils/keytable/keymap.h | 5 +++++ - 2 files changed, 9 insertions(+) - -diff --git a/utils/ir-ctl/keymap.h b/utils/ir-ctl/keymap.h -index f2b2963..1f8a3f8 100644 ---- a/utils/ir-ctl/keymap.h -+++ b/utils/ir-ctl/keymap.h -@@ -2,6 +2,10 @@ - #ifndef __KEYMAP_H - #define __KEYMAP_H - -+#include <sys/types.h> -+#ifndef error_t -+typedef int error_t; -+#endif - struct keymap { - struct keymap *next; - char *name; -diff --git a/utils/keytable/keymap.h b/utils/keytable/keymap.h -index f2b2963..345d55d 100644 ---- a/utils/keytable/keymap.h -+++ b/utils/keytable/keymap.h -@@ -2,6 +2,11 @@ - #ifndef __KEYMAP_H - #define __KEYMAP_H - -+#include <sys/types.h> -+#ifndef error_t -+typedef int error_t; -+#endif -+ - struct keymap { - struct keymap *next; - char *name; diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch deleted file mode 100644 index a8926762e..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b213da2d5fcc93cd24fc880c71c717d8e2ce2968 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 30 Nov 2019 18:43:21 -0800 -Subject: [PATCH] Fix build on 32bit arches with 64bit time_t - -time element is deprecated on new input_event structure in kernel's -input.h [1] - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/keytable/keytable.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c -index 6cb0217..59ff1ee 100644 ---- a/utils/keytable/keytable.c -+++ b/utils/keytable/keytable.c -@@ -53,6 +53,11 @@ - - # define N_(string) string - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - struct input_keymap_entry_v2 { - #define KEYMAP_BY_INDEX (1 << 0) - u_int8_t flags; -@@ -1533,7 +1538,7 @@ static void test_event(struct rc_device *rc_dev, int fd) - - for (i = 0; i < rd / sizeof(struct input_event); i++) { - printf(_("%ld.%06ld: event type %s(0x%02x)"), -- ev[i].time.tv_sec, ev[i].time.tv_usec, -+ ev[i].input_event_sec, ev[i].input_event_usec, - get_event_name(events_type, ev[i].type), ev[i].type); - - switch (ev[i].type) { diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch index ac704c72d..e3ce45d16 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch @@ -20,7 +20,7 @@ diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common index 651917e..cea57b7 100644 --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp -@@ -782,15 +782,17 @@ static bool parse_subset(char *optarg) +@@ -785,15 +785,17 @@ static bool parse_subset(char *optarg) static bool parse_next_subopt(char **subs, char **value) { diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb index 193335dea..3e92d49b4 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb @@ -20,14 +20,14 @@ SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ file://mediactl-pkgconfig.patch \ file://export-mediactl-headers.patch \ file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \ - file://0005-Define-error_t-and-include-sys-types.h.patch \ - file://0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ file://0007-Do-not-use-getsubopt.patch \ " -SRC_URI[md5sum] = "ff2dd75970683be9a301ed949b3372b3" -SRC_URI[sha256sum] = "25fc42253722401f8742f04dc50a444dfa9b75378e7d09b55035bcbb44c5f342" +SRC_URI[md5sum] = "46f9e2c0b2fdccd009da2f7e1aa87894" +SRC_URI[sha256sum] = "956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7" -EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev" +EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev \ + --disable-v4l2-compliance-32 --disable-v4l2-ctl-32 \ + --with-systemdsystemunitdir=${systemd_system_unitdir}" VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" @@ -37,7 +37,8 @@ RPROVIDES_${PN}-dbg += "libv4l-dbg" FILES_media-ctl = "${bindir}/media-ctl ${libdir}/libmediactl.so.*" -FILES_ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules" +FILES_ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules \ + ${systemd_system_unitdir}/systemd-udevd.service.d/50-rc_keymap.conf" RDEPENDS_ir-keytable += "${VIRTUAL-RUNTIME_ir-keytable-keymaps}" FILES_rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" diff --git a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.4.bb b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.2.0.bb index ce11bc070..4f21575c3 100644 --- a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.2.0.bb @@ -7,8 +7,8 @@ DEPENDS = "libpcre zlib libjpeg-turbo" SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf/qpdf-${PV}.tar.gz" LIC_FILES_CHKSUM = "file://Artistic-2.0;md5=7806296b9fae874361e6fb10072b7ee3" -SRC_URI[md5sum] = "b4c6a66c45bb946944c2fe14ef02d0e0" -SRC_URI[sha256sum] = "b191dc4af4ea4630cdc404a4ee95a0f21c12f56ecc4ae045f04425464d7c696e" +SRC_URI[md5sum] = "c8f4430823603ee3b430b3250015ede5" +SRC_URI[sha256sum] = "43ef260f4e70672660e1882856d59b9319301c6f170673ab465430a71cffe44c" inherit autotools-brokensep gettext diff --git a/meta-security/recipes-security/softHSM/softhsm_2.6.1.bb b/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb index 74e837aa5..aa91ab37f 100644 --- a/meta-security/recipes-security/softHSM/softhsm_2.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb @@ -1,7 +1,6 @@ -SUMMARY = "SoftHSM is an implementation of a cryptographic store accessible through a PKCS #11 interface." -HOMEPAGE = "www.opendnssec.org" - -LICENSE = "BSD" +SUMMARY = "PKCS#11 HSM/Token Emulator" +HOMEPAGE = "https://www.opendnssec.org/softhsm/" +LICENSE = "BSD-2-Clause & ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210" DEPENDS = "sqlite3" @@ -14,7 +13,7 @@ inherit autotools pkgconfig siteinfo EXTRA_OECONF += " --with-sqlite3=${STAGING_DIR_HOST}/usr" EXTRA_OECONF += "${@oe.utils.conditional('SITEINFO_BITS', '64', ' --enable-64bit', '', d)}" -PACKAGECONFIG ?= "pk11 openssl" +PACKAGECONFIG ?= "ecc eddsa pk11 openssl" PACKAGECONFIG[npm] = ",--disable-non-paged-memory" PACKAGECONFIG[ecc] = "--enable-ecc,--disable-ecc" @@ -28,3 +27,4 @@ PACKAGECONFIG[migrate] = "--with-migrate" PACKAGECONFIG[pk11] = "--enable-p11-kit --with-p11-kit==${STAGING_DIR_HOST}/usr, --without-p11-kit, p11-kit, p11-kit" RDEPENDS_${PN} = "sqlite3" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_git.bb b/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_git.bb deleted file mode 100644 index 3236cb9a6..000000000 --- a/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "PKCS#11 HSM/Token Emulator" -HOMEPAGE = "https://www.opendnssec.org/softhsm/" -LICENSE = "BSD-2-Clause & ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210" -DEPENDS = "openssl" -PV = "2.5.0" - -SRC_URI = "git://github.com/opendnssec/SoftHSMv2.git;branch=master" -SRCREV = "369df0383d101bc8952692c2a368ac8bc887d1b4" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -# EdDSA requires OpenSSL >= 1.1.1 -EXTRA_OECONF = "--enable-eddsa --disable-gost" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb index ac463038a..28d0868c4 100644 --- a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Ceres Solver is an open source C++ library for modeling and solvi AUTHOR = "Sameer Agarwal and Keir Mierle and Others" HOMEPAGE = "http://ceres-solver.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=35e00f0c4c96a0820a03e0b31e6416be" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bb761279816b72be19d7ce646e4e2a14" DEPENDS = "libeigen glog" SRC_URI = "git://github.com/ceres-solver/ceres-solver.git" -SRCREV = "facb199f3eda902360f9e1d5271372b7e54febe1" +SRCREV = "399cda773035d99eaf1f4a129a666b3c4df9d1b1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.17.bb b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb index c16e89329..1633412cf 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.17.bb +++ b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste file://disable-outside-tests.patch " # tag 2.10.17 -SRCREV= "41e7d0074b6cb5b22c89f835b4531d848ab66987" +SRCREV= "122d09549201da5383321d870bed45ecb9e168c5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/enca/enca/configure-hack.patch b/meta-openembedded/meta-oe/recipes-support/enca/enca/configure-hack.patch deleted file mode 100644 index 85abcdcf0..000000000 --- a/meta-openembedded/meta-oe/recipes-support/enca/enca/configure-hack.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- enca-1.9/configure.ac.orig 2006-02-15 00:57:39.000000000 -0800 -+++ enca-1.9/configure.ac 2006-02-15 00:57:46.000000000 -0800 -@@ -92,9 +92,6 @@ - dnl And for gtk-doc - gtk_CHECK_GTK_DOC - --dnl Check for good random number sources --AC_CHECK_FILES(/dev/random /dev/urandom /dev/srandom /dev/arandom) -- - dnl Dirty path hack. Helps some people with badly set up search paths. - if test "$prefix" = "NONE"; then - LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" diff --git a/meta-openembedded/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch b/meta-openembedded/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch deleted file mode 100644 index 6f6f3e320..000000000 --- a/meta-openembedded/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- enca-1.9/configure.ac.orig 2006-06-29 15:30:44.000000000 +0100 -+++ enca-1.9/configure.ac 2006-06-29 15:31:41.000000000 +0100 -@@ -92,14 +92,15 @@ - dnl And for gtk-doc - gtk_CHECK_GTK_DOC - --dnl Dirty path hack. Helps some people with badly set up search paths. --if test "$prefix" = "NONE"; then -- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" -- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" --else -- LDFLAGS="$LDFLAGS -L$prefix/lib" -- CPPFLAGS="$CPPFLAGS -I$prefix/include" --fi -+# This is really dumb code -+#dnl Dirty path hack. Helps some people with badly set up search paths. -+#if test "$prefix" = "NONE"; then -+# LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" -+# CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" -+#else -+# LDFLAGS="$LDFLAGS -L$prefix/lib" -+# CPPFLAGS="$CPPFLAGS -I$prefix/include" -+#fi - - dnl Checks for libraries. - ye_CHECK_LIBM diff --git a/meta-openembedded/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch b/meta-openembedded/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch index dbf0fb8ea..baf554764 100644 --- a/meta-openembedded/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch +++ b/meta-openembedded/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch @@ -17,12 +17,12 @@ index fc8c6f8..3a59549 100644 +++ b/m4/libiconv.m4 @@ -17,7 +17,7 @@ AC_REQUIRE([AC_C_CONST])dnl dnl - + dnl Use standard iconv test -AM_ICONV +m4_pattern_allow([AM_ICONV]) - CONVERTOR_LIBS="$CONVERTOR_LIBS $LIBICONV" - + CONVERTER_LIBS="$CONVERTER_LIBS $LIBICONV" + dnl Compile iconvcap.c and run it to determine what encodings iconv actually -- 1.9.3 diff --git a/meta-openembedded/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch b/meta-openembedded/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch index accfbccd6..48497d68c 100644 --- a/meta-openembedded/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch +++ b/meta-openembedded/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch @@ -1,7 +1,6 @@ ---- enca-1.9/Makefile.am.orig 2006-06-29 15:34:55.000000000 +0100 -+++ enca-1.9/Makefile.am 2006-06-29 15:35:20.000000000 +0100 -@@ -1,8 +1,8 @@ - # @(#) $Id: Makefile.am,v 1.35 2005/11/24 10:21:32 yeti Exp $ +--- enca-1.19/Makefile.am.orig 2006-06-29 15:34:55.000000000 +0100 ++++ enca-1.19/Makefile.am 2006-06-29 15:35:20.000000000 +0100 +@@ -1,7 +1,7 @@ if MAINTAINER_MODE -SUBDIRS = tools data script lib src devel-docs test +SUBDIRS = data script lib src devel-docs test diff --git a/meta-openembedded/meta-oe/recipes-support/enca/enca_1.9.bb b/meta-openembedded/meta-oe/recipes-support/enca/enca_1.19.bb index bf19843b2..0adf0a29c 100644 --- a/meta-openembedded/meta-oe/recipes-support/enca/enca_1.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/enca/enca_1.19.bb @@ -1,21 +1,18 @@ SUMMARY = "Enca is an Extremely Naive Charset Analyser" SECTION = "libs" -HOMEPAGE = "http://trific.ath.cx/software/enca/" +HOMEPAGE = "https://cihar.com/software/enca/" DEPENDS += "gettext-native" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4" -SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \ - file://configure-hack.patch \ +SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \ file://dont-run-tests.patch \ - file://configure-remove-dumbness.patch \ file://makefile-remove-tools.patch \ file://libenca-003-iconv.patch " -SRC_URI[md5sum] = "b3581e28d68d452286fb0bfe58bed3b3" -SRC_URI[sha256sum] = "02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d" +SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362d72f8a" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb index d446a31a5..8890f6ce9 100644 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb @@ -13,7 +13,7 @@ inherit pkgconfig cmake gitpkgv PE = "1" PKGV = "${GITPKGVTAG}" -SRCREV = "d2ba84a6885f57674098fe8e76c5f99d880e580d" +SRCREV = "14c7f7aed7dd4e2454ee0cd81028b9f790885021" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0 \ file://winpr-makecert-Build-with-install-RPATH.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.1.bb index 554e07fd3..60abe73a1 100644 --- a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.1.bb @@ -16,7 +16,7 @@ DEPENDS = "freetype libpng jpeg zlib tiff" SRC_URI = "git://github.com/libgd/libgd.git;branch=master \ " -SRCREV = "b079fa06223c3ab862c8f0eea58a968727971988" +SRCREV = "75ef79c9b013fb5eafd92710b3867827682fd52d" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog/0002-Find-Libunwind-during-configure.patch b/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Find-Libunwind-during-configure.patch index 15cf67fd2..577007a62 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog/0002-Find-Libunwind-during-configure.patch +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Find-Libunwind-during-configure.patch @@ -1,6 +1,5 @@ -diff -uNr a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake ---- a/cmake/FindLibunwind.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ b/cmake/FindLibunwind.cmake 2018-11-20 15:53:48.799078114 +0100 +--- /dev/null ++++ b/cmake/FindLibunwind.cmake @@ -0,0 +1,54 @@ +# - Try to find libunwind +# Once done this will define @@ -56,10 +55,9 @@ diff -uNr a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake +else() + message("Can't find libunwind library") +endif() -diff -uNr a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2018-11-20 15:49:07.576278417 +0100 -+++ b/CMakeLists.txt 2018-11-20 15:49:32.106819928 +0100 -@@ -58,7 +58,6 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,7 +64,6 @@ check_include_file (dlfcn.h HAVE_DLFCN_H check_include_file (execinfo.h HAVE_EXECINFO_H) check_include_file (glob.h HAVE_GLOB_H) check_include_file (inttypes.h HAVE_INTTYPES_H) @@ -67,27 +65,28 @@ diff -uNr a/CMakeLists.txt b/CMakeLists.txt check_include_file (memory.h HAVE_MEMORY_H) check_include_file (pwd.h HAVE_PWD_H) check_include_file (stdint.h HAVE_STDINT_H) -@@ -74,7 +73,6 @@ +@@ -80,7 +79,6 @@ check_include_file (syscall.h HAVE_SYSCA check_include_file (syslog.h HAVE_SYSLOG_H) check_include_file (ucontext.h HAVE_UCONTEXT_H) check_include_file (unistd.h HAVE_UNISTD_H) -check_include_file (unwind.h HAVE_UNWIND_H) + check_include_file (pwd.h HAVE_PWD_H) check_include_file_cxx ("ext/hash_map" HAVE_EXT_HASH_MAP) - check_include_file_cxx ("ext/hash_set" HAVE_EXT_HASH_SET) -@@ -109,10 +107,7 @@ +@@ -116,11 +114,9 @@ check_cxx_compiler_flag (-Wunnamed-type- # snprintf as an inline function check_symbol_exists (snprintf stdio.h HAVE_SNPRINTF) -check_library_exists (unwind get_static_proc_name "" HAVE_LIB_UNWIND) -- + check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) + -find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library") -mark_as_advanced (UNWIND_LIBRARY) +find_package(Libunwind) check_c_source_compiles (" #include <stdlib.h> -@@ -376,9 +371,9 @@ +@@ -471,9 +467,9 @@ add_library(glog::glog ALIAS glog) set_target_properties (glog PROPERTIES POSITION_INDEPENDENT_CODE ON) @@ -98,20 +97,19 @@ diff -uNr a/CMakeLists.txt b/CMakeLists.txt + target_link_libraries (glog PUBLIC unwind) +endif (Libunwind_FOUND) - if (HAVE_PTHREAD) - target_link_libraries (glog PUBLIC ${CMAKE_THREAD_LIBS_INIT}) -@@ -571,6 +566,7 @@ + if (HAVE_DBGHELP) + target_link_libraries (glog PUBLIC dbghelp) +@@ -678,6 +674,7 @@ export (PACKAGE glog) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibunwind.cmake - DESTINATION lib/cmake/glog) + DESTINATION ${_glog_CMake_INSTALLDIR}) - install (EXPORT glog-targets NAMESPACE glog:: DESTINATION lib/cmake/glog) -diff -uNr a/glog-config.cmake.in b/glog-config.cmake.in ---- a/glog-config.cmake.in 2018-11-20 15:49:07.576278417 +0100 -+++ b/glog-config.cmake.in 2018-11-20 15:52:32.330418489 +0100 -@@ -4,4 +4,6 @@ + install (EXPORT glog-targets NAMESPACE glog:: DESTINATION +--- a/glog-config.cmake.in ++++ b/glog-config.cmake.in +@@ -8,4 +8,6 @@ include (CMakeFindDependencyMacro) @gflags_DEPENDENCY@ diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Rework-CMake-glog-VERSION-management.patch b/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Rework-CMake-glog-VERSION-management.patch deleted file mode 100644 index f41a6c972..000000000 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Rework-CMake-glog-VERSION-management.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4ea11e0d7c0575316a6ccc07a931164ca29c3d2f Mon Sep 17 00:00:00 2001 -From: Corentin Le Molgat <corentinl@google.com> -Date: Mon, 29 Jan 2018 14:59:08 +0100 -Subject: [PATCH] Rework CMake glog VERSION management. - -- Use of Project version properties instead of custom variables -- fix missmatch between VERSION (build version) and SOVERSION (API version) -src: https://cmake.org/cmake/help/latest/prop_tgt/VERSION.html#prop_tgt:VERSION - -Upstream-Status: Backport [https://github.com/google/glog/commit/6b6e38a7d53fe01f42ce34384cf4ba4c50e8cb65] -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - CMakeLists.txt | 23 ++++++++--------------- - 1 file changed, 8 insertions(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7415eab..fb4e408 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,23 +8,16 @@ if (POLICY CMP0063) - cmake_policy (SET CMP0063 NEW) - endif (POLICY CMP0063) - --project (google-glog) -+project(glog VERSION 0.3.5 LANGUAGES C CXX) - - enable_testing () - --set (GLOG_MAJOR_VERSION 0) --set (GLOG_MINOR_VERSION 3) --set (GLOG_PATCH_VERSION 5) -- --set (GLOG_VERSION -- ${GLOG_MAJOR_VERSION}.${GLOG_MINOR_VERSION}.${GLOG_PATCH_VERSION}) -- - set (CPACK_PACKAGE_NAME glog) - set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "") --set (CPACK_PACKAGE_VERSION_MAJOR ${GLOG_MAJOR_VERSION}) --set (CPACK_PACKAGE_VERSION_MINOR ${GLOG_MINOR_VERSION}) --set (CPACK_PACKAGE_VERSION_PATCH ${GLOG_PATCH_VERSION}) --set (CPACK_PACKAGE_VERSION ${GLOG_VERSION}) -+set (CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) -+set (CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) -+set (CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) -+set (CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) - - option (WITH_GFLAGS "Use gflags" ON) - option (WITH_THREADS "Enable multithreading support" ON) -@@ -406,8 +399,8 @@ if (gflags_FOUND) - endif (NOT BUILD_SHARED_LIBS) - endif (gflags_FOUND) - --set_target_properties (glog PROPERTIES VERSION ${GLOG_MAJOR_VERSION}) --set_target_properties (glog PROPERTIES SOVERSION ${GLOG_VERSION}) -+set_target_properties (glog PROPERTIES VERSION ${PROJECT_VERSION}) -+set_target_properties (glog PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR}) - - if (WIN32) - target_compile_definitions (glog PUBLIC GLOG_NO_ABBREVIATED_SEVERITIES) -@@ -570,7 +563,7 @@ configure_package_config_file (glog-config.cmake.in - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - - write_basic_package_version_file (glog-config-version.cmake VERSION -- ${GLOG_VERSION} COMPATIBILITY SameMajorVersion) -+ ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion) - - export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) - export (PACKAGE glog) --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog/0003-installation-path-fix.patch b/meta-openembedded/meta-oe/recipes-support/glog/glog/0003-installation-path-fix.patch deleted file mode 100644 index 641f70cb2..000000000 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog/0003-installation-path-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -uNr a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2018-12-05 12:55:59.630792054 +0100 -+++ b/CMakeLists.txt 2018-12-05 13:00:22.922269200 +0100 -@@ -403,10 +403,15 @@ - - set_target_properties (glog PROPERTIES PUBLIC_HEADER "${GLOG_PUBLIC_H}") - -+set (_glog_CMake_BINDIR ${CMAKE_INSTALL_BINDIR}) -+set (_glog_CMake_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}) -+set (_glog_CMake_LIBDIR ${CMAKE_INSTALL_LIBDIR}) -+set (_glog_CMake_INSTALLDIR ${_glog_CMake_LIBDIR}/cmake/glog) -+ - target_include_directories (glog BEFORE PUBLIC - "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" - "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>" -- "$<INSTALL_INTERFACE:include>" -+ "$<INSTALL_INTERFACE:${_glog_CMake_INCLUDE_DIR}>" - PRIVATE ${CMAKE_CURRENT_BINARY_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) - -@@ -543,10 +548,10 @@ - - install (TARGETS glog - EXPORT glog-targets -- RUNTIME DESTINATION bin -- PUBLIC_HEADER DESTINATION include/glog -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ RUNTIME DESTINATION ${_glog_CMake_BINDIR} -+ PUBLIC_HEADER DESTINATION ${_glog_CMake_INCLUDE_DIR}/glog -+ LIBRARY DESTINATION ${_glog_CMake_LIBDIR} -+ ARCHIVE DESTINATION ${_glog_CMake_LIBDIR}) - - if (gflags_FOUND) - set (gflags_DEPENDENCY "find_dependency (gflags ${gflags_VERSION})") -@@ -554,7 +559,7 @@ - - configure_package_config_file (glog-config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake -- INSTALL_DESTINATION lib/cmake/glog -+ INSTALL_DESTINATION ${_glog_CMake_INSTALLDIR} - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - - write_basic_package_version_file (glog-config-version.cmake VERSION -@@ -567,6 +572,7 @@ - ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibunwind.cmake -- DESTINATION lib/cmake/glog) -+ DESTINATION ${_glog_CMake_INSTALLDIR}) - --install (EXPORT glog-targets NAMESPACE glog:: DESTINATION lib/cmake/glog) -+install (EXPORT glog-targets NAMESPACE glog:: DESTINATION -+ ${_glog_CMake_INSTALLDIR}) -diff -uNr a/glog-config.cmake.in b/glog-config.cmake.in ---- a/glog-config.cmake.in 2018-12-05 12:55:59.630792054 +0100 -+++ b/glog-config.cmake.in 2018-12-05 13:05:19.547196843 +0100 -@@ -4,6 +4,7 @@ - - @gflags_DEPENDENCY@ - -+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") - find_dependency (Libunwind) - - include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake") diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.4.0.bb index 56bf51554..8dc84e412 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.4.0.bb @@ -8,12 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" SRC_URI = " \ git://github.com/google/glog.git;nobranch=1 \ - file://0001-Rework-CMake-glog-VERSION-management.patch \ - file://0002-Find-Libunwind-during-configure.patch \ - file://0003-installation-path-fix.patch \ + file://0001-Find-Libunwind-during-configure.patch \ " -SRCREV = "a6a166db069520dbbd653c97c2e5b12e08a8bb26" +SRCREV = "96a2f23dca4cc7180821ca5f32e526314395d26a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch new file mode 100644 index 000000000..f3cd1015f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch @@ -0,0 +1,27 @@ +From ce3ab6ba4b8176d100ac535a39e3d5b0c517989b Mon Sep 17 00:00:00 2001 +From: Jan Palus <atler@pld-linux.org> +Date: Fri, 15 Jan 2021 14:32:14 +0100 +Subject: [PATCH] configure.ac: remove duplicate AC_CONFIG_MACRO_DIR (#226) + +fixes build with autoconf 2.70 +Upstream-Status: Backport [https://github.com/libusb/hidapi/pull/226] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 220909a..77da67a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,7 +13,6 @@ LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}" + + AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([foreign -Wall -Werror]) +-AC_CONFIG_MACRO_DIR([m4]) + + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + LT_INIT +-- +2.30.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb index df68a850a..76f5dc762 100644 --- a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb @@ -10,7 +10,9 @@ DEPENDS = "libusb udev" inherit autotools pkgconfig -SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https" +SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https \ + file://0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch \ +" PV = "0.10.1" SRCREV = "f6d0073fcddbdda24549199445e844971d3c9cef" S = "${WORKDIR}/git" 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 59c6093b1..56d814db8 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.343" -SRCREV = "cce4969f24c213ae3ab45ee90a485b342ab74014" +PV = "0.345" +SRCREV = "5d7d97bae533401f60ce9a5a036ff7152c8aca8c" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch b/meta-openembedded/meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch new file mode 100644 index 000000000..fb7b85cfd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch @@ -0,0 +1,24 @@ +include: install header files without prefix dir inih + +The other flavor of inih which adapted by Fedora and Ubuntu installs +header files to /usr/include directly. And xfsprogs 5.10.0 also checks +ini.h without extra search path and fails. So install header files +without prefix dir inih. + +Upstream-Status: Submitted [https://github.com/OSSystems/inih/pull/4] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + include/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index 7a46ee7..4a9033f 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -1 +1 @@ +-install(FILES ini.h INIReader.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/inih) ++install(FILES ini.h INIReader.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include) +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb b/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb index 227e2a7b7..5beb29281 100644 --- a/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb @@ -10,7 +10,8 @@ PR = "r3" # The github repository provides a cmake and pkg-config integration SRCREV = "c858aff8c31fa63ef4d1e0176c10e5928cde9a23" SRC_URI = "git://github.com/OSSystems/inih.git \ - " + file://0001-include-install-header-files-without-prefix-dir-inih.patch \ + " UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.11.bb b/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.12.bb index 4f10f3531..f07b881a7 100644 --- a/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.12.bb @@ -1,11 +1,11 @@ SUMMARY = "Little cms is a small-footprint, speed optimized color management engine" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=9391499b030def18e7bb25bab4bee052" +LIC_FILES_CHKSUM = "file://COPYING;md5=ac638b4bc6b67582a11379cfbaeb93dd" SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" -SRC_URI[md5sum] = "598dae499e58f877ff6788254320f43e" -SRC_URI[sha256sum] = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e" +SRC_URI[md5sum] = "8cb583c8447461896320b43ea9a688e0" +SRC_URI[sha256sum] = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5" DEPENDS = "tiff" diff --git a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb index 6fc5881c5..dc5050969 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb @@ -3,18 +3,29 @@ HOMEPAGE = "https://uscilab.github.io/cereal/" SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e612690af2f575dfd02e2e91443cea23" - -SRCREV = "02eace19a99ce3cd564ca4e379753d69af08c2c8" +LICENSE = "BSD-3-Clause & MIT & BSL-1.0" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=e612690af2f575dfd02e2e91443cea23 \ + file://include/cereal/external/rapidxml/license.txt;md5=d63ab70ba21ca0544b03284958324301 \ + file://include/cereal/external/LICENSE;md5=b07578c9df99c0b8b45eb041efd4a645 \ + file://include/cereal/external/rapidjson/LICENSE;md5=e7abb663111d4ac17cf00323698aff08 \ + file://include/cereal/external/rapidjson/msinttypes/LICENSE;md5=dffce65b98c773976de2e338bd130f46 \ +" + +PROVIDES += "${PN}-dev" + +PV .= "+git${SRCPV}" +SRCREV = "64f50dbd5cecdaba785217e2b0aeea3a4f1cdfab" SRC_URI = "git://github.com/USCiLab/cereal.git" S = "${WORKDIR}/git" -inherit cmake +inherit cmake pkgconfig EXTRA_OECMAKE = "-DJUST_INSTALL_CEREAL=ON" ALLOW_EMPTY_${PN} = "1" +RDEPENDS_${PN}-dev = "" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest new file mode 100644 index 000000000..4cda05d44 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest @@ -0,0 +1,12 @@ +#!/bin/sh + +testbin="gpiod-test" +ptestdir=$(dirname "$(readlink -f "$0")") +cd $ptestdir/tests + +./$testbin +if [ $? -ne 0 ]; then + echo "FAIL: $testbin" +else + echo "PASS: $testbin" +fi diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.2.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.2.bb index c0cf54589..c6c262b70 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.2.bb @@ -4,11 +4,14 @@ AUTHOR = "Bartosz Golaszewski <bgolaszewski@baylibre.com>" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" -SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz" +SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz \ + file://run-ptest \ +" + SRC_URI[md5sum] = "4765470becb619fead3cdaeac61b9a77" SRC_URI[sha256sum] = "c601e71846f5ab140c83bc757fdd62a4fda24a9cee39cc5e99c96ec2bf1b06a9" -inherit autotools pkgconfig python3native +inherit autotools pkgconfig python3native ptest PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" @@ -28,6 +31,14 @@ FILES_${PN}-tools = "${bindir}/*" FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.so" +FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" RRECOMMENDS_PYTHON = "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '',d)}" RRECOMMENDS_${PN}-python += "${RRECOMMENDS_PYTHON}" + +PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch new file mode 100644 index 000000000..19bf14708 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch @@ -0,0 +1,30 @@ +From 3ee2f1e231bde18a99f86da747a9b8feca3c179d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 17 Feb 2021 19:18:16 -0800 +Subject: [PATCH] do not build examples + +examples need ucontext and some architectures on musl do not have it +implemented e.g. riscv + +Upstream-Status: Inappropriate [Arch-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 948e004..8b63024 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,7 +11,6 @@ default: all + all: + @$(MAKE) -C src + @$(MAKE) -C test +- @$(MAKE) -C examples + + partcheck: all + @echo "make partcheck => TODO add tests with out kernel support" +-- +2.30.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb index e122a907c..d79389a69 100644 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb @@ -12,6 +12,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=d51b5805e2a675685e SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ file://0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch \ " +SRC_URI_append_libc-musl_riscv64 = " file://0001-do-not-build-examples.patch " +SRC_URI_append_libc-musl_riscv32 = " file://0001-do-not-build-examples.patch " + SRCREV = "45f0735219a615ae848033c47c7e2d85d101d43e" S = "${WORKDIR}/git" @@ -20,7 +23,9 @@ XCFLAGS = "-pthread" XCFLAGS_append_libc-musl = " -lucontext" EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" - +do_configure() { + ${S}/configure --prefix=${prefix} +} do_install () { oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir} } diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb index be558ce1d..be558ce1d 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 11ee7ca8b..6618e21f3 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -18,7 +18,7 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ file://reproducible-build.patch \ " -SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" +SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6" S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig systemd license diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch deleted file mode 100644 index 24d5b1b48..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 93c93e3b85492e58f9451841e6079d00c497efa4 Mon Sep 17 00:00:00 2001 -From: Jiping Ma <jiping.ma2@windriver.com> -Date: Mon, 25 Feb 2019 13:29:12 +0800 -Subject: [PATCH] "/dev/hdc: open failed: No medium found" will print out in - lvmdiskscan. - -commit [57bb46c5e7f8] introduce this issue. -"/dev/hdc: open failed: No medium found" will be print out -after run lvmdiskscan. change dev_open_readonly() -to dev_open_readonly_quiet() in fuction _dev_get_size_dev(). - -Signed-off-by: Jiping Ma <jiping.ma2@windriver.com> ---- - lib/device/dev-io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c -index dc95131..81a66b0 100644 ---- a/lib/device/dev-io.c -+++ b/lib/device/dev-io.c -@@ -338,7 +338,7 @@ static int _dev_get_size_dev(struct device *dev, uint64_t *size) - } - - if (fd <= 0) { -- if (!dev_open_readonly(dev)) -+ if (!dev_open_readonly_quiet(dev)) - return_0; - fd = dev_fd(dev); - do_close = 1; --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch index 16de8c0a1..34e0620a1 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch @@ -1,6 +1,6 @@ -From 27b56cb6b5dfc75ea8ddb395dc9ef41fb7a09c93 Mon Sep 17 00:00:00 2001 +From ddf36613f3408ce42f15b03b4e9c6ad8478b97f8 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 2 Sep 2019 23:04:50 -0400 +Date: Tue, 2 Mar 2021 01:33:05 -0800 Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found In oe-core (util-linux and coreutils), the commands locates in @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index d1431e2..54e5a7b 100644 +index 4811d4a3d..137b31a82 100644 --- a/configure.ac +++ b/configure.ac -@@ -1495,6 +1495,8 @@ fi +@@ -1611,6 +1611,8 @@ fi SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))" @@ -27,7 +27,7 @@ index d1431e2..54e5a7b 100644 SBINDIR="$(eval echo $(eval echo $sbindir))" LVM_PATH="$SBINDIR/lvm" AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) -@@ -1721,6 +1723,7 @@ AC_SUBST(SACKPT_CFLAGS) +@@ -1829,6 +1831,7 @@ AC_SUBST(SACKPT_CFLAGS) AC_SUBST(SACKPT_LIBS) AC_SUBST(SALCK_CFLAGS) AC_SUBST(SALCK_LIBS) @@ -36,10 +36,10 @@ index d1431e2..54e5a7b 100644 AC_SUBST(SELINUX_LIBS) AC_SUBST(SELINUX_PC) diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in -index a4b8a8f..3db4226 100644 +index 7c517b87b..7ef1bb766 100644 --- a/scripts/blkdeactivate.sh.in +++ b/scripts/blkdeactivate.sh.in -@@ -41,13 +41,14 @@ UMOUNT="/bin/umount" +@@ -42,13 +42,14 @@ VDO="/bin/vdo" sbindir="@SBINDIR@" DMSETUP="$sbindir/dmsetup" @@ -55,9 +55,9 @@ index a4b8a8f..3db4226 100644 FINDMNT_READ="read -r mnt" fi DMSETUP_OPTS="" -@@ -55,10 +56,10 @@ LVM_OPTS="" - MDADM_OPTS="" +@@ -57,10 +58,10 @@ MDADM_OPTS="" MPATHD_OPTS="" + VDO_OPTS="" -LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" +LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" @@ -69,5 +69,5 @@ index a4b8a8f..3db4226 100644 # Do not show tool errors by default (only done/skipping summary # message provided by this script) and no verbose mode by default. -- -2.8.1 +2.29.2 diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb index bc86810ec..7f3f000e0 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb @@ -1,7 +1,6 @@ require lvm2.inc SRC_URI += " \ - file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.52.bb index 537c45874..69e1788e9 100644 --- a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb +++ b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.52.bb @@ -18,8 +18,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8dce08227d135cfda1f19d4c0c6689de" SRC_URI = "https://releases.pagure.org/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "d5701a1a541383c0eda328f4a6518751" -SRC_URI[sha256sum] = "f7381516bc1a937348efd1d0e14618e0a2afc5d59fe821dd248632d5601b59b5" +SRC_URI[md5sum] = "3d1a14a80bb85564c323562670f1c01f" +SRC_URI[sha256sum] = "e6f615ec2ffe705522075d960744534c443ece66acfb34fada38d567d8823639" inherit update-alternatives 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 index 83c29a651..03bcc451d 100644 --- 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 @@ -1,6 +1,6 @@ -From 139177715a2d66ccd3e099be5d9d4dc86db30055 Mon Sep 17 00:00:00 2001 +From 3765b3a4cabf76f55c1c126ac64780a8c117d1d9 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> -Date: Tue, 12 Jan 2021 03:05:38 +0000 +Date: Tue, 12 Jan 2021 10:30:13 +0800 Subject: [PATCH] test: avoid the pfa test hang Per [1], the pfa test needs to install page-types and the pfa test @@ -18,13 +18,13 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 1 file changed, 3 insertions(+) diff --git a/tests/test b/tests/test -index 9623f4a..7c552a9 100755 +index 020ae2b..320f57f 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 +@@ -47,6 +47,9 @@ do + # Inject mce records and run mcelog in parallel. + # So that the mce records can be consumed by mcelog in time (avoid mce record overflow). + ./inject $conf & + if [ "$1" = "pfa" ] ; then + which page-types > /dev/null 2>&1 || continue + fi diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_175.bb index f3e018d4a..ae810eff8 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_175.bb @@ -10,7 +10,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; file://run-ptest \ " -SRCREV = "391abaac9bdff385934b18134789bcc98b0adeb7" +SRCREV = "7b776a8c005b60572f49797e81287540f99fff1f" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.4.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.6.bb index 68c326b52..1ce08dd50 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.6.bb @@ -12,7 +12,7 @@ RDEPENDS_${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "fe993408b22286355809ce48ebecc4444d19af8203ed4959d269969112ed86e9" +SRC_URI[sha256sum] = "fce183e4a7034d07d219c79aa2f579005d1fd49f156db6e50f53543a87637a32" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" 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 index dc147efea..0d668ba06 100644 --- 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 @@ -52,6 +52,14 @@ do_configure_prepend_libc-musl () { sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk } +do_configure_prepend_powerpc64le_toolchain-clang () { + sed -i -e 's/\-std=c99/\-std=gnu99/g' ${S}/nss/coreconf/command.mk +} + +do_configure_prepend_powerpc64_toolchain-clang () { + sed -i -e 's/\-std=c99/\-std=gnu99/g' ${S}/nss/coreconf/command.mk +} + do_compile_prepend_class-native() { export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} @@ -68,7 +76,6 @@ do_compile_prepend_class-native() { do_compile() { export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - export NSS_ENABLE_WERROR=0 export CROSS_COMPILE=1 export NATIVE_CC="${BUILD_CC}" @@ -76,6 +83,10 @@ do_compile() { export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" export BUILD_OPT=1 + # POSIX.1-2001 states that the behaviour of getcwd() when passing a null + # pointer as the buf argument, is unspecified. + export NATIVE_FLAGS="${NATIVE_FLAGS} -DGETCWD_CANT_MALLOC" + export FREEBL_NO_DEPEND=1 export FREEBL_LOWHASH=1 @@ -93,7 +104,7 @@ do_compile() { if [ "${TARGET_ARCH}" = "powerpc" ]; then OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + elif [ "${TARGET_ARCH}" = "powerpc64" -o "${TARGET_ARCH}" = "powerpc64le" ]; then OS_TEST=ppc64 elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then OS_TEST=mips @@ -151,7 +162,7 @@ do_install() { if [ "${TARGET_ARCH}" = "powerpc" ]; then OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + elif [ "${TARGET_ARCH}" = "powerpc64" -o "${TARGET_ARCH}" = "powerpc64le" ]; then OS_TEST=ppc64 elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then OS_TEST=mips diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch new file mode 100644 index 000000000..ce6499bfc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch @@ -0,0 +1,28 @@ +From 67e1a5400383543b28fc69eb09c9429cb9d8c026 Mon Sep 17 00:00:00 2001 +From: Your Name <you@example.com> +Date: Sat, 2 Jan 2021 17:43:11 +0000 +Subject: [PATCH] Fix building opencv using gcc 11.x #19244 + +Add missing `#include <thread>` in modules/gapi/test/test_precomp.hpp + +Upstream-Status: Backport [https://github.com/opencv/opencv/pull/19247] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + modules/gapi/test/test_precomp.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/gapi/test/test_precomp.hpp b/modules/gapi/test/test_precomp.hpp +index 7b3c695443..e92b1d03bf 100644 +--- a/modules/gapi/test/test_precomp.hpp ++++ b/modules/gapi/test/test_precomp.hpp +@@ -11,6 +11,7 @@ + #define __OPENCV_GAPI_TEST_PRECOMP_HPP__ + + #include <cstdint> ++#include <thread> + #include <vector> + + #include <opencv2/ts.hpp> +-- +2.30.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch deleted file mode 100644 index 022680331..000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 114af1ca23ff9bf2e521b2969e343e74cdd8eac1 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Sun, 1 Nov 2020 12:29:56 +0000 -Subject: [PATCH] samples: cmake: digits needs opencv_dnn module to build - -Intrudeced in commit 397ba2d9aafb5312e777ce2f886d7b568109e931: -add OpenCV sample for digit and text recongnition, and provide multiple OCR models. -https://github.com/opencv/opencv/commit/397ba2d9aafb5312e777ce2f886d7b568109e931 - -Upstream-Status: Backport [https://github.com/opencv/opencv/commit/79a82013ad2af04269891ce15281c9fdc31d3f66] - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> ---- - samples/cpp/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt -index 617629df2e..14ab6141df 100644 ---- a/samples/cpp/CMakeLists.txt -+++ b/samples/cpp/CMakeLists.txt -@@ -14,6 +14,7 @@ set(OPENCV_CPP_SAMPLES_REQUIRED_DEPS - opencv_features2d - opencv_calib3d - opencv_stitching -+ opencv_dnn - ${OPENCV_MODULES_PUBLIC} - ${OpenCV_LIB_COMPONENTS}) - ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS}) diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.1.bb index b223334a5..d87e140ba 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.1.bb @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "d5fd2f0155ffad366f9ac912dfd6d189a7a6a98e" -SRCREV_contrib = "37315babf9984a5b6aa981644a20dd8df1a5ff02" +SRCREV_opencv = "1363496c1106606684d40447f5d1149b2c66a9f8" +SRCREV_contrib = "b91a781cbc1285d441aa682926d93d8c23678b0b" SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" @@ -49,7 +49,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0001-Dont-use-isystem.patch \ file://download.patch \ file://0001-Make-ts-module-external.patch \ - file://0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch \ + file://0001-Fix-building-opencv-using-gcc-11.x-19244.patch \ " SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" @@ -123,6 +123,7 @@ PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${ PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," +PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON,-DBUILD_TESTS=OFF,," PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," @@ -213,6 +214,11 @@ do_install_append() { mv ${D}/usr/lib/* ${D}/${libdir}/ rm -rf ${D}/usr/lib fi + # remove build host path to improve reproducibility + if [ -f ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake ]; then + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake + fi } TOOLCHAIN = "gcc" diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch index 7c675962b..b59db3939 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch @@ -4,9 +4,9 @@ Upstream-Status: Pending ---- openldap-2.2.24/.pc/install-strip.patch/build/top.mk 2005-01-20 09:00:55.000000000 -0800 -+++ openldap-2.2.24/build/top.mk 2005-04-16 13:48:20.536710376 -0700 -@@ -116,7 +116,7 @@ +--- a/build/top.mk ++++ b/build/top.mk +@@ -121,7 +121,7 @@ LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \ $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD) diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch index 86d0767a4..91bcc0435 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch @@ -4,9 +4,9 @@ Upstream-status: Pending -- ---- openldap-2.4.28/configure.in.orig 2012-02-11 22:40:36.004360795 +0000 -+++ openldap-2.4.28/configure.in 2012-02-11 22:40:13.410986851 +0000 -@@ -1214,7 +1214,7 @@ +--- a/configure.in ++++ b/configure.in +@@ -1227,7 +1227,7 @@ if test $ol_link_tls = no ; then ol_with_tls=gnutls ol_link_tls=yes diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch index ce8b47ae4..ab5c4de66 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch @@ -19,11 +19,9 @@ Signed-off-by: Li Wang <li.wang@windriver.com> libraries/libldap/tls_m.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) -diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c -index 9b101f9..e6f3051 100644 --- a/libraries/libldap/tls_m.c +++ b/libraries/libldap/tls_m.c -@@ -621,18 +621,23 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum]) +@@ -620,18 +620,23 @@ nss_parse_ciphers(const char *cipherstr, */ if (mask || strength || protocol) { for (i=0; i<ciphernum; i++) { @@ -58,6 +56,3 @@ index 9b101f9..e6f3051 100644 } } else { for (i=0; i<ciphernum; i++) { --- -1.7.9.5 - diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch index 38c0a5af2..4d1fda96e 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch @@ -1,8 +1,8 @@ Upstream-Status: Pending ---- openldap-2.3.11/build/openldap.m4.orig 2005-11-11 00:11:18.604322590 -0800 -+++ openldap-2.3.11/build/openldap.m4 2005-11-11 00:26:21.621145856 -0800 -@@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ +--- a/build/openldap.m4 ++++ b/build/openldap.m4 +@@ -651,7 +651,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ ]]) AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], @@ -11,7 +11,7 @@ Upstream-Status: Pending int main(argc, argv) int argc; -@@ -796,7 +796,7 @@ int main(argc, argv) +@@ -659,7 +659,7 @@ int main(argc, argv) { OL_PTHREAD_TEST_FUNCTION } diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch index 870fc98ad..7a1b5aaad 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch @@ -12,8 +12,6 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> build/mkversion | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/build/mkversion b/build/mkversion -index 4e35723..9fa3bee 100755 --- a/build/mkversion +++ b/build/mkversion @@ -53,8 +53,12 @@ APPLICATION=$1 @@ -39,6 +37,3 @@ index 4e35723..9fa3bee 100755 "\t$WHOWHERE\n"; __EOF__ --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/use-urandom.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/use-urandom.patch index e7b988faf..96a03369a 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/use-urandom.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/use-urandom.patch @@ -11,7 +11,7 @@ Signed-off-by: Joe Slater <jslater@windriver.com> --- a/configure.in +++ b/configure.in -@@ -2142,8 +2142,8 @@ fi +@@ -2153,8 +2153,8 @@ fi dnl ---------------------------------------------------------------- dnl Check for entropy sources @@ -21,7 +21,7 @@ Signed-off-by: Joe Slater <jslater@windriver.com> if test -r /dev/urandom ; then dev="/dev/urandom"; elif test -r /idev/urandom ; then -@@ -2156,9 +2156,11 @@ if test $cross_compiling != yes && test +@@ -2167,9 +2167,11 @@ if test $cross_compiling != yes && test dev="/idev/random"; fi 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 index a282523a3..7c0460067 100644 --- 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 @@ -151,11 +151,13 @@ 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 + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/missing ${S}/build + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/compile ${S}/build autoconf oe_runconf } diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch new file mode 100644 index 000000000..8bb60b555 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch @@ -0,0 +1,215 @@ +From 51d66c1c257f7487497f562033ac32ac75f648cb Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Mon, 8 Feb 2021 12:27:51 +0100 +Subject: [PATCH] meson: import changes from 3.0.* version + +* we need to use the meson option to disable introspection and docs + +Upstream-Status: Backport +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + meson.build | 139 ++++++++++++++++++++++++++++------------------ + meson_options.txt | 5 ++ + 2 files changed, 90 insertions(+), 54 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index 1084c82..ed040b4 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,9 +53,9 @@ compiler = meson.get_compiler('c') + pkgconfig = import('pkgconfig') + + # ####################################################################### +-# # Check for GLib 2.16 ++# # Check for GLib 2.44 + # ####################################################################### +-glib = dependency('glib-2.0', version : '>= 2.16.0') ++glib = dependency('glib-2.0', version : '>= 2.44.0') + gobject = dependency('gobject-2.0') + gmodule = dependency('gmodule-2.0') + gnome = import('gnome') +@@ -63,74 +63,88 @@ gnome = import('gnome') + ####################################################################### + # Check for LibXML2 + ####################################################################### +-libxml = dependency('libxml-2.0', version : '>= 2.6.0', required : false) +-gnt_config.set('NO_LIBXML', not libxml.found()) ++libxml = dependency('libxml-2.0', version : '>= 2.6.0') + + ####################################################################### + # Check for ncurses and other things used by it + ####################################################################### + ncurses_available = true +-ncurses_inc = [] +-# The order of this list is important to the condition that follows. +-ncurses_libs = [ +- compiler.find_library('ncursesw', required : false), +- compiler.find_library('panelw', required : false), +- compiler.find_library('tinfow', required : false), +-] +-if not ncurses_libs[0].found() or not ncurses_libs[1].found() +- ncurses_available = false +-endif ++ncurses_widechar = true ++ncurses_header = 'ncurses.h' ++# Some distros put the headers in ncursesw/, some don't. These are ordered to ++# pick the last available as most-specific version. ++ncursesw_header_paths = ['', 'ncursesw/'] + +-if host_machine.system() == 'windows' +- # FIXME: $host ? +- ncurses_sys_prefix = '/usr/$host/sys-root/mingw' ++ncurses = [ ++ dependency('ncursesw', required : false), ++ dependency('panelw', required : false), ++] ++if ncurses[0].found() and ncurses[1].found() ++ foreach location : ncursesw_header_paths ++ f = location + 'ncurses.h' ++ if compiler.has_header_symbol(f, 'get_wch', ++ prefix : '#define _XOPEN_SOURCE_EXTENDED') ++ ncurses_header = f ++ endif ++ endforeach + else +- ncurses_sys_prefix = '/usr' +-endif +- +-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw', +- ncurses_sys_prefix + '/include'] +- +-if ncurses_available +- # Some distros put the headers in ncursesw/, some don't +- found_ncurses_h = false +- foreach location : ncurses_sys_dirs +- f = location + '/ncurses.h' +- if not found_ncurses_h ++ ncurses_available = false ++ ncurses_inc = [] ++ ncurses_libs = [ ++ compiler.find_library('ncursesw', required : false), ++ compiler.find_library('panelw', required : false) ++ ] ++ if ncurses_libs[0].found() and ncurses_libs[1].found() ++ foreach location : ncursesw_header_paths ++ f = location + 'ncurses.h' + if compiler.has_header_symbol(f, 'get_wch', + prefix : '#define _XOPEN_SOURCE_EXTENDED') +- if location != '.' +- ncurses_inc += [include_directories(location)] +- endif +- found_ncurses_h = true ++ ncurses_available = true ++ ncurses_header = f + endif +- endif +- endforeach ++ endforeach + +- if not found_ncurses_h +- ncurses_inc = [] +- ncurses_libs = [] +- ncurses_available = false ++ if ncurses_available ++ ncurses = declare_dependency( ++ include_directories : ncurses_inc, ++ dependencies : ncurses_libs ++ ) ++ endif + endif +-else ++endif ++ ++if not ncurses_available + # ncursesw was not found. Look for plain old ncurses +- # The order of this list is important to the condition that follows. +- ncurses_libs = [ +- compiler.find_library('ncurses', required : false), +- compiler.find_library('panel', required : false), +- compiler.find_library('tinfo', required : false), ++ ncurses = [ ++ dependency('ncurses', required : false), ++ dependency('panel', required : false), + ] +- ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found() +- gnt_config.set('NO_WIDECHAR', true) ++ if ncurses[0].found() and ncurses_libs[1].found() ++ ncurses_available = true ++ else ++ ncurses_libs = [ ++ compiler.find_library('ncurses', required : false), ++ compiler.find_library('panel', required : false), ++ ] ++ ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found() ++ ncurses = declare_dependency(dependencies : ncurses_libs) ++ endif ++ ncurses_widechar = false + endif ++ ++if not ncurses_available and host_machine.system() == 'windows' ++ # Try pdcurses too. ++ ncurses_header = 'curses.h' ++ ncurses_libs = compiler.find_library('pdcurses', required : false) ++ ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found() ++ ncurses = declare_dependency(dependencies : ncurses_libs) ++endif ++ + if not ncurses_available + error('ncurses could not be found!') + endif +- +-ncurses = declare_dependency( +- include_directories : ncurses_inc, +- dependencies : ncurses_libs +-) ++gnt_config.set('NCURSES_HEADER', ncurses_header) ++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar) + + libgnt_SOURCES = [ + 'gntwidget.c', +@@ -191,7 +205,10 @@ libgnt_headers = [ + ] + + # Check for Python headers +-python_dep = dependency('python2', required : false) ++python_dep = dependency('python3-embed', required: false) ++if not python_dep.found() ++ python_dep = dependency('python3', required : false) ++endif + gnt_config.set('USE_PYTHON', python_dep.found()) + + configure_file(output : 'gntconfig.h', +@@ -233,6 +250,20 @@ pkgconfig.generate( + variables : ['plugindir = ${libdir}/gnt'], + ) + ++if get_option('introspection') ++ libgnt_gir = gnome.generate_gir(libgnt, ++ sources : libgnt_headers + [gnt_h], ++ includes : 'GObject-2.0', ++ namespace : 'Gnt', ++ symbol_prefix : 'gnt', ++ identifier_prefix : 'Gnt', ++ nsversion : '@0@.@1@'.format(gnt_major_version, gnt_minor_version), ++ install : true, ++ extra_args : ['-DGNT_COMPILATION', '--quiet']) ++endif ++ + subdir('wms') + subdir('test') +-subdir('doc') ++if get_option('doc') ++ subdir('doc') ++endif +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..f2414e2 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1,5 @@ ++option('doc', type : 'boolean', value : true, yield : true, ++ description : 'build documentation with gtk-doc') ++ ++option('introspection', type : 'boolean', value : true, yield : true, ++ description : 'build introspection data') diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb new file mode 100644 index 000000000..67d8cc87c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "GNT: The GLib Ncurses Toolkit" + +SECTION = "libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=c9a1abacd0166f595a9fbe6afb1f0d5e" +DEPENDS = "glib-2.0 ncurses libxml2 glib-2.0-native" + +inherit meson + +# SRCREV = "0a44b1d01c41" +# SRC_URI = "hg://keep.imfreedom.org/${BPN};module=${BPN} + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/pidgin/${BPN}/${PV}/${BP}.tar.xz \ + file://0001-meson-import-changes-from-3.0.-version.patch \ +" +SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1eb4bd8" + +EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false" + +FILES_${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch new file mode 100644 index 000000000..cfb0290f9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch @@ -0,0 +1,229 @@ +From e03d3ef5aadd582ebf7102b7d5785fed177a0cb1 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 7 Feb 2021 13:25:29 +0100 +Subject: [PATCH] configure.ac: fix build with autoconf-2.71 + +* fixes: + | autoreconf: running: intltoolize --copy --force + | ERROR: 'IT_PROG_INTLTOOL' must appear in configure.ac for intltool to work. + | autoreconf: error: intltoolize failed with exit status: 1 + +* replace AM_GLIB_GNU_GETTEXT with AM_GNU_GETTEXT as suggested in: + https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration + https://blogs.gnome.org/jjardon/2010/10/08/use-upstream-gettext-instead-the-glib-one/ + because the former is causing issues with autoconf-2.71: + + -m4trace:configure.ac:266: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. + -You should run autoupdate.], [../autoconf-2.71/lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from... + -../autoconf-2.71/lib/m4sugar/m4sh.m4:699: AS_IF is expanded from... + -../autoconf-2.71/lib/autoconf/headers.m4:89: _AC_CHECK_HEADER_COMPILE is expanded from... + -../autoconf-2.71/lib/autoconf/headers.m4:56: AC_CHECK_HEADER is expanded from... + -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:150: GLIB_WITH_NLS is expanded from... + -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:370: GLIB_GNU_GETTEXT is expanded from... + -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:470: AM_GLIB_GNU_GETTEXT is expanded from... + -configure.ac:266: the top level]) + -m4trace:configure.ac:266: -1- m4_pattern_allow([^ENABLE_NLS$]) + -m4trace:configure.ac:266: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. + -You should run autoupdate.], [../autoconf-2.71/lib/autoconf/status.m4:1025: AC_OUTPUT_COMMANDS is expanded from... + -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:150: GLIB_WITH_NLS is expanded from... + -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:370: GLIB_GNU_GETTEXT is expanded from... + -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:470: AM_GLIB_GNU_GETTEXT is expanded from... + -configure.ac:266: the top level]) + + and then configure fails with: + + configure.ac:2621: error: `po/stamp-it' is already registered with AC_CONFIG_COMMANDS. + autoconf-2.71/lib/autoconf/status.m4:1008: AC_CONFIG_COMMANDS is expanded from... + configure.ac:2621: the top level + +* add AM_GNU_GETTEXT_VERSION as well to resolve warning with autoconf-2.71 + configure.ac: warning: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + ABOUT-NLS | 1 + + Makefile.am | 6 +--- + configure.ac | 6 ++-- + pidgin/Makefile.am | 7 ++-- + po/Makevars | 82 ++++++++++++++++++++++++++++++++++++++++++++++ + po/POTFILES.in | 1 - + 6 files changed, 92 insertions(+), 11 deletions(-) + create mode 100644 ABOUT-NLS + create mode 100644 po/Makevars + +diff --git a/ABOUT-NLS b/ABOUT-NLS +new file mode 100644 +index 0000000..0a9d56d +--- /dev/null ++++ b/ABOUT-NLS +@@ -0,0 +1 @@ ++<https://www.gnu.org/software/gettext/manual/html_node/Users.html> +diff --git a/Makefile.am b/Makefile.am +index f8e2bc9..a74145f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -13,9 +13,6 @@ EXTRA_DIST = \ + fix-casts.sh \ + gaim.pc.in \ + gaim-uninstalled.pc.in \ +- intltool-extract.in \ +- intltool-merge.in \ +- intltool-update.in \ + package_revision.h \ + pidgin.apspec.in \ + pidgin.spec.in \ +@@ -139,5 +136,4 @@ endif + distuninstallcheck_listfiles = \ + find . -type f -print | grep -v perl | grep -v Purple.3pm | grep -v Pidgin.3pm + +-DISTCLEANFILES= intltool-extract intltool-merge intltool-update \ +- package_revision_raw.txt ++DISTCLEANFILES=package_revision_raw.txt +diff --git a/configure.ac b/configure.ac +index 81d8592..e2280cd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -43,7 +43,7 @@ fi + + AC_CANONICAL_HOST + AC_CONFIG_HEADERS([config.h]) +-AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2]) ++AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 foreign]) + dnl TODO: Always use AM_SILENT_RULES when we depend on automake >= 1.11 + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +@@ -257,12 +257,12 @@ dnl ####################################################################### + AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes) + + if test x$enable_i18n = xyes; then +- AC_PROG_INTLTOOL + GETTEXT_PACKAGE=pidgin + AC_SUBST(GETTEXT_PACKAGE) + + ALL_LINGUAS="af am ar ar_SA as ast az be@latin bg bn_IN bn br brx bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN zh_HK zh_TW" +- AM_GLIB_GNU_GETTEXT ++ AM_GNU_GETTEXT([external]) ++ AM_GNU_GETTEXT_VERSION([0.21]) + + dnl If we don't have msgfmt, then po/ is going to fail -- ensure that + dnl AM_GLIB_GNU_GETTEXT found it. +diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am +index 2278b88..4d32c53 100644 +--- a/pidgin/Makefile.am ++++ b/pidgin/Makefile.am +@@ -192,13 +192,16 @@ DESKTOP_FILE=data/pidgin.desktop + appsdir = $(datadir)/applications + apps_in_files = data/pidgin.desktop.in + apps_DATA = $(apps_in_files:.desktop.in=.desktop) +-@INTLTOOL_DESKTOP_RULE@ ++ ++data/pidgin.desktop: data/pidgin.desktop.in ++ $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + + appdatadir = $(datarootdir)/appdata + appdata_DATA = $(appdata_in_files:.xml.in=.xml) + appdata_in_files = data/pidgin.appdata.xml.in + +-@INTLTOOL_XML_RULE@ ++data/pidgin.appdata.xml: data/pidgin.appdata.xml.in ++ $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ || cp $< $@ + + endif # INSTALL_I18N + +diff --git a/po/Makevars b/po/Makevars +new file mode 100644 +index 0000000..970237a +--- /dev/null ++++ b/po/Makevars +@@ -0,0 +1,82 @@ ++# Makefile variables for PO directory in any package using GNU gettext. ++# ++# Copyright (C) 2003-2019 Free Software Foundation, Inc. ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to use, copy, distribute, and modify it. ++ ++# Usually the message domain is the same as the package name. ++DOMAIN = $(PACKAGE) ++ ++# These two variables depend on the location of this directory. ++subdir = po ++top_builddir = .. ++ ++# These options get passed to xgettext. ++XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 ++ ++# This is the copyright holder that gets inserted into the header of the ++# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding ++# package. (Note that the msgstr strings, extracted from the package's ++# sources, belong to the copyright holder of the package.) Translators are ++# expected to transfer the copyright for their translations to this person ++# or entity, or to disclaim their copyright. The empty string stands for ++# the public domain; in this case the translators are expected to disclaim ++# their copyright. ++COPYRIGHT_HOLDER = Free Software Foundation, Inc. ++ ++# This tells whether or not to prepend "GNU " prefix to the package ++# name that gets inserted into the header of the $(DOMAIN).pot file. ++# Possible values are "yes", "no", or empty. If it is empty, try to ++# detect it automatically by scanning the files in $(top_srcdir) for ++# "GNU packagename" string. ++PACKAGE_GNU = ++ ++# This is the email address or URL to which the translators shall report ++# bugs in the untranslated strings: ++# - Strings which are not entire sentences, see the maintainer guidelines ++# in the GNU gettext documentation, section 'Preparing Strings'. ++# - Strings which use unclear terms or require additional context to be ++# understood. ++# - Strings which make invalid assumptions about notation of date, time or ++# money. ++# - Pluralisation problems. ++# - Incorrect English spelling. ++# - Incorrect formatting. ++# It can be your email address, or a mailing list address where translators ++# can write to without being subscribed, or the URL of a web page through ++# which the translators can contact you. ++MSGID_BUGS_ADDRESS = ++ ++# This is the list of locale categories, beyond LC_MESSAGES, for which the ++# message catalogs shall be used. It is usually empty. ++EXTRA_LOCALE_CATEGORIES = ++ ++# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' ++# context. Possible values are "yes" and "no". Set this to yes if the ++# package uses functions taking also a message context, like pgettext(), or ++# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. ++USE_MSGCTXT = no ++ ++# These options get passed to msgmerge. ++# Useful options are in particular: ++# --previous to keep previous msgids of translated messages, ++# --quiet to reduce the verbosity. ++MSGMERGE_OPTIONS = ++ ++# These options get passed to msginit. ++# If you want to disable line wrapping when writing PO files, add ++# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and ++# MSGINIT_OPTIONS. ++MSGINIT_OPTIONS = ++ ++# This tells whether or not to regenerate a PO file when $(DOMAIN).pot ++# has changed. Possible values are "yes" and "no". Set this to no if ++# the POT file is checked in the repository and the version control ++# program ignores timestamps. ++PO_DEPENDS_ON_POT = no ++ ++# This tells whether or not to forcibly update $(DOMAIN).pot and ++# regenerate PO files on "make dist". Possible values are "yes" and ++# "no". Set this to no if the POT file and PO files are maintained ++# externally. ++DIST_DEPENDS_ON_UPDATE_PO = no +diff --git a/po/POTFILES.in b/po/POTFILES.in +index a5691a1..b494bf3 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -1,4 +1,3 @@ +-[encoding: UTF-8] + finch/finch.c + finch/gntaccount.c + finch/gntblist.c diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch new file mode 100644 index 000000000..99c523d5d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch @@ -0,0 +1,49 @@ +From 861c8a63c36f9ee7d46238c9bc13a2c1f14372c3 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 7 Feb 2021 14:35:14 +0000 +Subject: [PATCH] configure.ac: disable few languages not compatible with + modern gettext + +* as pidgin-3 development is moving to meson and probably + most of these changes won't be applicable there, lets just + disable them until someone interested steps-up to maintain it + +* these 3 fail with: +cd ../../pidgin-2.14.1/po && rm -f brx.gmo && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgmerge --for-msgfmt -o brx.1po brx.po pidgin.pot && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt -c --statistics --verbose -o brx.gmo brx.1po && rm -f brx.1po +cd ../../pidgin-2.14.1/po && rm -f zh_HK.gmo && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgmerge --for-msgfmt -o zh_HK.1po zh_HK.po pidgin.pot && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt -c --statistics --verbose -o zh_HK.gmo zh_HK.1po && rm -f zh_HK.1po +cd ../../pidgin-2.14.1/po && rm -f zh_TW.gmo && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgmerge --for-msgfmt -o zh_TW.1po zh_TW.po pidgin.pot && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt -c --statistics --verbose -o zh_TW.gmo zh_TW.1po && rm -f zh_TW.1po +zh_HK.1po:2790: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications. +pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt: found 1 fatal error +zh_TW.1po:2790: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications. +pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt: found 1 fatal error +zh_HK.1po: 3234 translated messages. +make[3]: *** [Makefile:415: ../../pidgin-2.14.1/po/zh_HK.gmo] Error 1 +make[3]: *** Waiting for unfinished jobs.... +zh_TW.1po: 3234 translated messages. +make[3]: *** [Makefile:415: ../../pidgin-2.14.1/po/zh_TW.gmo] Error 1 +brx.1po:778: number of format specifications in 'msgid' and 'msgstr' does not match +brx.1po:3179: number of format specifications in 'msgid' and 'msgstr' does not match +brx.1po:5175: format specifications in 'msgid_plural' and 'msgstr[0]' for argument 1 are not the same +brx.1po:5184: format specifications in 'msgid_plural' and 'msgstr[0]' for argument 1 are not the same +brx.1po:7754: format specifications in 'msgid_plural' and 'msgstr[0]' for argument 1 are not the same +pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt: found 8 fatal errors +brx.1po: 3246 translated messages. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e2280cd..9332932 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -260,7 +260,7 @@ if test x$enable_i18n = xyes; then + GETTEXT_PACKAGE=pidgin + AC_SUBST(GETTEXT_PACKAGE) + +- ALL_LINGUAS="af am ar ar_SA as ast az be@latin bg bn_IN bn br brx bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN zh_HK zh_TW" ++ ALL_LINGUAS="af am ar ar_SA as ast az be@latin bg bn_IN bn br bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN" + AM_GNU_GETTEXT([external]) + AM_GNU_GETTEXT_VERSION([0.21]) + diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch deleted file mode 100644 index 312fc8593..000000000 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 855cc20bafa30597ae7a62f7672d42654b25cde0 Mon Sep 17 00:00:00 2001 -From: Herrie <github.com@herrie.org> -Date: Mon, 24 Jul 2017 21:30:16 +0200 -Subject: [PATCH] Use pkg-config instead of ${PYTHON}-config to find python - ---- - configure.ac | 21 ++++++++------------- - 1 file changed, 8 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d20a18e..c741829 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1567,20 +1567,15 @@ AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes") - dnl Check for Python headers (currently useful only for libgnt) - dnl (Thanks to XChat) - if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then -- AC_MSG_CHECKING(for Python compile flags) -- if test -f ${PYTHON}-config; then -- PY_CFLAGS=`${PYTHON}-config --includes` -- PY_LIBS=`${PYTHON}-config --libs` -- AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.]) -- AC_MSG_RESULT(ok) -- else -- AC_MSG_RESULT([Cannot find ${PYTHON}-config]) -- PY_CFLAGS="" -- PY_LIBS="" -- fi -+ AC_MSG_CHECKING(for Python compile flags) -+ PKG_CHECK_MODULES(PY, python, [ -+ AC_SUBST(PY_CFLAGS) -+ AC_SUBST(PY_LIBS) -+ ], [ -+ AC_MSG_RESULT(no) -+ AC_MSG_ERROR([Can't find python]) -+ ]) - fi --AC_SUBST(PY_CFLAGS) --AC_SUBST(PY_LIBS) - - dnl ####################################################################### - dnl # Check for Mono support diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch deleted file mode 100644 index c7b4163cb..000000000 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1488,7 +1488,7 @@ AC_ARG_WITH([python], - - if test "x$enable_dbus" = "xyes" || test "x$enable_consoleui" = "xyes" ; then - if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then -- AC_PATH_PROG([PYTHON], [python], [no]) -+ AC_PATH_PROG([PYTHON], [python3], [no]) - fi - - if test x"$PYTHON" = x"no" ; then -@@ -1568,7 +1568,7 @@ dnl Check for Python headers (currently - dnl (Thanks to XChat) - if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then - AC_MSG_CHECKING(for Python compile flags) -- PKG_CHECK_MODULES(PY, python, [ -+ PKG_CHECK_MODULES(PY, python3, [ - AC_SUBST(PY_CFLAGS) - AC_SUBST(PY_LIBS) - ], [ diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.1.bb index fdc79e81b..d22380eb0 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.1.bb @@ -1,4 +1,5 @@ SUMMARY = "multi-protocol instant messaging client" + SECTION = "x11/network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" @@ -10,12 +11,11 @@ SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://sanitize-configure.ac.patch \ file://purple-OE-branding-25.patch \ - file://pidgin-cross-python-265.patch \ - file://use_py3.patch \ + file://0001-configure.ac-fix-build-with-autoconf-2.71.patch \ + file://0002-configure.ac-disable-few-languages-not-compatible-wi.patch \ " -SRC_URI[md5sum] = "423403494fe1951e47cc75231f743bb0" -SRC_URI[sha256sum] = "2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f" +SRC_URI[sha256sum] = "f132e18d551117d9e46acce29ba4f40892a86746c366999166a3862b51060780" PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ @@ -34,13 +34,14 @@ PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn" PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+" PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,ncurses" +PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,libgnt" PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR} --with-gnutls-libs=${STAGING_LIBDIR},--disable-gnutls,gnutls,libpurple-plugin-ssl-gnutls" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" PACKAGECONFIG[nss] = "--enable-nss,--disable-nss,nss nspr,libpurple-plugin-ssl-nss" EXTRA_OECONF = " \ + --with-python=python3 \ --disable-perl \ --disable-tcl \ --disable-gevolution \ @@ -51,17 +52,12 @@ EXTRA_OECONF = " \ --disable-screensaver \ " -do_configure_prepend() { - touch ${S}/po/Makefile - sed -i "s#PY_VERSION=`$PYTHON -c 'import sys ; print sys.version[0:3]'`#PY_VERSION=${PYTHON_BASEVERSION}#g" ${S}/configure.ac -} - OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" OE_LT_RPATH_ALLOW[export]="1" -PACKAGES =+ "libpurple-dev libpurple libgnt libgnt-dev finch finch-dev ${PN}-data" +PACKAGES =+ "libpurple-dev libpurple finch finch-dev ${PN}-data" -RPROVIDES_${PN}-dbg += "libpurple-dbg libgnt-dbg finch-dbg" +RPROVIDES_${PN}-dbg += "libpurple-dbg finch-dbg" LEAD_SONAME = "libpurple.so.0" FILES_libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple* ${datadir}/purple/ca-certs" @@ -72,8 +68,6 @@ FILES_libpurple-dev = "${libdir}/libpurple*.la \ ${libdir}/purple-2/liboscar.so \ ${libdir}/purple-2/libymsg.so \ ${datadir}/aclocal" -FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" -FILES_libgnt-dev = "${libdir}/gnt/*.la" FILES_finch = "${bindir}/finch" FILES_finch-dev = "${libdir}/finch/*.la" 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.02.0.bb index 4d4c310a4..c85fbf2af 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.01.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.02.0.bb @@ -7,7 +7,7 @@ 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" +SRC_URI[sha256sum] = "5c14759c99891e6e472aced6d5f0ff1dacf85d80cd9026d365c55c653edf792c" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" 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.11.bb index ef36fddcb..215c04a22 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.11.bb @@ -9,8 +9,8 @@ DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi libsodium libss DEPENDS_append_libc-musl = " libexecinfo" LDFLAGS_append_libc-musl = " -lexecinfo" -SRCREV = "9d1dbdf2d648644e0de9590c6291d7e7b72a1473" -SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https \ +SRCREV = "6a8737111adebf571c46f35599cc62e7f7b0bd65" +SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=rel/v1.4.11 \ " PV .= "+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb b/meta-openembedded/meta-oe/recipes-support/stm32flash/stm32flash_0.6.bb index 854df06cb..195c0f5c2 100644 --- a/meta-openembedded/meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/stm32flash/stm32flash_0.6.bb @@ -4,13 +4,10 @@ BUGTRACKER = "https://sourceforge.net/p/stm32flash/tickets/" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" -S = "${WORKDIR}/${BPN}" - SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" do_install() { oe_runmake install DESTDIR=${D} PREFIX=${prefix} } -SRC_URI[md5sum] = "40f673502949f3bb655d2bcc539d7b6a" -SRC_URI[sha256sum] = "97aa9422ef02e82f7da9039329e21a437decf972cb3919ad817f70ac9a49e306" +SRC_URI[sha256sum] = "ee9b40d4d3e5cd28b993e08ae2a2c3c559b6bea8730cd7e1d40727dedb1dda09" 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 dae912252..a33aa2c96 100644 --- a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb @@ -10,8 +10,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef" 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 \ + file://0001-qt-Create-subdir-in-Makefile.patch \ + file://0002-zbarcam-Create-subdir-in-Makefile.patch \ " SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37" @@ -21,15 +21,15 @@ PV = "0.23.1+git${SRCPV}" DEPENDS += "xmlto-native" PACKAGECONFIG ??= "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ " PACKAGECONFIG ??= "video python3" 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)} + ${@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, libxv" PACKAGECONFIG[video] = "--enable-video, --disable-video, v4l-utils libv4l" @@ -40,20 +40,19 @@ PACKAGECONFIG[qt5] = "--with-qt5, --without-qt5, qtbase qtbase-native qtx11extra PACKAGECONFIG[imagemagick] = "--with-imagemagick, --without-imagemagick, imagemagick" FILES_${PN} += "${bindir} \ - ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ + ${@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)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ + -I${STAGING_INCDIR}/QtX11Extras \ + -I${STAGING_INCDIR}/dbus-1.0 \ + -I${STAGING_LIBDIR}/dbus-1.0/include \ + ', '', d)} \ " TARGET_CXXFLAGS_append = " -fPIC" -do_prepare_recipe_sysroot_gettext() { - install -m 755 ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${S}/ +do_configure_prepend() { + 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-support/zchunk/zchunk_1.1.8.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb index ee2d8801e..ab7b71ef7 100644 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f" SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https" -SRCREV = "5715157da35898a7cb3293b7a5394ba23715b5a4" +SRCREV = "fe3e3af49fd30b68c21a9fcaac340ad8e7f91055" S = "${WORKDIR}/git" DEPENDS = "\ diff --git a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.9.2.bb b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.4.bb index 57fc935f7..21004726a 100644 --- a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.13.4.bb @@ -5,8 +5,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/catchorg/Catch2.git" -SRCREV = "2c869e17e4803d30b3d5ca5b0d76387b9db97fa5" +SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x" +SRCREV = "de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-perl/recipes-perl/libauthen/libauthen-sasl-perl_2.16.bb b/meta-openembedded/meta-perl/recipes-perl/libauthen/libauthen-sasl-perl_2.16.bb index e658a5ff1..c75deb0c3 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libauthen/libauthen-sasl-perl_2.16.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libauthen/libauthen-sasl-perl_2.16.bb @@ -21,6 +21,8 @@ S = "${WORKDIR}/Authen-SASL-${PV}" inherit cpan ptest +export PERL_USE_UNSAFE_INC = "1" + do_install_ptest () { cp -r ${B}/t ${D}${PTEST_PATH} } diff --git a/meta-openembedded/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb b/meta-openembedded/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb index 25e01fac0..38598e2b4 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb @@ -12,7 +12,7 @@ SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ -file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d" +file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" SRC_URI = "${CPAN_MIRROR}/authors/id/R/RE/REHSACK/Config-AutoConf-${PV}.tar.gz" diff --git a/meta-openembedded/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb b/meta-openembedded/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb index 3678ad762..415652c1e 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb @@ -9,7 +9,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" HOMEPAGE= "https://metacpan.org/release/File-Slurper" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ -file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d" +file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/File-Slurper-${PV}.tar.gz" diff --git a/meta-openembedded/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb b/meta-openembedded/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb index 56dc19c85..569ac696f 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb @@ -21,6 +21,8 @@ S = "${WORKDIR}/HTML-Tree-${PV}" inherit cpan_build +export PERL_USE_UNSAFE_INC = "1" + DEPENDS += "libmodule-build-perl-native \ " diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.67.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.68.bb index 57b5fbf89..595160744 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.67.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.68.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://README;beginline=3;endline=5;md5=4d6588c2fa0d38ae162f SRC_URI = "${CPAN_MIRROR}/authors/id/M/MA/MARSCHAP/perl-ldap-${PV}.tar.gz" -SRC_URI[md5sum] = "a949a2bab07b44cc043b965485fe493a" -SRC_URI[sha256sum] = "19a2f7f7959fe23d16367475772c325109f8604d2949e34b96dddb2dfa031170" +SRC_URI[md5sum] = "d091ed00302f0276069bca9df9478744" +SRC_URI[sha256sum] = "e2f389fe3e7a9e4b61488692919ad723b98f3b479b5288f610daa8c27995b351" S = "${WORKDIR}/perl-ldap-${PV}" 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.002004.bb index 531e77a10..db8646d7c 100644 --- 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.002004.bb @@ -9,8 +9,8 @@ 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" +SRC_URI[md5sum] = "9ee45591befa3d0b1094ac75d282b6ba" +SRC_URI[sha256sum] = "d7bdee9e138a4f83aa52d0a981625644bda87ff16642dfa845dcb44d9a242b45" S = "${WORKDIR}/Role-Tiny-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb b/meta-openembedded/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb index a1bb4a399..c0113b4fd 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb @@ -24,8 +24,8 @@ RDEPENDS_${PN} += "\ SRC_URI = "${CPAN_MIRROR}/authors/id/R/RE/REHSACK/Unix-Statgrab-${PV}.tar.gz" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ - file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d \ - file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61 \ + file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \ " SRC_URI[md5sum] = "a6bc06b3f7749f7d77a2b1bd13402821" diff --git a/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb b/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb index f2dda194d..7cd07b2c0 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb @@ -15,7 +15,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" HOMEPAGE= "https://metacpan.org/release/Test-Warnings" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ -file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d" +file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" SRC_URI = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Test-Warnings-${PV}.tar.gz" diff --git a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/80oe.conf.in b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/80oe.conf.in deleted file mode 100644 index 4503da422..000000000 --- a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/80oe.conf.in +++ /dev/null @@ -1,24 +0,0 @@ -// Some custom Gate One settings for OpenEmbedded -{ - "*": { - "gateone": { // These settings apply to all of Gate One - "log_file_prefix": "@localstate@/log/gateone.log", // default would be /var/log/gateone/gateone.log - "log_file_max_size": 5242880, // 5 megabyte logs for OE by default (default would normally be 100Mb) - "log_file_num_backups": 2, // Default is normally 10 - "origins": ["*"], // Every device has a unique origin - "logging": "info", - "pid_file": "/run/gateone.pid", - "session_dir": "/tmp/gateone", - "user_dir": "@localstate@/lib/gateone/users" - }, - "terminal": { - // Disabling session logging for embedded devices is a good idea (limited/slow storage) - "session_logging": false, - "syslog_session_logging": false -// "commands": { -// // For some reason this doesn't work (never asks for the password) -// "login": "setsid /bin/login" // Normally this would emulate logging into the host console -// } - } - } -} diff --git a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-avahi.service b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-avahi.service deleted file mode 100644 index 0f613d18e..000000000 --- a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-avahi.service +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" standalone='no'?><!--*-nxml-*--> -<!DOCTYPE service-group SYSTEM "avahi-service.dtd"> - -<service-group> - <name replace-wildcards="yes">GateOne on %h</name> - <service> - <type>_https._tcp</type> - <port>443</port> - </service> -</service-group> diff --git a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-init.in b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-init.in deleted file mode 100644 index 86d655c94..000000000 --- a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-init.in +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -e -### BEGIN INIT INFO -# Provides: gateone -# Required-Start: networking -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Gateone HTML5 ssh client -# Description: Gateone HTML5 terminal emulator and SSH client. -### END INIT INFO - -. /etc/init.d/functions - -NAME=gateone -DAEMON=@bindir@/gateone -PIDFILE=/run/gateone.pid -WORKDIR=@localstate@/lib/gateone - -do_start() { - cd $WORKDIR - @bindir@/python $DAEMON > /dev/null 2>&1 & - cd $OLDPWD -} - -do_stop() { - kill -TERM `cat $PIDFILE` -} - -case "$1" in - start) - echo "Starting gateone" - do_start - ;; - stop) - echo "Stopping gateone" - do_stop - ;; - restart|force-reload) - echo "Restart gateone" - do_stop - sleep 1 - do_start - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac diff --git a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone.service.in b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone.service.in deleted file mode 100644 index 44667275a..000000000 --- a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone.service.in +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=GateOne daemon -ConditionPathExists=|@localstate@/lib/gateone - -[Service] -WorkingDirectory=@localstate@/lib/gateone -ExecStart=@bindir@/python @bindir@/gateone - -[Install] -WantedBy=multi-user.target 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 8b267c9cb..635dee194 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 @@ -170,6 +170,7 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-imageio \ python3-incremental \ python3-inflection \ + python3-intelhex \ python3-intervals \ python3-ipaddress \ python3-ipy \ @@ -288,6 +289,7 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-pycrypto \ python3-pycurl \ python3-pydbus \ + python3-pydbus-manager \ python3-pydicti \ python3-pyephem \ python3-pyexpect \ 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 d4e144a61..61aeaca5f 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,4 +1,4 @@ -From b394003d31a7187767b7d6cc7b871968d2674be9 Mon Sep 17 00:00:00 2001 +From efae4e08d13e0958d929ea524e21c0a210b31982 Mon Sep 17 00:00:00 2001 From: Leon Anavi <leon.anavi@konsulko.com> Date: Fri, 22 Jan 2021 11:41:12 +0200 Subject: [PATCH] setup.py: Adjust _add_rpath @@ -8,15 +8,16 @@ Fix error: unrecognized command-line option '-R' Upstream-Status: Inappropriate [oe specific] Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> + --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py -index 22f582d..2d28655 100755 +index b634d94..7f6a2f1 100755 --- a/setup.py +++ b/setup.py -@@ -231,9 +231,6 @@ def _add_rpath(settings, path): +@@ -235,9 +235,6 @@ def _add_rpath(settings, path): """ if sys.platform == 'darwin': settings['extra_link_args'].extend(['-Wl,-rpath', '-Wl,%s' % path]) @@ -24,8 +25,5 @@ index 22f582d..2d28655 100755 - settings['runtime_library_dirs'].append(path) - - def settings_from_prefix(prefix=None, bundle_libzmq_dylib=False): + def settings_from_prefix(prefix=None): """load appropriate library/include settings from ZMQ prefix""" --- -2.17.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.4.2.bb index de336af22..05afed8b6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.4.2.bb @@ -1,9 +1,9 @@ SUMMARY = "jinja2 template renderer for aiohttp.web (http server for asyncio)" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c82758543767c96574b6e29fc478fb73" +LIC_FILES_CHKSUM = "file://LICENSE;md5=29dca541e03964615590ca7b50392d97" -SRC_URI[sha256sum] = "2dfe29cfd278d07cd0a851afb98471bc8ce2a830968443e40d67636f3c035d79" +SRC_URI[sha256sum] = "9c22a0e48e3b277fc145c67dd8c3b8f609dab36bce9eb337f70dfe716663c9a0" inherit pypi setuptools3 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.4.bb index bccbd4b0e..63d678389 100644 --- 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.4.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3bf3d48554bdca1ea7fdb48de378c2ca" -SRC_URI[sha256sum] = "9c1a81af067e72261c9cbe33ea792893e83bc6aa987bfbd6fdc1e5e7b22777c4" +SRC_URI[sha256sum] = "5d84ecc73141d0a0d61ece0742bb7ff5751b0657dab8405f899d3ceb104cc7de" PYPI_PACKAGE = "aiohttp" inherit setuptools3 pypi @@ -18,5 +18,6 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-misc \ ${PYTHON_PN}-multidict \ ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-typing-extensions \ ${PYTHON_PN}-yarl \ " 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.5.bb index 9e30cc131..92b691e17 100644 --- 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.5.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c4ece55266dcdd02ce165b1ee0e490bb" inherit pypi setuptools3 -SRC_URI[sha256sum] = "a4de8d3525a95a96d59342e14b95cab5956c25b0907dce1549bb4e3e7958f4c2" +SRC_URI[sha256sum] = "df0028c19275a2cff137e39617a39cdcdbd1173733b87b6bfa257b7c0860213b" PYPI_PACKAGE = "alembic" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.5.bb index 677cec7ac..f69d85015 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.5.bb @@ -4,8 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI[md5sum] = "b54e1325995d3a9abd84bac91d4d5867" -SRC_URI[sha256sum] = "2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703" +SRC_URI[sha256sum] = "b31c92f545517dcc452f284bc9c044050862fbe6d93d2b3de4a215a6b384bf0d" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_21.2.2.bb index 90958dff5..cc3773fc5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.12.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_21.2.2.bb @@ -3,8 +3,7 @@ HOMEPAGE = "http://crossbar.io/autobahn" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" -SRC_URI[md5sum] = "0a465e218d904f63537092b155489468" -SRC_URI[sha256sum] = "410a93e0e29882c8b5d5ab05d220b07609b886ef5f23c0b8d39153254ffd6895" +SRC_URI[sha256sum] = "bf7a9d302a34d0f719d43c57f65ca1f2f5c982dd6ea0c11e1e190ef6f43710fe" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.9.bb index f763067cf..5408c5aa8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.9.bb @@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "\ file://AWSIoTPythonSDK/core/protocol/paho/client.py;endline=14;md5=5a3c8a1a4bb71bd934f450ecff972ad9 \ " -SRC_URI[md5sum] = "d05596f02774ea39517765c5dced874a" -SRC_URI[sha256sum] = "bcd68cb7fdb044dbd5e5d3a02c311b25717c0376168e7c992982130f19c51b03" +SRC_URI[sha256sum] = "84b440c5929f33da1cd204f3ad0ea891e208637dd63de9fb039ed7d49d78c303" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_36.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_36.2.0.bb index b2f3fd6d8..632175cc4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_36.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_36.2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/cantools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "3c4c2652907c48e7013f825cc3068b5d47a38b62f01bd04aaab1d9f69a8f53f5" +SRC_URI[sha256sum] = "31bcdd56cbb5e26decab42f0624c8cead9b94991f6ee922512b0acd6ae7d6da2" PYPI_PACKAGE = "cantools" 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.5.bb index 45962c6ce..16928f0db 100644 --- 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.5.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" DEPENDS += "libffi ${PYTHON_PN}-pycparser" -SRC_URI[sha256sum] = "1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c" +SRC_URI[sha256sum] = "fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.5.0.bb index dfe493bd2..18c7a6699 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.5.0.bb @@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -SRC_URI[md5sum] = "520afccc1d46f833d117a23fab76ed8f" -SRC_URI[sha256sum] = "e59fa932418603af4e046a96c8985812b05af8a73bfd9d7a386cd1b02c6ab687" +SRC_URI[sha256sum] = "701a8c9975c4abc45e5d13906ab149f959f812869106347323a3f89ac0e82a62" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.3.bb index 54841c243..aac58de37 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.2.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.3.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/bw2/ConfigArgParse" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=da746463714cc35999ed9a42339f2943" -SRC_URI[md5sum] = "8978866babc7ff0994f691ebe48b5aba" -SRC_URI[sha256sum] = "edd17be986d5c1ba2e307150b8e5f5107aba125f3574dddd02c85d5cdcfd37dc" +SRC_URI[sha256sum] = "0428b975ab6c48bb101ccb732e1b5cb616296e28268e032aa806f32b647a1cc1" PYPI_PACKAGE = "ConfigArgParse" @@ -19,4 +18,3 @@ RDEPENDS_${PN} += "\ " BBCLASSEXTEND = "native nativesdk" - 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.6.bb index bfe1f1d4c..d3b6fa1f4 100644 --- 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.6.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=b8ee59850b882cbf623188489ea748e2" PYPI_PACKAGE = "croniter" -SRC_URI[sha256sum] = "12f9fd52e7cfb623d0788956d137a3de26e5583a25820fa7710fb6b58d32b213" +SRC_URI[sha256sum] = "e79bcc9681d2345e71360241aebe19ed6c5475fec40cc59a7998fe1a2ca568d0" inherit pypi setuptools3 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.4.6.bb index bcdbc6adb..b5f34daef 100644 --- 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.4.6.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0 | BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" -SRC_URI[sha256sum] = "03789c305dda8dccb4b8c9c019963a742469d88365abbc82e8e898ac478f5ca4" +SRC_URI[sha256sum] = "e5f88a5fb03d60b4f20eed4920638b6a3ed32a363523a77086528d557a2c2da8" PYPI_PACKAGE = "cryptography_vectors" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cvxopt_1.2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cvxopt_1.2.6.bb index ef06b5602..360df6a3e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cvxopt_1.2.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cvxopt_1.2.6.bb @@ -1,11 +1,11 @@ SUMMARY = "Convex optimization package" HOMEPAGE = "http://cvxopt.org" LICENSE = "GPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4905701d14049b3f8e4774c290aeee21" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ba1a8a73d8ebea5c47a1173aaf476ddd" SRC_URI = "git://github.com/cvxopt/cvxopt;protocol=https" -SRCREV = "5b59d87007bf6fdea464e14875543b35255b84b2" +SRCREV = "60fdb838e0bb2d8f32ba51129552c83b55acd2a7" S = "${WORKDIR}/git" 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.4.bb index f47f15222..10aa17d38 100644 --- 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.4.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" -SRC_URI[md5sum] = "887f60e9c4fb9b0804a38372b2798101" -SRC_URI[sha256sum] = "23e1fed8d196d9a6cc4d220ef11fbe7eb8cff3a27848621c447e9d96134b2085" +SRC_URI[sha256sum] = "326643aca7beff0864d022cd591736b8550a70fccafd67a89198166baed1c2c4" PYPI_PACKAGE = "elementpath" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.6.0.bb index 54fa1dd97..810f0eb27 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.5.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.6.0.bb @@ -2,8 +2,7 @@ DESCRIPTION = "SQLAlchemy database migrations for Flask applications using Alemb LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b69377f79f3f48c661701236d5a6a85" -SRC_URI[md5sum] = "707d4a5fd4e11d3113a1228aa7793176" -SRC_URI[sha256sum] = "a69d508c2e09d289f6e55a417b3b8c7bfe70e640f53d2d9deb0d056a384f37ee" +SRC_URI[sha256sum] = "8626af845e6071ef80c70b0dc16d373f761c981f0ad61bb143a529cab649e725" PYPI_PACKAGE = "Flask-Migrate" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_4.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.0.1.bb index b8631bf50..4c5d0a3fb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_4.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.0.1.bb @@ -9,8 +9,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "Flask-SocketIO" -SRC_URI[md5sum] = "d7992b0b4aaf473b7eff21fc14e8d1b2" -SRC_URI[sha256sum] = "36c1d5765010d1f4e4f05b4cc9c20c289d9dc70698c88d1addd0afcfedc5b062" +SRC_URI[sha256sum] = "5c4319f5214ada20807857dc8fdf3dc7d2afe8d6dd38f5c516c72e2be47d2227" RDEPENDS_${PN} += "\ ${PYTHON_PN}-flask \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_20.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_21.1.2.bb index 06c45f2ed..5edd96b34 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_20.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_21.1.2.bb @@ -20,8 +20,7 @@ SRC_URI_append = " \ file://libev-conf.patch;patch=1;pnum=1 \ " -SRC_URI[md5sum] = "9366ee7eebed48003f8a748568ef1f70" -SRC_URI[sha256sum] = "5f6d48051d336561ec08995431ee4d265ac723a64bba99cc58c3eb1a4d4f5c8d" +SRC_URI[sha256sum] = "520cc2a029a9eef436e4e56b007af7859315cafa21937d43c1d5269f12f2c981" # The python-gevent has no autoreconf ability # and the logic for detecting a cross compile is flawed diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.16.bb index 0de4c8f40..1af657098 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.16.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://graphviz.readthedocs.io/en/stable/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f7831c564aeff14e68aa4ff7a93dc89f" -SRC_URI[md5sum] = "7123efabb68270f579525df74bf8b0c9" -SRC_URI[sha256sum] = "92b7637ece63c77e3d39221ae1f4df98e9256cb449e9860c598335b34496d195" +SRC_URI[sha256sum] = "d2d25af1c199cad567ce4806f0449cb74eb30cf451fd7597251e1da099ac6e57" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenstalk_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenstalk_2.0.0.bb index 9447c1836..9af5a0b4e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenstalk_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenstalk_2.0.0.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/mayhewj/greenstalk" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=8f98432ba1fce3933c556430fd47298f" -SRC_URI[md5sum] = "3374649586a8016fecaf0ce5ecf9985d" -SRC_URI[sha256sum] = "0c9f2af79ac8ea526891ae8d7e9500341a0f657465a541d6eaedb35ff70f4fe3" +SRC_URI[sha256sum] = "0020970abdb6f400586938573cbbec80410e83805d61e46cf76ea3ed71129257" RDEPENDS_${PN} += "python3-io python3-core" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch new file mode 100644 index 000000000..aef67b574 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -0,0 +1,58 @@ +From 9b2f1d400db8b8d0045f5a58a748a2dc52b5c9ef Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 17 Feb 2021 13:38:55 -0800 +Subject: [PATCH] setup.py: Do not mix C and C++ compiler options + +EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX +so using -std=c++11 or -std=gnu99 together will cause +build time errors espcially with clang + +Keep '-std=c++11' to fix native build error +with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang +we will remove them through GRPC_PYTHON_CFLAGS at do_compile +in bb recipe. + +While export CC="gcc ", cc_args is None, it will +cause subprocess.Popen always return 1. On centos 8, if you don't +install package libatomic, there will be a native build error +`cannot find /usr/lib64/libatomic.so.1.2.0'. + +Add no harm '-g' to cc_args if cc_args is empty. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + setup.py | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index a316038..70aa174 100644 +--- a/setup.py ++++ b/setup.py +@@ -76,8 +76,11 @@ def check_linker_need_libatomic(): + """Test if linker on system needs libatomic.""" + code_test = (b'#include <atomic>\n' + + b'int main() { return std::atomic<int64_t>{}; }') +- cxx = os.environ.get('CXX', 'c++') +- cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'], ++ cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++' ++ if not cxx_args: ++ cxx_args = "-g" ++ ++ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'], + stdin=PIPE, + stdout=PIPE, + stderr=PIPE) +@@ -87,7 +90,7 @@ def check_linker_need_libatomic(): + # Double-check to see if -latomic actually can solve the problem. + # https://github.com/grpc/grpc/issues/22491 + cpp_test = subprocess.Popen( +- [cxx, '-x', 'c++', '-std=c++11', '-latomic', '-'], ++ [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-latomic', '-'], + stdin=PIPE, + stdout=PIPE, + stderr=PIPE) +-- +2.30.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.14.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.14.1.bb deleted file mode 100644 index 2da1a4df0..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.14.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-grpcio-tools.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools.inc b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.35.0.bb index 6675f904c..12b00cfa3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.35.0.bb @@ -2,15 +2,17 @@ DESCRIPTION = "Google gRPC tools" HOMEPAGE = "http://www.grpc.io/" SECTION = "devel/python" -DEPENDS_append = " ${PYTHON_PN}-grpcio" -RDEPENDS_${PN} = "${PYTHON_PN}-grpcio" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" -inherit pypi +inherit pypi setuptools3 + +DEPENDS += "${PYTHON_PN}-grpcio" -SRC_URI[md5sum] = "b2fabfb54c7824c1e49a02de2aa6628e" -SRC_URI[sha256sum] = "4ce5aa660d7884f23aac1eafa93b97a4c3e2b512edff871e91fdb6ee86ebd5ea" +SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" + +SRC_URI[sha256sum] = "9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf" + +RDEPENDS_${PN} = "${PYTHON_PN}-grpcio" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch deleted file mode 100644 index 920fc1169..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 04e28fdda03b545a0f7b446a784ec2fa7249cbb8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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(+) - ---- a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h -+++ b/third_party/abseil-cpp/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 <sys/types.h> - #ifdef __BIONIC__ - #include <sys/syscall.h> -@@ -72,6 +76,7 @@ inline void* DirectMmap(void* start, siz - #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; ---- a/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc -+++ b/third_party/abseil-cpp/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 <linux/futex.h> - #include <sys/syscall.h> - #include <unistd.h> ---- a/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc -+++ b/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc -@@ -24,6 +24,10 @@ - #include <unistd.h> - #endif - -+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 -+# define __NR_futex __NR_futex_time64 -+#endif -+ - #ifdef __linux__ - #include <linux/futex.h> - #include <sys/syscall.h> diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index bff50a0a1..373669461 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -1,26 +1,18 @@ -From 2ef8a85933f3ac36b289979ff9edd49dd12d0d16 Mon Sep 17 00:00:00 2001 +From de10fbc2386dcac3ab810c49b6977b2ee01bf426 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 4 Aug 2017 09:04:07 -0700 +Date: Wed, 17 Feb 2021 13:30:23 -0800 Subject: [PATCH] setup.py: Do not mix C and C++ compiler options EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX so using -std=c++11 or -std=gnu99 together will cause build time errors espcially with clang -error: invalid argument '-std=gnu99' not allowed with 'C++' - -gcc7 ( defaults are -std=gnu11 and -std=gnu++14 ) - as well clang default to these standards mode or newer -anyway - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -1. Keep '-std=c++11' and '-std=gnu99' to fix native build error +Keep '-std=c++11' to fix native build error with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang we will remove them through GRPC_PYTHON_CFLAGS at do_compile in bb recipe. -2. While export CC="gcc ", cc_args is None, it will +While export CC="gcc ", cc_args is None, it will cause subprocess.Popen always return 1. On centos 8, if you don't install package libatomic, there will be a native build error `cannot find /usr/lib64/libatomic.so.1.2.0'. @@ -28,47 +20,57 @@ install package libatomic, there will be a native build error Add no harm '-g' to cc_args if cc_args is empty. Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - setup.py | 6 +++++- + setup.py | 9 ++++++--- src/python/grpcio/commands.py | 5 ++++- - 2 files changed, 9 insertions(+), 2 deletions(-) + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index e950057..1b68221 100644 +index 4b8c9d4..271b7b1 100644 --- a/setup.py +++ b/setup.py -@@ -144,9 +144,13 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get( - - def check_linker_need_libatomic(): - """Test if linker on system needs libatomic.""" -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' -+ if not cc_args: -+ cc_args = "-g" +@@ -172,8 +172,11 @@ def check_linker_need_libatomic(): + """Test if linker on system needs libatomic.""" + code_test = (b'#include <atomic>\n' + + b'int main() { return std::atomic<int64_t>{}; }') +- cxx = os.environ.get('CXX', 'c++') +- cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'], ++ cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++' ++ if not cxx_args: ++ cxx_args = "-g" + - code_test = (b'#include <atomic>\n' + - b'int main() { return std::atomic<int64_t>{}; }') -- cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], -+ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c++', '-std=c++11', '-'], - stdin=PIPE, - stdout=PIPE, - stderr=PIPE) ++ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'], + stdin=PIPE, + stdout=PIPE, + stderr=PIPE) +@@ -183,7 +186,7 @@ def check_linker_need_libatomic(): + # Double-check to see if -latomic actually can solve the problem. + # https://github.com/grpc/grpc/issues/22491 + cpp_test = subprocess.Popen( +- [cxx, '-x', 'c++', '-std=c++11', '-latomic', '-'], ++ [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-latomic', '-'], + stdin=PIPE, + stdout=PIPE, + stderr=PIPE) diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py -index 064dda9..a75d8b9 100644 +index a8b2ff5..b928201 100644 --- a/src/python/grpcio/commands.py +++ b/src/python/grpcio/commands.py -@@ -216,7 +216,10 @@ class BuildExt(build_ext.build_ext): - when invoked in C mode. GCC is okay with this, while clang is not. +@@ -219,7 +219,10 @@ class BuildExt(build_ext.build_ext): """ - # TODO(lidiz) Remove the generated a.out for success tests. -- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' -+ if not cc_args: -+ cc_args = "-g" -+ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'], - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + try: + # TODO(lidiz) Remove the generated a.out for success tests. +- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], ++ cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' ++ if not cc_args: ++ cc_args = "-g" ++ cc_test = subprocess.Popen([cc_test, cc_args, '-x', 'c', '-std=c++11', '-'], + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) -- -2.7.4 +2.30.1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch new file mode 100644 index 000000000..65db4a6ed --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch @@ -0,0 +1,36 @@ +Do not poke at the build machine to determine target platform or architecture +pass it from environment instead for cross compiling to work + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/setup.py ++++ b/setup.py +@@ -109,6 +109,8 @@ CLASSIFIERS = [ + BUILD_WITH_BORING_SSL_ASM = os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', + True) + ++BORING_SSL_PLATFORM = os.environ.get('GRPC_BORING_SSL_PLATFORM', ++ True) + # Environment variable to determine whether or not the Cython extension should + # *use* Cython or use the generated C files. Note that this requires the C files + # to have been generated by building first *with* Cython support. Even if this +@@ -306,15 +308,15 @@ asm_key = '' + if BUILD_WITH_BORING_SSL_ASM and not BUILD_WITH_SYSTEM_OPENSSL: + LINUX_X86_64 = 'linux-x86_64' + LINUX_ARM = 'linux-arm' +- if LINUX_X86_64 == util.get_platform(): ++ if LINUX_X86_64 == BORING_SSL_PLATFORM: + asm_key = 'crypto_linux_x86_64' +- elif LINUX_ARM == util.get_platform(): ++ elif LINUX_ARM == BORING_SSL_PLATFORM: + asm_key = 'crypto_linux_arm' +- elif "mac" in util.get_platform() and "x86_64" in util.get_platform(): ++ elif "mac" in BORING_SSL_PLATFORM and "x86_64" in BORING_SSL_PLATFORM: + asm_key = 'crypto_mac_x86_64' + else: + print("ASM Builds for BoringSSL currently not supported on:", +- util.get_platform()) ++ BORING_SSL_PLATFORM) + if asm_key: + asm_files = grpc_core_dependencies.ASM_SOURCE_FILES[asm_key] + else: diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch index 8ac2aef8c..dadd3da85 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch @@ -3,8 +3,8 @@ Let boringSSL compile on ppc32 bit Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/third_party/boringssl/include/openssl/base.h -+++ b/third_party/boringssl/include/openssl/base.h +--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h ++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h @@ -99,6 +99,9 @@ extern "C" { #elif (defined(__PPC64__) || defined(__powerpc64__)) && defined(_LITTLE_ENDIAN) #define OPENSSL_64_BIT diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch index 8c9ffa21b..7e071ae1e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch @@ -2,8 +2,8 @@ Add RISC-V 64bit support Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/third_party/boringssl/include/openssl/base.h -+++ b/third_party/boringssl/include/openssl/base.h +--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h ++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h @@ -108,6 +108,14 @@ extern "C" { #elif defined(__mips__) && defined(__LP64__) #define OPENSSL_64_BIT diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb index 129bb35bc..2c137f6ce 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb @@ -9,10 +9,9 @@ DEPENDS += "${PYTHON_PN}-protobuf" SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" SRC_URI_append_class-target = " file://ppc-boringssl-support.patch \ file://riscv64_support.patch \ - file://0001-Fix-build-on-riscv32.patch \ + file://boring_ssl.patch \ " -SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98" -SRC_URI[sha256sum] = "a899725d34769a498ecd3be154021c4368dd22bdc69473f6ec46779696f626c4" +SRC_URI[sha256sum] = "7bd0ebbb14dde78bf66a1162efd29d3393e4e943952e2f339757aa48a184645c" RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ @@ -24,9 +23,18 @@ inherit pypi export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" -do_compile_prepend_toolchain-clang() { - export GRPC_PYTHON_CFLAGS='-fvisibility=hidden -fno-wrapv -fno-exceptions' -} +BORING_SSL_PLATFORM_arm = "linux-arm" +BORING_SSL_PLATFORM_x86-64 = "linux-x86_64" +BORING_SSL_PLATFORM ?= "unsupported" +export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}" + +BORING_SSL_x86-64 = "1" +BORING_SSL_arm = "1" +BORING_SSL ?= "0" +export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}" + +GRPC_CFLAGS_append_toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" +export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch deleted file mode 100644 index 8c0b91432..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 364fd0906efa349ea44a761820408dcf6b2b8726 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 29 Jan 2019 17:08:32 +0800 -Subject: [PATCH] cross compiling support - -Remove useless dirs - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> ---- - setup_build.py | 4 ---- - setup_configure.py | 2 +- - 2 files changed, 1 insertion(+), 5 deletions(-) - -diff --git a/setup_build.py b/setup_build.py -index c0e9a28c..ffd3bef7 100644 ---- a/setup_build.py -+++ b/setup_build.py -@@ -55,10 +55,6 @@ if sys.platform.startswith('win'): - ('_HDF5USEDLL_', None), - ('H5_BUILT_AS_DYNAMIC_LIB', None) - ]) --else: -- FALLBACK_PATHS['include_dirs'].extend(['/opt/local/include', '/usr/local/include']) -- FALLBACK_PATHS['library_dirs'].extend(['/opt/local/lib', '/usr/local/lib']) -- - - class h5py_build_ext(build_ext): - -diff --git a/setup_configure.py b/setup_configure.py -index 5576775e..75f4141e 100644 ---- a/setup_configure.py -+++ b/setup_configure.py -@@ -206,7 +206,7 @@ def autodetect_version(hdf5_dir=None): - default_path = 'libhdf5.so' - regexp = re.compile(r'^libhdf5.so') - -- libdirs = ['/usr/local/lib', '/opt/local/lib'] -+ libdirs = [] - try: - if pkgconfig.exists("hdf5"): - libdirs.extend(pkgconfig.parse("hdf5")['library_dirs']) --- -2.17.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-setup.py-Fix-numpy-version.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-setup.py-Fix-numpy-version.patch new file mode 100644 index 000000000..4881b023c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-setup.py-Fix-numpy-version.patch @@ -0,0 +1,28 @@ +From e6c0d487fb5e6063305b8b3187896fbfe5720ed2 Mon Sep 17 00:00:00 2001 +From: Leon Anavi <leon.anavi@konsulko.com> +Date: Mon, 22 Feb 2021 18:42:43 +0200 +Subject: [PATCH] setup.py: Fix numpy version + +Fix numpy version to ensure bitbake will find the pip package. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 7dbe583..6602c97 100755 +--- a/setup.py ++++ b/setup.py +@@ -49,7 +49,7 @@ SETUP_REQUIRES = [ + f"Cython >=0.29; python_version<'3.8'", + f"Cython >=0.29.14; python_version>='3.8'", + ] + [ +- f"numpy =={np_min}; python_version{py_condition}" ++ f"numpy >={np_min}; python_version{py_condition}" + for np_min, py_condition in NUMPY_MIN_VERSIONS + ] + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-setup_build.py-avoid-absolute-path.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-setup_build.py-avoid-absolute-path.patch new file mode 100644 index 000000000..d0c2ece19 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-setup_build.py-avoid-absolute-path.patch @@ -0,0 +1,29 @@ +From 1a46082d0889a784037952c4da0cde3822849032 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 28 Jan 2021 18:44:10 -0800 +Subject: [PATCH] setup_build.py: avoid absolute path + +Prevent absolute path from ending up in the egg-info SOURCES.txt. + +Upstream-Status: Submitted [https://github.com/h5py/h5py/pull/1803] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> + +--- + setup_build.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup_build.py b/setup_build.py +index 3c7c7ad..d824bdd 100644 +--- a/setup_build.py ++++ b/setup_build.py +@@ -21,7 +21,7 @@ from setup_configure import BuildConfig + + + def localpath(*args): +- return op.abspath(op.join(op.dirname(__file__), *args)) ++ return op.join(*args) + + + MODULES = ['defs', '_errors', '_objects', '_proxy', 'h5fd', 'h5z', diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_2.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.1.0.bb index 3904abbb4..03ae4c9db 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_2.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.1.0.bb @@ -4,11 +4,11 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=113251d71fb0384712c719b567261c5c" -SRC_URI[md5sum] = "504b595237409ab766fbbe568e60a080" -SRC_URI[sha256sum] = "84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6bf512d" +SRC_URI[sha256sum] = "1e2516f190652beedcb8c7acfa1c6fa92d99b42331cbef5e5c7ec2d65b0fc3c2" SRC_URI_append = " \ - file://0001-cross-compiling-support.patch \ + file://0001-setup_build.py-avoid-absolute-path.patch \ + file://0001-setup.py-Fix-numpy-version.patch \ " inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.18.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.19.0.bb index 9c9b6c5b0..f720723a6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.18.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.19.0.bb @@ -2,9 +2,8 @@ SUMMARY = "A comprehensive HTTP client library, httplib2 supports many features HOMEPAGE = "https://github.com/httplib2/httplib2" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=7e04d1303d64a7b62421751ecb490dc2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=56e5e931172b6164b62dc7c4aba6c8cf" -SRC_URI[md5sum] = "0b331f96cdb2ae0e0342d4ea0f5f0502" -SRC_URI[sha256sum] = "8af66c1c52c7ffe1aa5dc4bcd7c769885254b0756e6e69f953c7f0ab49a70ba3" +SRC_URI[sha256sum] = "e0d428dad43c72dbce7d163b7753ffc7a39c097e6788ef10f4198db69b92f08e" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.10.bb deleted file mode 100644 index a08ca714a..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.10.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-idna.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_3.1.bb index 4968f1072..fbdbab6df 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_3.1.bb @@ -1,18 +1,19 @@ SUMMARY = "Internationalised Domain Names in Applications" HOMEPAGE = "https://github.com/kjd/idna" LICENSE = "BSD-3-Clause & Python-2.0 & Unicode" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=cf36c8682cc154d2d4aa57bd6246b9a1" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=239668a7c6066d9e0c5382e9c8c6c0e1" -SRC_URI[md5sum] = "7a910c706db30d758f377db2762c0f9a" -SRC_URI[sha256sum] = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6" +SRC_URI[sha256sum] = "c5b02147e01ea9920e6b0a3f1f7bb833612d507592c837a6c49552768f4054e1" -RDEPENDS_${PN}_class-target = "\ - ${PYTHON_PN}-codecs \ -" +inherit pypi setuptools3 # Remove bundled egg-info do_compile_prepend() { rm -rf ${S}/idna.egg-info } +RDEPENDS_${PN}_class-target = "\ + ${PYTHON_PN}-codecs \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-intelhex_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-intelhex_2.3.0.bb new file mode 100644 index 000000000..befcb3478 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-intelhex_2.3.0.bb @@ -0,0 +1,10 @@ +SUMMARY = "Python library for Intel HEX files manipulations" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4eba844696655c3eae07aca8e3a94772" + +SRC_URI[sha256sum] = "892b7361a719f4945237da8ccf754e9513db32f5628852785aea108dcd250093" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.19.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.20.0.bb index d3ce9f5ff..42795b9bf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.19.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.20.0.bb @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" -SRC_URI[md5sum] = "33bdc8287c827aae23699751b0ed3f7a" -SRC_URI[sha256sum] = "cbb2ef3d5961d44e6a963b9817d4ea4e1fa2eb589c371a470fed14d8d40cbd6a" +SRC_URI[sha256sum] = "1923af00820a8cf58e91d56b89efc59780a6e81363b94464a0f17c039dffff9e" RDEPENDS_${PN} = "\ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-iso8601_0.1.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-iso8601_0.1.14.bb index 9e7494b3e..c531fcc6d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-iso8601_0.1.13.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-iso8601_0.1.14.bb @@ -3,8 +3,7 @@ HOMEPAGE = "http://pyiso8601.readthedocs.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b05625f2336fa024e8d57e65c6595844" -SRC_URI[md5sum] = "df6e924305fd799d90be63336b2ab8b3" -SRC_URI[sha256sum] = "f7dec22af52025d4526be94cc1303c7d8f5379b746a3f54a8c8446384392eeb1" +SRC_URI[sha256sum] = "8aafd56fa0290496c5edbb13c311f78fa3a241f0853540da09d9363eae3ebd79" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.2.bb index c83140a89..2f2421981 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.2.bb @@ -7,8 +7,7 @@ HOMEPAGE = "https://github.com/tcalmant/python-javaobj" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87" -SRC_URI[md5sum] = "47632071c3c3ca14b6c42f2a4e2e1309" -SRC_URI[sha256sum] = "419ff99543469e68149f875abb0db5251cecd350c03d2bfb4c94a5796f1cbc14" +SRC_URI[sha256sum] = "ed3b1ffcfd39f165729cb53587cca02ab0bfa4c332c837a92d5ffe6aef5c8010" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.4.bb index 990544cf1..b51e8eef1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.4.bb @@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed" inherit pypi setuptools3 PYPI_PACKAGE = "Markdown" -SRC_URI[md5sum] = "034e3bccfde211d44b4a7a69cb290ba0" -SRC_URI[sha256sum] = "5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18" +SRC_URI[sha256sum] = "31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.4.bb index 25709a117..a4df9a6fe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.4.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/matplotlib/matplotlib" SECTION = "devel/python" LICENSE = "PSF" LIC_FILES_CHKSUM = "\ - file://setup.py;beginline=259;endline=259;md5=e0ef37de7122ce842bcd1fb54482b353 \ + file://setup.py;beginline=273;endline=273;md5=e0ef37de7122ce842bcd1fb54482b353 \ file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74 \ " DEPENDS = "\ @@ -19,8 +19,8 @@ DEPENDS = "\ python3-certifi-native \ " -SRC_URI[md5sum] = "a85791908e78818bd425ba9ab38500fa" -SRC_URI[sha256sum] = "3d2edbf59367f03cd9daf42939ca06383a7d7803e3993eb5ff1bee8e8a3fbb6b" +SRC_URI[md5sum] = "0b48f34ec623e765a1bda15924ce0b56" +SRC_URI[sha256sum] = "3e477db76c22929e4c6876c44f88d790aacdf3c3f8f3a90cb1975c0bf37825b0" inherit pypi setuptools3 pkgconfig diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.2.1.bb index 7879a85cd..51a7c0584 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.2.1.bb @@ -4,13 +4,13 @@ SUMMARY = "Python library for arbitrary-precision floating-point arithmetic" HOMEPAGE = "https://pypi.org/project/mpmath/" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=efe9feb00df0b763941f2b1bbac7c402" +LIC_FILES_CHKSUM = "file://LICENSE;md5=71970bd3749eebe1bfef9f1efff5b37a" -SRC_URI[md5sum] = "acb1cdddf38e16084628065b174ddbfe" -SRC_URI[sha256sum] = "fc17abe05fbab3382b61a123c398508183406fa132e0223874578e20946499f6" +SRC_URI[sha256sum] = "79ffb45cf9f4b101a807595bcb3e72e0396202e0b1d25d689134b48c4216a81a" inherit pypi setuptools3 +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" RDEPENDS_${PN} += "python3-image" BBCLASSEXTEND = "native nativesdk" 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.812.bb index 0d019dfe1..8faab60b9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.800.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.812.bb @@ -13,6 +13,6 @@ PYPI_PACKAGE = "mypy" inherit pypi setuptools3 -SRC_URI[sha256sum] = "e0202e37756ed09daf4b0ba64ad2c245d357659e014c3f51d8cd0681ba66940a" +SRC_URI[sha256sum] = "cd07039aa5df222037005b08fbbfd69b3ab0b0bd7a07d7906de75ae52c4e3119" BBCLASSEXTEND = "native" 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.2.bb index ae8a55f84..752923786 100644 --- 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.2.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://pandas.pydata.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c2a8f987b2ce77c368c6b3e1b5b10774" -SRC_URI[sha256sum] = "5527c5475d955c0bc9689c56865aaa2a7b13c504d6c44f0aadbf57b565af5ebd" +SRC_URI[sha256sum] = "14ed84b463e9b84c8ff9308a79b04bf591ae3122a376ee0f62c68a1bd917a773" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.1.0.bb deleted file mode 100644 index 3cd9004df..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.1.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "A pure Python 2/3 library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux." -HOMEPAGE = "http://pythonhosted.org/python-periphery/" -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=fea92e2e010ccb151792c29fadc2db7b" - -SRC_URI[md5sum] = "27cdd7e026438067a238fb04ed5766a3" -SRC_URI[sha256sum] = "57baa82e6bc59b67747317d16ad0cf9626826e8d43233af13bce924660500bd6" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "python-periphery" - -RDEPENDS_${PN} += "${PYTHON_PN}-mmap" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.3.0.bb new file mode 100644 index 000000000..9e3cbb43e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.3.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A pure Python 2/3 library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux." +HOMEPAGE = "http://pythonhosted.org/python-periphery/" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=fed1784a083509430580a913df680706" + +SRC_URI[sha256sum] = "8a8ec019d9b330a6a6f69a7de61d14b4c98b102d76359047c5ce0263e12246a6" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "python-periphery" + +RDEPENDS_${PN} += "${PYTHON_PN}-mmap \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-fcntl" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.2.0.bb index c61d47c47..9f275b301 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.2.0.bb @@ -6,10 +6,9 @@ including RabbitMQ’s extensions. \ SECTION = "devel/python" HOMEPAGE = "https://pika.readthedocs.io" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=535836bf0a5de515a7bfee026075701d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=278bdfee5b51616941c1f6b2f1cfcb99" -SRC_URI[md5sum] = "6002400cdd33bf85ec8680ece72910d4" -SRC_URI[sha256sum] = "9fa76ba4b65034b878b2b8de90ff8660a59d925b087c5bb88f8fdbb4b64a1dbf" +SRC_URI[sha256sum] = "f023d6ac581086b124190cb3dc81dd581a149d216fa4540ac34f9be1e3970b89" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.2.bb index 05ca3beec..7a98ef288 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.2.bb @@ -4,8 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=faa7f82be8f220bff6156be4790344fc" -SRC_URI[md5sum] = "9f9cdb224ec0a1e59efcc7cac4b91972" -SRC_URI[sha256sum] = "97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f" +SRC_URI[sha256sum] = "38d612488f0633755a2e7a8acab6c01d20d63dbc31af75e2a9ac98a6f638ca94" RDEPENDS_${PN} = "pkgconfig \ ${PYTHON_PN}-shell \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl/0001-support-cross-complication.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl/0001-support-cross-complication.patch index 775ae1b2e..98d250c74 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl/0001-support-cross-complication.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl/0001-support-cross-complication.patch @@ -1,4 +1,4 @@ -From 9a16800738547d117284354bbcad7dd77d9d0344 Mon Sep 17 00:00:00 2001 +From 5f3911737c63a098caf73f1365320fe1b3a7638b Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 21 Apr 2016 03:05:57 -0400 Subject: [PATCH] support cross-complication @@ -6,12 +6,13 @@ Subject: [PATCH] support cross-complication Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- setup.py | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/setup.py b/setup.py -index 658d1a5..e8be7eb 100755 +index eb83cfe..3f9567b 100755 --- a/setup.py +++ b/setup.py @@ -13,41 +13,6 @@ import sys @@ -38,13 +39,13 @@ index 658d1a5..e8be7eb 100755 - sys.stderr.write("You need to install gcc to build this module\n") - sys.exit(1) - --sp = subprocess.Popen(['cpp'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +-sp = subprocess.Popen(['cpp'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=os.environ) -sp.communicate('#include <sys/prctl.h>\n'.encode()) -if sp.returncode: - sys.stderr.write("You need to install libc development headers to build this module\n") - exit = True - --sp = subprocess.Popen(['cpp'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +-sp = subprocess.Popen(['cpp'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=os.environ) -sp.communicate('#include <sys/capability.h>\n'.encode()) -if sp.returncode: - sys.stderr.write("You need to install libcap development headers to build this module\n") @@ -57,5 +58,5 @@ index 658d1a5..e8be7eb 100755 sources = ['_prctlmodule.c'], depends = ['securebits.h'], -- -2.8.1 +2.17.1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl_1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl_1.8.1.bb index 54620a066..b87a470b4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl_1.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl_1.8.1.bb @@ -5,15 +5,15 @@ limitations in C and linux. This module provides a nice non-messy python(ic) \ interface." SECTION = "devel/python" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=23ff9f50449d4bd0e513df16e4d9755f" +LIC_FILES_CHKSUM = "file://COPYING;md5=1475481f9ec754d758859bd2c75f6f6f" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "57cd0a7cad76e8f8792eea22ee5b5d17bae0a90f" -PV = "1.7+git${SRCPV}" +SRCREV = "5e12e398eb5c4e30d7b29b02458c76d2cc780700" +PV = "1.8.1+git${SRCPV}" -SRC_URI = "git://github.com/seveas/python-prctl;branch=master \ +SRC_URI = "git://github.com/seveas/python-prctl;branch=main\ file://0001-support-cross-complication.patch \ " inherit setuptools3 python3native 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.16.bb index 0b832c064..2a377d6e6 100644 --- 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.16.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" -SRC_URI[sha256sum] = "dc83e6368b0edd9ceabe17a055f2e22f6ed95b9aa39dbd59d0b4f3585bdfe9ed" +SRC_URI[sha256sum] = "0fa02fa80363844a4ab4b8d6891f62dd0645ba672723130423ca4037b80c1974" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.14.0.bb index 03d0b0c60..3cf850d1f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.12.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.14.0.bb @@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=19e8f490f9526b1de8 inherit pypi setuptools3 -SRC_URI[md5sum] = "b4336acee38ebe915b6e72fe8c5bce7b" -SRC_URI[sha256sum] = "49ef8ab4c27812a89a76fa894fe7a08f42f2147078392c0dee51d4a444ef6df5" +SRC_URI[sha256sum] = "1d63eb389347293d8915fb47bee0951c7b5dab522a4a60118b9a18f33e21f8ce" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_20.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.2.0.bb index df0c8e578..c99a5507f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_20.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.2.0.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/mk-fg/python-pulse-control" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f1d10048469ff90123263eb5e214061d" -SRC_URI[md5sum] = "8de84a0f4005ecad96d2c55a6d7c3a10" -SRC_URI[sha256sum] = "39b0a0e7974a7d6468d826a838822f78b00ac9c3803f0d7bfa9b1cad08ee22db" +SRC_URI[sha256sum] = "282be9ad1a9add961f0bbafa8e19723ac397a2eec5e14fb8cd6c51ff29962715" RDEPENDS_${PN} += "pulseaudio" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch index 6455c95e7..761422e07 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch @@ -1,4 +1,4 @@ -From 3abfa65517959ad279481021fafefba28f955e76 Mon Sep 17 00:00:00 2001 +From 2e9318f7a70699eed239aee6301d1d0bbd2457ee Mon Sep 17 00:00:00 2001 From: Philip Balister <philip@balister.org> Date: Fri, 10 Jul 2020 10:14:59 -0400 Subject: [PATCH] Do not check pointer size when cross compiling. @@ -8,23 +8,24 @@ It is reasonable to build for 32 machine on a 64 bit build machine. Prevents: | Python config failure: Python is 64-bit, chosen compiler is 32-bit Signed-off-by: Philip Balister <philip@balister.org> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- tools/FindPythonLibsNew.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/FindPythonLibsNew.cmake b/tools/FindPythonLibsNew.cmake -index d0c8fa2..8479e70 100644 +index 3605aebc..67f4d4a0 100644 --- a/tools/FindPythonLibsNew.cmake +++ b/tools/FindPythonLibsNew.cmake -@@ -123,7 +123,7 @@ list(GET _PYTHON_VALUES 9 PYTHON_MULTIARCH) +@@ -156,7 +156,7 @@ list(GET _PYTHON_VALUES 9 PYTHON_MULTIARCH) # Make sure the Python has the same pointer-size as the chosen compiler # Skip if CMAKE_SIZEOF_VOID_P is not defined -if(CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) +if((NOT CMAKE_CROSSCOMPILING) AND CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) - if(PythonLibsNew_FIND_REQUIRED) - math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8") - math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8") + if(PythonLibsNew_FIND_REQUIRED) + math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8") + math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8") -- -2.25.4 +2.17.1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch index 07ab9a03b..699eb6155 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch @@ -1,4 +1,4 @@ -From 918f3ef01c7a67f3beb67307966698474f144581 Mon Sep 17 00:00:00 2001 +From debd676cd94f92a30b3be45f1245aa13d8c398c0 Mon Sep 17 00:00:00 2001 From: Philip Balister <philip@balister.org> Date: Wed, 8 Jul 2020 09:41:43 -0400 Subject: [PATCH] Do not strip binaries. @@ -6,34 +6,43 @@ Subject: [PATCH] Do not strip binaries. * OpenEmbedded strips them after creating debug packages. Signed-off-by: Philip Balister <philip@balister.org> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- - tools/pybind11Tools.cmake | 13 ------------- - 1 file changed, 13 deletions(-) + tools/pybind11NewTools.cmake | 5 ----- + tools/pybind11Tools.cmake | 4 ---- + 2 files changed, 9 deletions(-) +diff --git a/tools/pybind11NewTools.cmake b/tools/pybind11NewTools.cmake +index 18da8be1..82ebf5e7 100644 +--- a/tools/pybind11NewTools.cmake ++++ b/tools/pybind11NewTools.cmake +@@ -246,11 +246,6 @@ function(pybind11_add_module target_name) + endif() + endif() + +- if(NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo) +- # Strip unnecessary sections of the binary on Linux/macOS +- pybind11_strip(${target_name}) +- endif() +- + if(MSVC) + target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) + endif() diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake -index a3603ab..b4c8f63 100644 +index 32313539..a7d81012 100644 --- a/tools/pybind11Tools.cmake +++ b/tools/pybind11Tools.cmake -@@ -230,19 +230,6 @@ function(pybind11_add_module target_name) - - _pybind11_add_lto_flags(${target_name} ${ARG_THIN_LTO}) +@@ -201,10 +201,6 @@ function(pybind11_add_module target_name) + endif() + endif() -- if (NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo) -- # Strip unnecessary sections of the binary on Linux/Mac OS -- if(CMAKE_STRIP) -- if(APPLE) -- add_custom_command(TARGET ${target_name} POST_BUILD -- COMMAND ${CMAKE_STRIP} -x $<TARGET_FILE:${target_name}>) -- else() -- add_custom_command(TARGET ${target_name} POST_BUILD -- COMMAND ${CMAKE_STRIP} $<TARGET_FILE:${target_name}>) -- endif() -- endif() +- if(NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo) +- pybind11_strip(${target_name}) - endif() - if(MSVC) - # /MP enables multithreaded builds (relevant when there are many files), /bigobj is - # needed for bigger binding projects due to the limit to 64k addressable sections + target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) + endif() -- -2.25.4 +2.17.1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.6.2.bb index 5d57590a1..bd16a6d0d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.6.2.bb @@ -1,15 +1,15 @@ SUMMARY = "Seamless operability between C++11 and Python" HOMEPAGE = "https://github.com/wjakob/pybind11" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=beb87117af69fd10fbf9fb14c22a2e62" +LIC_FILES_CHKSUM = "file://LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f" DEPENDS = "boost" SRC_URI = "git://github.com/pybind/pybind11.git \ file://0001-Do-not-strip-binaries.patch \ file://0001-Do-not-check-pointer-size-when-cross-compiling.patch \ - " -SRCREV = "3b1dbebabc801c9cf6f0953a4c20b904d444f879" +" +SRCREV = "8de7772cc72daca8e947b79b83fea46214931604" S = "${WORKDIR}/git" 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_8.1.0.bb index c0ff58cfd..7b2b5142e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_8.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/balloob/pychromecast" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" -SRC_URI[sha256sum] = "aad4b145cb8c76b629c700877e49c418810aaabb26ace5035c49940f9657f2f0" +SRC_URI[sha256sum] = "df0295f653cee752de38cf8ef09f13ad9782c53924dfbaa191ca62bd5e1dce14" PYPI_PACKAGE = "PyChromecast" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus-manager_git.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus-manager_git.bb new file mode 100644 index 000000000..ae9e42160 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus-manager_git.bb @@ -0,0 +1,13 @@ +SUMMARY = "DBus.ObjectManager implementation for pydbus" +AUTHOR = "Sébastien Corne" + +LICENSE = "WTFPL" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0fd5bb1dae91ba145745db55870be6a7" + +inherit setuptools3 + +SRC_URI = "git://github.com/seebz/pydbus-manager.git" +SRCREV = "6b576b969cbda50521dca62a7df929167207f9fc" +PV = "git${SRCPV}" + +S = "${WORKDIR}/git" 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 index aa14cdd4b..4d4d2b79c 100644 --- 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 @@ -13,7 +13,7 @@ inherit setuptools3 pypi RDEPENDS_${PN} = "\ ${PYTHON_PN}-docopt \ ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-pyyaml \ + ${PYTHON_PN}-ruamel-yaml \ " BBCLASSEXTEND = "native nativesdk" 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.138.bb index 9b2efa2cd..eb7bea834 100644 --- 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.138.bb @@ -4,7 +4,7 @@ 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" +SRCREV = "9316420dc028a1ffc541986fc08793e669f2165e" S = "${WORKDIR}/git" inherit setuptools3 @@ -18,5 +18,5 @@ RDEPENDS_${PN} += " \ " # Fixes: python3-pymisp requires /bin/bash, but no -# providers found in RDEPENDS_python3-pymisp? [file-rdep +# providers found in RDEPENDS_python3-pymisp? [file-rdep] RDEPENDS_${PN} += "bash" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.3.bb index 5372ac0ff..3549adce7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.3.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "c2b67881392a9e85aa108e75f62cdbe372d5a3f17ea5f8d3436dcf4662052f14" +SRC_URI[sha256sum] = "db5098587f58fbf8582d9bda2462762b367207246d3e19623782fb449c3c5fcc" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.2.bb index 211580b37..142d07549 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.2.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/asweigart/pyperclip" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=d7dd4b0d1f7153322a546e89b5a0a632" -SRC_URI[md5sum] = "0ac879899da5c2af755a834245ca6a0f" -SRC_URI[sha256sum] = "9abef1e79ce635eb62309ecae02dfb5a3eb952fa7d6dce09c1aef063f81424d3" +SRC_URI[sha256sum] = "105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_2.1.1.bb deleted file mode 100644 index 27b768155..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_2.1.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "pytest plugin for generating html reports from test results" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://../pytest-html.LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" - -# Per README.rst the license statement is fetched from -# https://raw.githubusercontent.com/davehunt/pytest-html/master/LICENSE -SRC_URI += "https://raw.githubusercontent.com/davehunt/pytest-html/master/LICENSE;name=license;downloadfilename=pytest-html.LICENSE" -SRC_URI[license.md5sum] = "5d425c8f3157dbf212db2ec53d9e5132" -SRC_URI[license.sha256sum] = "2bfdca60adf803108d4c7f009000bea76ad00e621e163197881b0eaae91b530e" - -SRC_URI[sha256sum] = "6a4ac391e105e391208e3eb9bd294a60dd336447fd8e1acddff3a6de7f4e57c5" - - -PYPI_PACKAGE = "pytest-html" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pytest \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_3.1.1.bb new file mode 100644 index 000000000..bd543d2f0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_3.1.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "pytest plugin for generating html reports from test results" +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" + +SRC_URI[sha256sum] = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3" + + +PYPI_PACKAGE = "pytest-html" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-pytest \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.0.bb index d00cd4873..35f6c6c0a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.0.bb @@ -1,9 +1,8 @@ SUMMARY = "Invoke py.test as distutils command with dependency resolution" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a33f38bbf47d48c70fe0d40e5f77498e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" -SRC_URI[md5sum] = "e5f66b8e8e87f62c59631c35c919d321" -SRC_URI[sha256sum] = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b" +SRC_URI[sha256sum] = "ca3f58ff4957e8be6c54c55d575b235725cbbcf4dc0d5091c29c6444cfc8a5fe" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2020.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2021.1.bb index 198626311..cc4dfecfa 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2020.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2021.1.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a67fc46c1b596cce5d21209bbe75999" inherit pypi setuptools3 ptest -SRC_URI[md5sum] = "0349106ac02f2bfe565dd6d5594e3a15" -SRC_URI[sha256sum] = "c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048" +SRC_URI[md5sum] = "8c849bdf95414fe708a84473e42d4406" +SRC_URI[sha256sum] = "83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da" RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-datetime \ 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_22.0.3.bb index 8bde98247..dbf8e6446 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_21.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.0.3.bb @@ -8,7 +8,7 @@ DEPENDS = "zeromq" FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyzmq:" SRC_URI += "file://club-rpath-out.patch" -SRC_URI[sha256sum] = "098c13c6198913c2a0690235fa74d2e49161755f66b663beaec89651554cc79c" +SRC_URI[sha256sum] = "f7f63ce127980d40f3e6a5fdb87abf17ce1a7c2bd8bf2c7560e1bbce8ab1f92d" inherit pypi pkgconfig setuptools3 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.2.bb index c4c36020f..dcb42aaa9 100644 --- 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.2.bb @@ -4,7 +4,7 @@ AUTHOR = "Sybren A. Stuvel" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=c403f6882d4f97a9cd927df987d55634" -SRC_URI[sha256sum] = "69805d6b69f56eb05b62daea3a7dbd7aa44324ad1306445e05da8060232d00f4" +SRC_URI[sha256sum] = "9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9" inherit pypi setuptools3 update-alternatives diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.12.bb index ec8545dae..7593ce7f5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.12.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.12.bb @@ -8,9 +8,13 @@ PYPI_PACKAGE = "ruamel.yaml" inherit pypi setuptools3 +BBCLASSEXTEND = "native nativesdk" + SRC_URI[md5sum] = "c7e4b216d9554d80be42011b448b7c61" SRC_URI[sha256sum] = "076cc0bc34f1966d920a49f18b52b6ad559fbe656a0748e3535cf7b3f29ebf9e" do_install_prepend() { export RUAMEL_NO_PIP_INSTALL_CHECK=1 } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-semantic-version_2.8.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-semantic-version_2.8.5.bb new file mode 100644 index 000000000..b8541ff57 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-semantic-version_2.8.5.bb @@ -0,0 +1,12 @@ +SUMMARY = "A library implementing the 'SemVer' scheme." +DESCRIPTION = "Semantic version comparison for Python (see http://semver.org/)" +HOMEPAGE = "https://github.com/rbarrois/python-semanticversion" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4fb31e3c1c7eeb8b5e8c07657cdd54e2" + +SRC_URI[sha256sum] = "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54" + +PYPI_PACKAGE = "semantic_version" +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.19.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.20.3.bb index bb960eed0..13ba1e6fa 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.19.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.20.3.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/getsentry/sentry-python" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" -SRC_URI[sha256sum] = "737a094e49a529dd0fdcaafa9e97cf7c3d5eb964bd229821d640bc77f3502b3f" +SRC_URI[sha256sum] = "4ae8d1ced6c67f1c8ea51d82a16721c166c489b76876c9f2c202b8a50334b237" PYPI_PACKAGE = "sentry-sdk" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.2.bb index 7cb0efbf9..9507f60d7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.2.bb @@ -2,9 +2,9 @@ SUMMARY = "CSS selector library for python-beautifulsoup4" HOMEPAGE = "https://github.com/facelessuser/soupsieve" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5a6fd3b0c24fc5a041a3d1bbb22c81b5" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=33c3a77def9b3ad83e01c65bdcc1af67" -SRC_URI[sha256sum] = "6dc52924dc0bc710a5d16794e6b3480b2c7c08b07729505feab2b2c16661ff6e" +SRC_URI[sha256sum] = "407fa1e8eb3458d1b5614df51d9651a1180ea5fedf07feb46e45d7e25e6d6cdd" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.22.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.23.bb index cf127241d..d962ea7d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.22.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.23.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ application developers the full power and flexibility of SQL" HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c19467890539ff718c00a019c9c7a7b2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3359ed561ac16aaa25b6c6eff84df595" -SRC_URI[sha256sum] = "758fc8c4d6c0336e617f9f6919f9daea3ab6bb9b07005eda9a1a682e24a6cacc" +SRC_URI[sha256sum] = "6fca33672578666f657c131552c4ef8979c1606e494f78cd5199742dfb26918b" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-supervisor_4.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-supervisor_4.2.1.bb index 56ab27e0f..0ff4b35d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-supervisor_4.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-supervisor_4.2.1.bb @@ -7,8 +7,7 @@ HOMEPAGE = "https://github.com/Supervisor/supervisor" LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=5b4e3a2172bba4c47cded5885e7e507e" -SRC_URI[md5sum] = "ecea94eedc70ba5127fdeb0665bcca0d" -SRC_URI[sha256sum] = "2dc86fe0476e945e61483d614ceb2cf4f93b95282eb243bdf792621994360383" +SRC_URI[sha256sum] = "c479c875853e9c013d1fa73e529fd2165ff1ecaecc7e82810ba57e7362ae984d" PYPI_PACKAGE = "supervisor" inherit pypi systemd setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.8.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.8.9.bb index def35ff44..19261c3d1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.8.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.8.9.bb @@ -3,7 +3,6 @@ HOMEPAGE = "https://github.com/astanin/python-tabulate" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fad5a39bdfe452b13775adda41023ba7" -SRC_URI[md5sum] = "a766c6eecfe3765821909c4ddf082b3b" -SRC_URI[sha256sum] = "db2723a20d04bcda8522165c73eea7c300eda74e0ce852d9022e0159d7895007" +SRC_URI[sha256sum] = "eb1d13f25760052e8931f2ef80aaf6045a6cceb47514db8beab24cded16f13a7" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.51.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.51.0.bb deleted file mode 100644 index e4510ad44..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.51.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Fast, Extensible Progress Meter" -HOMEPAGE = "http://tqdm.github.io/" -SECTION = "devel/python" - -LICENSE = "MIT & MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENCE;md5=7ea57584e3f8bbde2ae3e1537551de25" - -SRC_URI[md5sum] = "b188c2dc7802c19b262971e566c265ce" -SRC_URI[sha256sum] = "ef54779f1c09f346b2b5a8e5c61f96fbcb639929e640e59f8cf810794f406432" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.58.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.58.0.bb new file mode 100644 index 000000000..771016962 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.58.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Fast, Extensible Progress Meter" +HOMEPAGE = "http://tqdm.github.io/" +SECTION = "devel/python" + +LICENSE = "MIT & MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENCE;md5=59e4271a933d33edfe60237db377a14b" + +SRC_URI[sha256sum] = "c23ac707e8e8aabb825e4d91f8e17247f9cc14b0d64dd9e97be0781e9e525bba" + +inherit pypi setuptools3 + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.7.bb index 701c82cda..04a033742 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.7.bb @@ -4,6 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=baac7be1f4c17620df74188e23da6d47" inherit pypi setuptools3 -SRC_URI[sha256sum] = "032e10113139852ffb3ecfa4c2a5138f87441d85c3d6ad9122bb4b0978180a8d" +SRC_URI[sha256sum] = "8c60ec0828cd037820726283cad5d4d77a5e31514e058b51250420e9873e9bc7" RDEPENDS_${PN} += "python3-six" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_3.10.0.bb index 01bbf831a..94fd65649 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_3.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_3.10.0.bb @@ -4,8 +4,7 @@ DESCRIPTION = "Python module to support twitter API" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[md5sum] = "b5bc640fa9f6baff6471c127aba1fec0" -SRC_URI[sha256sum] = "bfd19a5c11f35f7f199c795f99d9cbf8a52eb33f0ecfb6c91ee10b601180f604" +SRC_URI[sha256sum] = "76e6954b806ca470dda877f57db8792fff06a0beba0ed43efc3805771e39f06a" PYPI_PACKAGE = "tweepy" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_20.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_21.2.1.bb index f4baeb10f..53dcb5cc6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_20.12.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_21.2.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Compatibility API between asyncio/Twisted/Trollius" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" -SRC_URI[sha256sum] = "1488d31d564a116538cc1265ac3f7979fb6223bb5a9e9f1479436ee2c17d8549" +SRC_URI[sha256sum] = "7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.11.1.bb index cb5c37235..640adf83b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.11.1.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://pypi.org/project/typeguard/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0e423eea5c91e7aa21bdb70184b3e53" -SRC_URI[md5sum] = "cc43e0eb1dea7e409a74c7f1effc4544" -SRC_URI[sha256sum] = "d830132dcd544d3f8a2a842ea739eaa0d7c099fcebb9dcdf3802f4c9929d8191" +SRC_URI[sha256sum] = "33243c1cbfcb9736a06c6db22dd08876b5f297e6344aa272a2862c0f8e669f64" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.3.bb index fcd670901..739cf24f5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c" -SRC_URI[sha256sum] = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08" +SRC_URI[sha256sum] = "de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.0.2.bb index 698dfe770..c5387dc35 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_1.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.0.2.bb @@ -4,7 +4,7 @@ DEPENDS = "${PYTHON_PN}-argh" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "376cbc2a35c0392b0fe7ff16fbc1b303fd99d4dd9911ab5581ee9d69adc88982" +SRC_URI[sha256sum] = "532fedd993e75554671faa36cd04c580ced3fae084254a779afbbd8aaf00566b" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb index 571dba6fa..8587ea8f3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_1.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb @@ -4,16 +4,19 @@ DESCRIPTION = "Extract data from Excel spreadsheets (.xls and .xlsx,\ Strong support for Excel dates. Unicode-aware." HOMEPAGE = "http://www.python-excel.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=5f4244d51fcc1e7cc2d43e96891b2f80" +LIC_FILES_CHKSUM = "file://LICENSE;md5=00ea1e843a43c20d9b63a8112239b0d1" -SRC_URI[md5sum] = "e5d5b96924d791b22898b622eb3e918e" -SRC_URI[sha256sum] = "546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2" +SRC_URI[sha256sum] = "f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88" -SRC_URI += " \ - file://run-ptest \ + +SRC_URI = "git://github.com/python-excel/xlrd.git \ + file://run-ptest \ " +SRCREV = "b8d573e11ec149da695d695c81a156232b89a949" + +S = "${WORKDIR}/git" -inherit ptest pypi setuptools3 +inherit ptest setuptools3 RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" @@ -24,8 +27,6 @@ RDEPENDS_${PN}-ptest += " \ do_install_ptest() { install -d ${D}${PTEST_PATH}/tests cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - install -d ${D}${PTEST_PATH}/examples - cp -rf ${S}/examples/* ${D}${PTEST_PATH}/examples/ } BBCLASSEXTEND = "native nativesdk" 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.5.1.bb index 055a82d4c..bdb15971b 100644 --- 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.5.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/xmlschema" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=47489cb18c469474afeb259ed1d4832f" -SRC_URI[sha256sum] = "f372005d08dfc231ce7f001c3a7a2c7f7ae138295349268bc551a9df3c700b82" +SRC_URI[sha256sum] = "c4c72b457865f46394bb23525b4e233d6537d9e97b8c6144a6cda2d5ef0d6688" PYPI_PACKAGE = "xmlschema" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.49.bb b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.50.bb index 7fba21f7d..64a24ade3 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.49.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.50.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=master \ " -SRCREV = "50c09e5c4c76757099d686c316b4bf42f72db71b" +SRCREV = "11980776c5ad757401ea1d12fd1f331d96428105" FILES_${PN} += "${datadir}/*" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.26.bb b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.32.bb index 7aeb5d6c9..62d2729dc 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.26.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.32.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=ma file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ " -SRCREV = "4c93e84c8798da511da1c05f1912d2f908f8f85f" +SRCREV = "c56a5fbdd4079b187b21787f072ccc83dc09c28c" UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.3.bb index d68ae9abf..fd7341953 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.3.bb @@ -16,8 +16,7 @@ HOMEPAGE = "http://pywbem.github.io" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" -SRC_URI[md5sum] = "6ade0cda6a997542d61f15713c2dd971" -SRC_URI[sha256sum] = "4e2baa4b4b88943cca32c7eb588fffff22ce86c748ba7544e01149f9638014fe" +SRC_URI[sha256sum] = "2abb6443f4debae56af7abefadb9fa5b8af9b53fc9bcf67f6c01a78db1064300" inherit pypi setuptools3 update-alternatives diff --git a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.8.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.8.1.bb index 03caec539..c5cabdb13 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.8.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.8.1.bb @@ -4,8 +4,7 @@ HOMEPAGE = "https://pywbemtools.readthedocs.io/en/stable/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" -SRC_URI[md5sum] = "e41ef654a0af0461d6c164752963fdfb" -SRC_URI[sha256sum] = "b869bb217613cdfee1e97e8afc28fe3f9bf3b88f8fc99e588d03c4be0922c319" +SRC_URI[sha256sum] = "3cbee091f0a4917394814d7e639ab9fe13ad0859e47288deabf2b09a4382c4ae" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.1.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.2.bb index 47bf1e221..a7e96851a 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.1.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.2.bb @@ -7,7 +7,7 @@ DEPENDS = "gtk+3 gtksourceview3 xfconf xfce4-dev-tools-native" inherit xfce-app gsettings mime-xdg -SRC_URI[sha256sum] = "3d2e277b1ae82dd0f0fa25e27169491fc38c2b70a9a624f2ea472604b317a582" +SRC_URI[sha256sum] = "30adc5631a4e551df7b3e17ddc1d10e9980080f96518dedccc32170cb18efb8e" FILES_${PN} += " \ ${datadir}/glib-2.0/schemas \ diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.1.bb index 55941d74b..ebcdc2166 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.1.bb @@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" inherit xfce-panel-plugin -SRC_URI[sha256sum] = "7866dddbbe0557a9bfe603934e9ce82df968fe36e21533d05ee71704e6602da7" +SRC_URI[sha256sum] = "615adf9abd91417a44319d8e4dadc6012fa22a3778f2f379717512dcb7ef924a" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.9.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.9.0.bb new file mode 100644 index 000000000..cd7212f65 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.9.0.bb @@ -0,0 +1,10 @@ +SUMMARY = "Notes plugin for the Xfce Panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-panel-plugin + +DEPENDS += "gtk+3 libxfce4ui xfce4-panel xfconf" + +SRC_URI[sha256sum] = "13f909c948b639f96de64cf793eb74cb1779589201d3933eff214ee8f35ab088" 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.3.bb index 366597731..5c48101d1 100644 --- 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.3.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[sha256sum] = "a6f7070afd1c9020257d8ed7483872643a6cddd76d5d73de107c7fbd981fc515" +SRC_URI[sha256sum] = "39cc34c8a83381997c6faaacb6bf792339234303438a1fccd15c9a1770b87daf" RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index cd3fa26aa..7f1c17261 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -40,6 +40,7 @@ RRECOMMENDS_${PN} = " \ xfce4-mount-plugin \ xfce4-powermanager-plugin \ xfce4-closebutton-plugin \ + xfce4-notes-plugin \ xfce4-whiskermenu-plugin \ xfce4-mailwatch-plugin \ xfce4-smartbookmark-plugin \ diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb index 39198306b..4b5523895 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb @@ -8,6 +8,6 @@ inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "37b92aaaeeec8220ed23163cf89321168d3b49e0c48b4c10f12dc4a21fdf0954" +SRC_URI[sha256sum] = "bfe3e9bd92695014ee74a2fbb7f5fd1b4c29cf043c4a11598b8958324c81e7ec" FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.1.bb index 0b210ffcc..b92ebde00 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.1.bb @@ -8,7 +8,7 @@ inherit xfce gtk-doc gobject-introspection features_check remove-libtool mime-xd REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "5e979aeeb37d306d72858b1bc67448222ea7a68de01409055b846cd31f3cc53d" +SRC_URI[sha256sum] = "fa099bc6be6592dbb828747a473c2e1b0e7f85afd945a98002b475bb6f975991" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ file://0002-use-lxdm-to-replace-dm-tool.patch \ diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb index 36b5bc2d0..4f6bde2a9 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "22f273f212481d71e0b5618c62710cd85f69aea74f5ea5c0093f7918b0 ALTERNATIVE_${PN} = "x-session-manager" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" -ALTERNATIVE_PRIORITY_${PN} = "100" +ALTERNATIVE_PRIORITY_${PN} = "150" FILES_${PN} += " \ ${libdir}/xfce4/*/*/*.so \ diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service index c37863e80..00676798d 100644 --- a/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service +++ b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service @@ -5,6 +5,7 @@ After=obmc-power-on@%i.target Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target After=op-cfam-reset.service +Before=start_host@%i.service Conflicts=obmc-chassis-poweroff@%i.target Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/mpreboot@%i 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 abb5a31fb..75619f70a 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 = "99ee5ca9c36ff8d80d683337cf81241480b2a200" +SRCREV = "26c4d763d3dcddc3638a960973cefef506b3735b" DEPENDS += " \ autoconf-archive-native \ diff --git a/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb b/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb index bd0a8eea4..0cc6016ab 100644 --- a/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-fru +inherit native SRC_URI += "file://config.yaml" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-error-native_git.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-error-native_git.bb index 2e71bfc2d..bdf669b13 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-error-native_git.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-error-native_git.bb @@ -3,8 +3,8 @@ SUMMARY = "Copy error yaml files to known path for elog parsing" PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-dbus-yaml +inherit native require openpower-ipmi-oem.inc diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb index 6e2c1fc5d..49aa58cf3 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native SRC_URI += "file://openpower-config.yaml" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb index 1c8758793..3b190a63c 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb @@ -3,5 +3,5 @@ DESCRIPTION = "Whitelisted OpenBMC IPMI OEM commands for OpenPOWER based systems LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host-whitelist +inherit native 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 d9df2a38a..dca85731b 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -9,11 +9,13 @@ SRC_URI = "git://github.com/openbmc/openpower-hw-diags" SYSTEMD_SERVICE_${PN} = "attn_handler.service" PV = "0.1+git${SRCPV}" -SRCREV = "7a0dd543c8fef050f7347dde760e6aff84b07122" +SRCREV = "8af9e46f43d2ffa030275d17716571d4fcc8ad18" S = "${WORKDIR}/git" -DEPENDS = "boost libgpiod pdbg phosphor-logging sdbusplus openpower-libhei" +DEPENDS = "boost libgpiod pdbg phosphor-logging sdbusplus openpower-libhei \ + nlohmann-json" + FILES_${PN} += "${UNITDIR}/attn_handler.service" # This is required so that libhei is installed with the chip data files. diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb index ab73eb056..da964c034 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/openpower-libhei" PV = "0.1+git${SRCPV}" -SRCREV = "fc4aa5ecebfbc8d6fab8b0d88d3d9c1bbbcde8ab" +SRCREV = "995be6c72a49a5e4fd0d6fd8d4b9d080a245af85" S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-example-native_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-example-native_git.bb index 723d59e04..394297d67 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-example-native_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-example-native_git.bb @@ -2,9 +2,9 @@ SUMMARY = "OpenPower OCC Control with example occ sensor IDs" PR = "r1" PV = "1.0+git${SRCPV}" -inherit native require openpower-occ-control.inc inherit openpower-occ-control +inherit native PROVIDES += "virtual/openpower-occ-control-config-native" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb index 796088546..db9ce5d5e 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb @@ -3,9 +3,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-occ-control inherit mrw-xml +inherit native PROVIDES += "virtual/openpower-occ-control-config-native" DEPENDS += "mrw-native mrw-perl-tools-native" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index 845499cb3..3549355e5 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control" -SRCREV = "0032523808c4807f8e5b4753d68080062980b35f" +SRCREV = "a17f6e8c209363268871b3473654c506c749c810" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb index 3c9c8eae2..8d94042e2 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://inventory" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb index be0779fef..5e190418a 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb @@ -3,9 +3,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd inherit mrw-xml +inherit native DEPENDS += " \ mrw-native \ diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb index 67107a6e8..cb24b2686 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://example.yaml" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb index 42b1f37e4..5e6fcf724 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb @@ -3,9 +3,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd inherit mrw-xml +inherit native SRC_URI += "file://config.yaml" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb index 5b0188614..69d57f7db 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://layout.yaml" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index e3c835b43..4f7eafa28 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 = "640004f1367267476c6fef6069d9b0ff19f46152" +SRCREV = "f272efc44f2c35f23d63bab8a983fa18c7f5aee4" diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-gpio-keys.cfg b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-gpio-keys.cfg deleted file mode 100644 index f5c01bed7..000000000 --- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-gpio-keys.cfg +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_INPUT_KEYBOARD=y -# CONFIG_INPUT_LEDS is not set -# CONFIG_INPUT_MOUSDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-gpio-keys.scc b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-gpio-keys.scc deleted file mode 100644 index 78961af7a..000000000 --- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-gpio-keys.scc +++ /dev/null @@ -1,2 +0,0 @@ -define KFEATURE_DESCRIPTION "Enable gpio-keys" -kconf non-hardware phosphor-gpio-keys.cfg diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend index 7401a1895..d8bbccfac 100644 --- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://phosphor-gpio-keys.scc" -SRC_URI += "file://phosphor-gpio-keys.cfg" SRC_URI += "file://phosphor-vlan.scc" SRC_URI += "file://phosphor-vlan.cfg" diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index fa5d3191c..1ec8706cb 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -501,9 +501,11 @@ python do_generate_phosphor_manifest() { purpose = d.getVar('VERSION_PURPOSE', True) version = do_get_version(d) target_machine = d.getVar('MACHINE', True) + extended_version = (d.getVar('EXTENDED_VERSION', True) or "") with open('MANIFEST', 'w') as fd: fd.write('purpose={}\n'.format(purpose)) fd.write('version={}\n'.format(version.strip('"'))) + fd.write('ExtendedVersion={}\n'.format(extended_version)) fd.write('KeyType={}\n'.format(get_pubkey_type(d))) fd.write('HashType=RSA-SHA256\n') fd.write('MachineName={}\n'.format(target_machine)) diff --git a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass index 830d0390c..740f6ec4a 100644 --- a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass @@ -65,17 +65,17 @@ def SystemdUnit(unit): self.unit = unit def __getattr__(self, item): - if item is 'name': + if item == 'name': return self.unit - if item is 'is_activated': + if item == 'is_activated': return self.unit.startswith('dbus-') - if item is 'is_template': + if item == 'is_template': return '@.' in self.unit - if item is 'is_instance': + if item == 'is_instance': return '@' in self.unit and not self.is_template if item in ['is_service', 'is_target']: return self.unit.split('.')[-1] == item - if item is 'base': + if item == 'base': cls = self.unit.split('.')[-1] base = self.unit.replace('dbus-', '') base = base.replace('.%s' % cls, '') @@ -84,13 +84,13 @@ def SystemdUnit(unit): if self.is_template: base = base.rstrip('@') return base - if item is 'instance' and self.is_instance: + if item == 'instance' and self.is_instance: inst = self.unit.rsplit('@')[-1] return inst.rsplit('.')[0] - if item is 'template' and self.is_instance: + if item == 'template' and self.is_instance: cls = self.unit.split('.')[-1] return '%s@.%s' % (self.base, cls) - if item is 'template' and self.is_template: + if item == 'template' and self.is_template: return '.'.join(self.base.split('@')[:-1]) raise AttributeError(item) @@ -165,11 +165,11 @@ python() { var = 'SYSTEMD_USER_%s' % file user = listvar_to_list(d, var) - if len(user) is 0: + if len(user) == 0: var = 'SYSTEMD_USER_%s' % pkg user = listvar_to_list(d, var) - if len(user) is not 0: - if len(user) is not 1: + if len(user) != 0: + if len(user) != 1: bb.fatal('Too many users assigned to %s: \'%s\'' % (var, ' '.join(user))) user = user[0] diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass index 14746b3b5..eb4e915a0 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 = "1b5ec9c5367947d19bdf6efd08251eeb55dd90f4" +SRCREV = "a5a0944ccb8d925d6d83897b1e2397e85564ea1e" diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index b1b3885c4..af2e6ef76 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -117,9 +117,6 @@ DISTRO_EXTRA_RDEPENDS_remove_qemuarm = "packagegroup-core-device-devel" include conf/distro/include/openbmc-phosphor/${MACHINE}.inc -KERNEL_FEATURES_append = " phosphor-gpio-keys" -KERNEL_FEATURES_remove_qemuall = " phosphor-gpio-keys" - IMAGE_CLASSES_append = " image_types_phosphor phosphor-rootfs-postcommands" IMAGE_CLASSES_append_npcm7xx = " image_types_phosphor_nuvoton" diff --git a/meta-phosphor/conf/distro/include/phosphor-tiny.inc b/meta-phosphor/conf/distro/include/phosphor-tiny.inc deleted file mode 100644 index 990b44e8c..000000000 --- a/meta-phosphor/conf/distro/include/phosphor-tiny.inc +++ /dev/null @@ -1,2 +0,0 @@ -# Include this to get minimum flash image created -DISTROOVERRIDES .= ":openbmc-phosphor-tiny" diff --git a/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton/phosphor-gpio-keys.cfg b/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton/phosphor-gpio-keys.cfg deleted file mode 100644 index f5c01bed7..000000000 --- a/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton/phosphor-gpio-keys.cfg +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_INPUT_KEYBOARD=y -# CONFIG_INPUT_LEDS is not set -# CONFIG_INPUT_MOUSDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set diff --git a/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton/phosphor-gpio-keys.scc b/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton/phosphor-gpio-keys.scc deleted file mode 100644 index 78961af7a..000000000 --- a/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton/phosphor-gpio-keys.scc +++ /dev/null @@ -1,2 +0,0 @@ -define KFEATURE_DESCRIPTION "Enable gpio-keys" -kconf non-hardware phosphor-gpio-keys.cfg diff --git a/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend index 3d0bbb7f3..e73d00f55 100644 --- a/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend +++ b/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -1,8 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://phosphor-gpio-keys.scc" -SRC_URI += "file://phosphor-gpio-keys.cfg" - # OpenBMC loads in kernel features via other mechanisms so this check # in the kernel-yocto.bbclass is not required KERNEL_DANGLING_FEATURES_WARN_ONLY="1" diff --git a/meta-phosphor/raspberrypi/recipes-kernel/linux/linux-raspberrypi/phosphor-gpio-keys.cfg b/meta-phosphor/raspberrypi/recipes-kernel/linux/linux-raspberrypi/phosphor-gpio-keys.cfg deleted file mode 100644 index f5c01bed7..000000000 --- a/meta-phosphor/raspberrypi/recipes-kernel/linux/linux-raspberrypi/phosphor-gpio-keys.cfg +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_INPUT_KEYBOARD=y -# CONFIG_INPUT_LEDS is not set -# CONFIG_INPUT_MOUSDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set diff --git a/meta-phosphor/raspberrypi/recipes-kernel/linux/linux-raspberrypi/phosphor-gpio-keys.scc b/meta-phosphor/raspberrypi/recipes-kernel/linux/linux-raspberrypi/phosphor-gpio-keys.scc deleted file mode 100644 index 78961af7a..000000000 --- a/meta-phosphor/raspberrypi/recipes-kernel/linux/linux-raspberrypi/phosphor-gpio-keys.scc +++ /dev/null @@ -1,2 +0,0 @@ -define KFEATURE_DESCRIPTION "Enable gpio-keys" -kconf non-hardware phosphor-gpio-keys.cfg diff --git a/meta-phosphor/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-phosphor/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend index 71e208cd4..72d991c7e 100644 --- a/meta-phosphor/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend +++ b/meta-phosphor/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend @@ -1,4 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://phosphor-gpio-keys.scc" -SRC_URI += "file://phosphor-gpio-keys.cfg" diff --git a/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend b/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend index 004d8dc71..0c5ed3b21 100644 --- a/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend +++ b/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend @@ -5,10 +5,8 @@ EXTRA_OECONF_append_class-target = " shared no-hw no-err no-psk no-srp " EXTRA_OECONF_append_class-target = " no-ssl2 no-ssl3 " # Disable various algorithms. -EXTRA_OECONF_append_class-target = " no-idea no-md2 no-mdc2 no-rc5 no-md4 \ - no-rmd160 no-whirlpool no-camellia \ - no-rc2 no-rc4 no-bf no-cast no-seed no-gost " - +EXTRA_OECONF_append_class-target = " no-md4 no-rmd160 no-whirlpool \ + no-rc2 no-rc4 no-bf no-cast no-gost " do_configure_append() { oe_runmake depend } diff --git a/meta-phosphor/recipes-devtools/perl/yaml-tiny_1.73.bb b/meta-phosphor/recipes-devtools/perl/yaml-tiny_1.73.bb index 46640c496..845242b4f 100644 --- a/meta-phosphor/recipes-devtools/perl/yaml-tiny_1.73.bb +++ b/meta-phosphor/recipes-devtools/perl/yaml-tiny_1.73.bb @@ -1,13 +1,14 @@ SUMMARY = "YAML::Tiny Version 1.73" PR = "r1" -LICENSE = "Artistic-1.0 | GPL-2.0" +LICENSE = "Artistic-1.0 | GPL-1.0+" HOMEPAGE = "https://metacpan.org/release/YAML-Tiny" inherit cpan inherit allarch LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ -file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" + SRC_URI += "https://cpan.metacpan.org/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz" diff --git a/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend b/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend index eafb15b6d..a7061c088 100644 --- a/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend +++ b/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend @@ -1,6 +1,7 @@ -EXTRA_OECONF_append += " --disable-largefile --disable-locale --disable-iconv \ - --without-included-popt --without-included-zlib" +EXTRA_OECONF_append_class-target += " --disable-largefile --disable-locale \ + --disable-iconv --without-included-popt \ + --without-included-zlib" PACKAGECONFIG = "" -DEPENDS_append = " popt zlib" +DEPENDS_append_class-target = " popt zlib" diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index 81be96641..89498893d 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 = "4b646236df12b52205d2098ef985280190b358a7" +SRCREV = "95874d930f0bcc8390cd47ab3bb1e5e46db45278" diff --git a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb index 98680382d..63bee1ea6 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 = "159a35604ab9f5d90264837b5681b0acee68b32c" +SRCREV = "a6f7ed7ae56e0ee02a647a4eb42e1b26afe3fe55" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb index db0ec884c..ee14d4491 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 = "01db662ac12b9dd97082b3e56e43ea164f77d310" +SRCREV = "eac9d47a91770fa47b9f857ea38a484048bcb31a" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb index c298f0112..e9c62f664 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "d2393f231c552524a51a9dc057b86679a82c51c3" +SRCREV = "ebd1d8a8294659c788e2822ddee1ca923791c531" inherit autotools \ pkgconfig \ diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service index 11373618b..c97b67bac 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service @@ -17,6 +17,7 @@ SyslogIdentifier=pgood_wait ExecStart=/bin/rm -f /run/openbmc/chassis@%i-on ExecStart=/bin/rm -f /run/openbmc/host@%i-on ExecStart=/bin/rm -f /run/openbmc/host@%i-request +ExecStart=/bin/rm -f /run/openbmc/mpreboot@%i [Install] WantedBy=obmc-host-stop@%i.target diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index d7d057656..9ce85a914 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 = "8152a1391854e3c736de7fd819ddfff7542297c3" +SRCREV = "e789bf12a49a8993c7d9b7a161494b58dab2dcf0" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" 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 4f1aa27d8..252b2fab5 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 = "1e1dc447321adf858d8f4c685764a2b01e8754bb" +SRCREV = "8af2a8940992c00417cf6629997c528f2500efbf" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" 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 e7c71d274..0efdc51a8 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 = "f9d1af68ad89d00a1ae74279cd8dbdf5455bda0e" +SRCREV = "ae956ad9efd2be24c5439a4ef6498fb5c8383719" # 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/dbus/phosphor-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb index 37b9f64b3..ca88023d9 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb @@ -6,8 +6,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-mapper +inherit native PHOSPHOR_MAPPER_CONFIGS = " \ phosphor-dbus-interfaces-mapper-config-native \ diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb index 8e2f02293..daa224141 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb @@ -26,7 +26,7 @@ SYSTEMD_SERVICE_${PN} += " \ " SRC_URI += "git://github.com/openbmc/phosphor-objmgr" -SRCREV = "e82b05840ba633d1f0d2e301720a5af6989c91f7" +SRCREV = "bb40bd36854dde1eb466a2bf093351496ce458bb" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index 6e6bcf3f4..98b4cf063 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 = "2f8e276c0b61f39f0fc197acef778149476fbd89" +SRCREV = "4c63ce5e2e507a0642e25d3e769ee8cb8638fbfe" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 321184111..9f672d15d 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 = "49d45bcdd3b7aef59d3a251e5a1302852cd23fdb" +SRCREV = "1d7379ea2264700ec4f9711ceac6ca113f9cb5d8" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service deleted file mode 100644 index e8a6f699a..000000000 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Fan Monitor Initialization -Wants=obmc-power-on@%i.target -After=obmc-power-on@%i.target -Conflicts=obmc-chassis-powered-off@%i.target - -[Service] -Restart=on-failure -ExecStart=/usr/bin/env phosphor-fan-monitor --init -SyslogIdentifier=phosphor-fan-monitor - -[Install] -WantedBy=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service deleted file mode 100644 index ddecfba3c..000000000 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Phosphor Fan Monitor Daemon -Conflicts=obmc-chassis-powered-off@%i.target - -[Service] -Restart=on-failure -ExecStart=/usr/bin/env phosphor-fan-monitor --monitor -SyslogIdentifier=phosphor-fan-monitor - -[Install] -RequiredBy=obmc-fan-control-ready@%i.target diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service deleted file mode 100644 index a324740c5..000000000 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Fan Presence Tach Daemon -Wants=obmc-power-on@%i.target -After=obmc-power-on@%i.target -Conflicts=obmc-chassis-powered-off@%i.target - -[Service] -Restart=on-failure -ExecStart=/usr/bin/env phosphor-fan-presence-tach -SyslogIdentifier=phosphor-fan-presence-tach - -[Install] -RequiredBy=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index 02eee307d..e13434eef 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -36,6 +36,9 @@ PACKAGE_BEFORE_PN += "${FAN_PACKAGES}" PACKAGECONFIG ?= "presence control monitor" SYSTEMD_PACKAGES = "${FAN_PACKAGES}" +# The control, monitor, and presence apps can either be JSON or YAML driven. +PACKAGECONFIG[json] = "--enable-json, --disable-json" + # -------------------------------------- # ${PN}-presence-tach specific configuration PACKAGECONFIG[presence] = " \ @@ -46,16 +49,21 @@ PACKAGECONFIG[presence] = " \ , \ " -# Needed to install into the obmc-chassis-poweron target +MULTI_USR_TGT = "multi-user.target" TMPL_TACH = "phosphor-fan-presence-tach@.service" INSTFMT_TACH = "phosphor-fan-presence-tach@{0}.service" POWERON_TGT = "obmc-chassis-poweron@{0}.target" FMT_TACH = "../${TMPL_TACH}:${POWERON_TGT}.requires/${INSTFMT_TACH}" +FMT_TACH_MUSR = "../${TMPL_TACH}:${MULTI_USR_TGT}.wants/${INSTFMT_TACH}" FILES_${PN}-presence-tach = "${bindir}/phosphor-fan-presence-tach" SYSTEMD_SERVICE_${PN}-presence-tach += "${TMPL_TACH}" SYSTEMD_LINK_${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" +# JSON mode also gets linked into multi-user +SYSTEMD_LINK_${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ + compose_list(d, 'FMT_TACH_MUSR', 'OBMC_CHASSIS_INSTANCES'), '', d)}" + # -------------------------------------- # ${PN}-control specific configuration PACKAGECONFIG[control] = "--enable-control \ @@ -97,17 +105,35 @@ PACKAGECONFIG[monitor] = "--enable-monitor \ TMPL_MONITOR = "phosphor-fan-monitor@.service" INSTFMT_MONITOR = "phosphor-fan-monitor@{0}.service" -FMT_MONITOR = "../${TMPL_MONITOR}:${FAN_CONTROL_TGT}.requires/${INSTFMT_MONITOR}" +FMT_MONITOR_FANSREADY = "../${TMPL_MONITOR}:${FAN_CONTROL_TGT}.requires/${INSTFMT_MONITOR}" +FMT_MONITOR_PWRON = "../${TMPL_MONITOR}:${POWERON_TGT}.requires/${INSTFMT_MONITOR}" +FMT_MONITOR_MUSR = "../${TMPL_MONITOR}:${MULTI_USR_TGT}.wants/${INSTFMT_MONITOR}" TMPL_MONITOR_INIT = "phosphor-fan-monitor-init@.service" INSTFMT_MONITOR_INIT = "phosphor-fan-monitor-init@{0}.service" FMT_MONITOR_INIT = "../${TMPL_MONITOR_INIT}:${POWERON_TGT}.wants/${INSTFMT_MONITOR_INIT}" FILES_${PN}-monitor = "${bindir}/phosphor-fan-monitor" -SYSTEMD_SERVICE_${PN}-monitor += "${TMPL_MONITOR} ${TMPL_MONITOR_INIT}" -SYSTEMD_LINK_${PN}-monitor += "${@compose_list(d, 'FMT_MONITOR', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-monitor += "${@compose_list(d, 'FMT_MONITOR_INIT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_SERVICE_${PN}-monitor += "${TMPL_MONITOR}" +SYSTEMD_SERVICE_${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', '', '${TMPL_MONITOR_INIT}', d)}" + +# JSON: power on and multi-user links. YAML: fans-ready and fan monitor init links +SYSTEMD_LINK_${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ + compose_list(d, 'FMT_MONITOR_PWRON', 'OBMC_CHASSIS_INSTANCES'), \ + compose_list(d, 'FMT_MONITOR_FANSREADY', 'OBMC_CHASSIS_INSTANCES'), d)}" + +SYSTEMD_LINK_${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ + compose_list(d, 'FMT_MONITOR_MUSR', 'OBMC_CHASSIS_INSTANCES'), \ + compose_list(d, 'FMT_MONITOR_INIT', 'OBMC_CHASSIS_INSTANCES'), d)}" # -------------------------------------- # phosphor-cooling-type specific configuration PACKAGECONFIG[cooling-type] = "--enable-cooling-type,--disable-cooling-type,," + +# -------------------------------------- +# ${PN}-sensor-monitor specific configuration +PACKAGECONFIG[sensor-monitor] = "--enable-sensor-monitor, --disable-sensor-monitor" + +FILES_sensor-monitor += " ${bindir}/sensor-monitor" +SYSTEMD_SERVICE_sensor-monitor += "sensor-monitor.service" +SYSTEMD_LINK_sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service" 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 d6d549f62..7c977c513 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 = "258530af96c8e729383e94716c0c4d275ab065f4" +SRCREV = "7a8d5a170004c9256e00ab4a605ebba5437921dd" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb index 806f07ca5..85e289687 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb @@ -4,8 +4,8 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-dbus-yaml +inherit native require phosphor-software-manager.inc diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 3ed1cfd0b..7eb09472e 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 = "42bd99361cdad9971e76c228bf83b7010fc7b249" +SRCREV = "1fd6dddf7d8203b04a0ff9878f74bc07ffdc0a1e" diff --git a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb index c51a66ffb..4ea8bdff4 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -20,7 +20,7 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-host-postd" -SRCREV = "c80e59fefb265eba9108bcf1356627b181c00926" +SRCREV = "ba5258f7158e8a0e61043290aff0873358509158" SNOOP_DEVICE ?= "aspeed-lpc-snoop0" POST_CODE_BYTES ?= "1" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 83e5cf9d8..d13af80a4 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,21 +13,26 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "ee135e246d8348048b5409b5ed0b81d9c1820c30" +SRCREV = "d8ef9915dda4d2e3b7aec885ebfa7debce61bff8" S = "${WORKDIR}/git" -DEPENDS = "openssl \ - zlib \ - boost \ - boost-url \ - libpam \ - sdbusplus \ - gtest \ - nlohmann-json \ - libtinyxml2 " - -RDEPENDS_${PN} += "jsnbd" +DEPENDS = " \ + openssl \ + zlib \ + boost \ + boost-url \ + libpam \ + sdbusplus \ + gtest \ + nlohmann-json \ + libtinyxml2 \ +" + +RDEPENDS_${PN} += " \ + jsnbd \ + phosphor-mapper \ +" FILES_${PN} += "${datadir}/** " diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc index 49c624725..6a8602758 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-inventory-manager" -SRCREV = "ee294d6838edbe88bd2e6e76184f4127b7cd8218" +SRCREV = "59521e87de8d3d74065628393bbadc4389e09600" 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 f96f4b17a..b523697fc 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 = "7d39eb04acdc6e654019adabda589bcbe0d91971" +SRCREV = "c7fa2c2803065fcae3e9540e57d2a28a5bc83ecc" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb index 5c3d278ef..afa543578 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb @@ -2,8 +2,8 @@ SUMMARY = "Sample hostfw inventory map for phosphor-ipmi-fru" PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-ipmi-fru +inherit native require phosphor-ipmi-fru.inc diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb index b113ba403..08425c13a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb @@ -2,8 +2,8 @@ SUMMARY = "Sample inventory map for phosphor-ipmi-fru" PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-ipmi-fru +inherit native require phosphor-ipmi-fru.inc diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb index 805b3a7c6..64bcbe3dd 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb @@ -2,9 +2,9 @@ SUMMARY = "Generate inventory map for phosphor-ipmi-fru from an MRW." PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-ipmi-fru inherit mrw-xml +inherit native require phosphor-ipmi-fru.inc diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb index d86b7e9f6..ec10b7db2 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb @@ -7,8 +7,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native DEPENDS += "virtual/phosphor-ipmi-fru-read-inventory" DEPENDS += "virtual/phosphor-ipmi-fru-read-bmc-inventory" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb index 5c1a4b4c0..8de3384ab 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb @@ -3,9 +3,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-fru inherit mrw-xml +inherit native SRC_URI += "file://config.yaml" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb index 5b56f6bd7..2caf218cb 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-fru +inherit native SRC_URI += "file://extra-properties.yaml" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb index dc696b138..d3b15c9f5 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native SRC_URI += "file://bmc-fru-config.yaml" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb index 96736c64a..e20520005 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb @@ -2,8 +2,8 @@ SUMMARY = "Sample inventory map for phosphor-ipmi-host" PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-ipmi-host +inherit native require phosphor-ipmi-host.inc diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb index 0f993e8e7..7a143a417 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb @@ -2,9 +2,9 @@ SUMMARY = "Generate inventory map for phosphor-ipmi-host from a MRW." PR = "r1" PV = "1.0+git${SRCPV}" -inherit native inherit phosphor-ipmi-host inherit mrw-xml +inherit native require phosphor-ipmi-host.inc diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb index 828648745..aad4aac1f 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native SRC_URI += "file://fru-config-not-sent-by-host.yaml" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb index a4e93e260..17c685e61 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb @@ -3,5 +3,5 @@ DESCRIPTION = "Whitelisted IPMI FRU Parser commands for OpenBMC" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host-whitelist +inherit native diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index ca71ae1ab..9ea92101d 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 = "da06d15cab1dd116d3279d66f70966f95afdf676" +SRCREV = "be0632321e2a0f4fbe7b0e9c1403121c4db37328" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb index 86a6411c7..8199cbf34 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb @@ -3,9 +3,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host inherit mrw-xml +inherit native SRC_URI += "file://config.yaml" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb index 2a0aab673..4deaf0de1 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native PROVIDES += "virtual/phosphor-ipmi-inventory-sel" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb index 76fff8e27..45604ced4 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native SRC_URI += "file://config.yaml" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb index c3666857c..fffadc1c3 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb @@ -3,10 +3,10 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host inherit python3native inherit mrw-xml +inherit native DEPENDS += " \ mrw-native \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb index 1f5df6d27..923227971 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-ipmi-host +inherit native PROVIDES += "virtual/phosphor-ipmi-sensor-inventory" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb index 4eeb6cec5..648bf2140 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit mrw-xml +inherit native PROVIDES += "virtual/phosphor-led-manager-config-native" DEPENDS += "mrw-native mrw-perl-tools-native" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb index a24476745..5d86f8aeb 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb @@ -4,8 +4,8 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-dbus-yaml +inherit native require phosphor-led-manager.inc diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 48de97a07..3e94ccc35 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 = "b00e56c26e9bf0563e6f40a1ed62219fdd72c382" +SRCREV = "616a0716970203cb77dc92301f0763043c5b461c" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb index 7362c792f..88baca5b0 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-logging +inherit native SRC_URI += "file://callouts.yaml" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb index 9515c6882..6bb86915e 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb @@ -3,9 +3,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-logging inherit mrw-xml +inherit native DEPENDS += " \ mrw-native \ diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 7c76d4c12..2bc141bb5 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 = "bc0c6190c2ddf840201722b7b0b12b305c479ee4" +SRCREV = "25d986c1e7d749d3f78da5a5e507d1f2bcbc7874" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb b/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb index b3e986adb..685e2369f 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 = "192752301b9d98b8699e88ede61d75e96eaed4bb" +SRCREV = "e889b19f4b349cd5c4ff186ff3c3b604c8f9c7b6" CONFFILES_${PN} = "${sysconfdir}/default/mctp" DEPENDS += "autoconf-archive-native \ diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb index b17b7f63a..d9776021e 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb @@ -6,8 +6,8 @@ PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" inherit obmc-xmlpatch -inherit native inherit mrw-xml +inherit native PHOSPHOR_MRW_LICENSE ?= "Apache-2.0" PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb index 97de44896..c507894c8 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" S = "${WORKDIR}/git" -inherit native inherit mrw-rev +inherit native DEPENDS += "python3-native python3-lxml-native" diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb index 0d79e39ee..95ce05ca3 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb @@ -6,9 +6,9 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" S = "${WORKDIR}/git" -inherit native inherit cpan_build inherit mrw-rev +inherit native DEPENDS += "libmodule-build-perl-native mrw-api-native yaml-tiny-native" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb index aa4c05b04..9c17974fc 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb @@ -12,7 +12,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/phosphor-snmp" -SRCREV = "e5d90c3575a832b971c8139bcb016a444a0336fb" +SRCREV = "0d5094bf65f5102af6fc896e60a6fc6fbb1770b5" DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.SNMP.service" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index c9f815444..f3c46b069 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 = "c0d487590894e5fb03eea48698b43a7c90697b38" +SRCREV = "bcabadac18a072cecce76b0e7038f2978f9025b1" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index c357cc38a..47b5b467c 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 = "a528a28156a129486a917ac6d9849223ecef15c8" +SRCREV = "81d6cde458c554c6cc71793eb0ed38edc58043a6" 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 df7bb83cf..c52e8e149 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 = "dbd77b9200c27d129443a7c567ec5a58e55bfeac" +SRCREV = "aaffc124b6f49d9bc267e65565bdd5d4c1db1aaf" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 4960f16d2..8302675e8 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 = "a0683a889a12bf665595ccdcb349c5f4ab321eea" +SRCREV = "d05867c0d32065d36b13bd452f7aff9dcb20ac2f" PV = "0.1+git${SRCPV}" 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 28acc172a..68c9f74d5 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 = "b306b03dae93cb74e3deeed0ef56d9b60f5d7229" +SRCREV = "2b56ddb38d7446281c18786b5e280ae30f5f7b35" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "phosphor-virtual-sensor.service" diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb index eaf9fba4a..77693af4d 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-settings-manager +inherit native SRC_URI += "file://defaults.yaml" 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 32b32e840..a4119e6cc 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml @@ -62,7 +62,7 @@ - Interface: xyz.openbmc_project.Control.Power.RestorePolicy Properties: PowerRestorePolicy: - Default: RestorePolicy::Policy::AlwaysOff + Default: RestorePolicy::Policy::None /xyz/openbmc_project/time/sync_method: - Interface: xyz.openbmc_project.Time.Synchronization diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb index 7490d54d2..a67d6819d 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb @@ -7,9 +7,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit phosphor-settings-manager inherit mrw-xml +inherit native DEPENDS += "mrw-native mrw-perl-tools-native" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb index 075e06c3c..699c3e1db 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb @@ -4,7 +4,7 @@ interface /xyz/openbmc_project/state/boot/raw by snoopd daemon and save them \ in a file under /var/lib for history." SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git" -SRCREV = "fd45f78858304f67a0e80224a99cbe76eed82af0" +SRCREV = "84a4c19c48ad28b537cfcce15df39e841e1ed565" S = "${WORKDIR}/git" 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 b8785a256..de7e5d894 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -14,6 +14,7 @@ STATE_MGR_PACKAGES = " \ ${PN}-host \ ${PN}-chassis \ ${PN}-bmc \ + ${PN}-hypervisor \ ${PN}-discover \ ${PN}-host-check \ ${PN}-reset-sensor-states \ @@ -70,6 +71,9 @@ FILES_${PN}-chassis += "${bindir}/obmcutil" FILES_${PN}-bmc = "${bindir}/phosphor-bmc-state-manager" DBUS_SERVICE_${PN}-bmc += "xyz.openbmc_project.State.BMC.service" +FILES_${PN}-hypervisor = "${bindir}/phosphor-hypervisor-state-manager" +DBUS_SERVICE_${PN}-hypervisor += "xyz.openbmc_project.State.Hypervisor.service" + FILES_${PN}-discover = "${bindir}/phosphor-discover-system-state" SYSTEMD_SERVICE_${PN}-discover += "phosphor-discover-system-state@.service" @@ -176,6 +180,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 = "58477b52876afe889caa7d7ec89ce3fadb384ead" +SRCREV = "35ca2e34cd04b7288a5b659e4e7dcd4590056b7d" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index f44eacc35..5986cf052 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 = "9f14591205aa47cf3e99c44cc8a0469cb87ed8da" +SRCREV = "9f9ff90a39219ff3a2f1179f74fc9a6dc857e5ab" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb index 941080081..903678f4f 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -36,5 +36,5 @@ DBUS_SERVICE_phosphor-ldap = " \ xyz.openbmc_project.LDAP.PrivilegeMapper.service \ " SRC_URI += "git://github.com/openbmc/phosphor-user-manager" -SRCREV = "703131fa01422bc28675f5d629edb98d285a1bc4" +SRCREV = "9638afb9aa848aa0e696c2447e0fbc70a0aa5eed" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 46aacc135..14d3e66a4 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "d10511f2a7fc07910d7ca517bd73331763322fa0" +SRCREV = "339db9a4c8610c5ecb92993c0bbc2219933bc858" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index b7d6a269a..f03efc473 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 = "8026797012a0cbdce357a5c47304134fec9eca73" +SRCREV = "7006806d21cf8d13666524a8124b8395f2f1e156" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " diff --git a/meta-phosphor/recipes-textproc/json-perl/json-perl_2.97001.bb b/meta-phosphor/recipes-textproc/json-perl/json-perl_2.97001.bb index 9196e8e57..bfa09ded6 100644 --- a/meta-phosphor/recipes-textproc/json-perl/json-perl_2.97001.bb +++ b/meta-phosphor/recipes-textproc/json-perl/json-perl_2.97001.bb @@ -10,14 +10,14 @@ bundled in the same distribution as this module. You can also explicitly \ specify to use Cpanel::JSON::XS, a fork of JSON::XS by Reini Urban." SECTION = "libs" -LICENSE = "Artisticv1 | GPLv1+" +LICENSE = "Artistic-1.0 | GPL-1.0+" PR = "r0" MAINTAINER= "Poky <poky@yoctoproject.org>" HOMEPAGE= "https://metacpan.org/release/JSON" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ -file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d" +file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" SRC_URI = "https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/JSON-2.97001.tar.gz" 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 3713ff733..c5788d00e 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 = "7c8d19cbcd2f444f112c4a78ac4ea7c64d000ee6" +SRCREV = "22e0bec01e283819c13310640918c89f4a74fb56" PV = "1.0+git${SRCPV}" diff --git a/meta-quanta/meta-gbs/conf/local.conf.sample b/meta-quanta/meta-gbs/conf/local.conf.sample index 02e786914..787ab301b 100644 --- a/meta-quanta/meta-gbs/conf/local.conf.sample +++ b/meta-quanta/meta-gbs/conf/local.conf.sample @@ -1,5 +1,5 @@ MACHINE ??= "gbs" -DISTRO ?= "openbmc-phosphor" +DISTRO ?= "gbmc" PACKAGE_CLASSES ?= "package_rpm" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index d5a6e7859..241905262 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -10,6 +10,8 @@ MACHINEOVERRIDES .= ":npcm7xx" require conf/machine/include/npcm7xx.inc require conf/machine/include/obmc-bsp-common.inc +GBMC_NCSI_IF_NAME = "eth0" + # Overwrite flash offsets FLASH_ROFS_OFFSET = "7296" FLASH_RWFS_OFFSET = "61440" diff --git a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json index c4bdbdddd..e28c0be0f 100644 --- a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json +++ b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json @@ -11,7 +11,7 @@ "path": "", "sysLabel": "", "targetTemp": -1, - "targetTempOffset": -13000, + "targetTempOffset": -15000, "scalar": 1.0 } }, @@ -22,11 +22,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme0", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp00, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -37,11 +37,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme1", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp01, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -52,11 +52,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme2", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp02, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -67,11 +67,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme3", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp03, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -82,11 +82,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme4", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp04, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -97,11 +97,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme5", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp05, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -112,11 +112,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme6", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp06, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -127,11 +127,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme7", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp07, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -142,11 +142,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme8", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp08, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -157,11 +157,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme9", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp09, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -172,11 +172,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme10", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp10, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -187,11 +187,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme11", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp11, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -202,11 +202,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme12", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp12, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -217,11 +217,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme13", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp13, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -232,11 +232,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme14", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp14, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, @@ -247,11 +247,11 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme15", "parameters": { "type": "", - "maxTemp": 77000, + "maxTemp": WCTemp15, "path": "", "sysLabel": "", - "targetTemp": 67000, - "targetTempOffset": 0, + "targetTemp": -1, + "targetTempOffset": -7000, "scalar": 1.0 } }, diff --git a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh index 2e44479f6..d0cb2f632 100644 --- a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh +++ b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh @@ -20,6 +20,31 @@ do mapper wait $path done +nvmePath="/xyz/openbmc_project/sensors/temperature/nvme" +nvmeInventoryPath="/xyz/openbmc_project/inventory/system/chassis/motherboard/nvme" +# Get and Set WCTEMP +for ((i = 0; i < 16; i++)); do + name=WCTemp$(printf "%02d" $i) + wcTemp=72000 + presentState=$(busctl get-property \ + xyz.openbmc_project.Inventory.Manager \ + ${nvmeInventoryPath}${i} \ + xyz.openbmc_project.Inventory.Item \ + Present | awk '{print $2}') + + if [[ $presentState == "true" ]]; then + wcTemp=$( + busctl get-property xyz.openbmc_project.nvme.manager \ + ${nvmePath}${i} \ + xyz.openbmc_project.Sensor.Threshold.Critical \ + CriticalHigh | awk '{print $2}' + ) + wcTemp=$((wcTemp * 1000)) + fi + + sed -i "s/$name/${wcTemp}/g" $MARGIN_TABLE_FILE +done + # start read margin temp /usr/bin/read-margin-temp & diff --git a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend index d4f56847e..7d217b7d9 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,3 +1,5 @@ +OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " quanta-nvme-powerctrl" +OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-nvme" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-pid-control" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " detect-fan-fail" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " google-ipmi-sys" diff --git a/meta-raspberrypi/.gitignore b/meta-raspberrypi/.gitignore index 706144a55..073cf0615 100644 --- a/meta-raspberrypi/.gitignore +++ b/meta-raspberrypi/.gitignore @@ -5,3 +5,4 @@ build* *.rej *.log docs/_build +/layers diff --git a/meta-raspberrypi/classes/sdcard_image-rpi.bbclass b/meta-raspberrypi/classes/sdcard_image-rpi.bbclass index 0ae98cdab..e803a0da9 100644 --- a/meta-raspberrypi/classes/sdcard_image-rpi.bbclass +++ b/meta-raspberrypi/classes/sdcard_image-rpi.bbclass @@ -13,14 +13,14 @@ inherit image_types # Default Free space = 1.3x # Use IMAGE_OVERHEAD_FACTOR to add more space # <---------> -# 4MiB 40MiB SDIMG_ROOTFS +# 4MiB 48MiB SDIMG_ROOTFS # <-----------------------> <----------> <----------------------> # ------------------------ ------------ ------------------------ # | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE | # ------------------------ ------------ ------------------------ # ^ ^ ^ ^ # | | | | -# 0 4MiB 4MiB + 40MiB 4MiB + 40Mib + SDIMG_ROOTFS +# 0 4MiB 4MiB + 48MiB 4MiB + 48Mib + SDIMG_ROOTFS # This image depends on the rootfs image IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" @@ -31,10 +31,12 @@ SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img" SDIMG_KERNELIMAGE_raspberrypi3-64 ?= "kernel8.img" # Boot partition volume id -BOOTDD_VOLUME_ID ?= "${MACHINE}" +# Shorten raspberrypi to just rpi to keep it under 11 characters +# now enforced by mkfs.vfat from dosfstools-4.2 +BOOTDD_VOLUME_ID ?= "${@d.getVar('MACHINE').replace('raspberrypi', 'rpi')}" # Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT) -BOOT_SPACE ?= "40960" +BOOT_SPACE ?= "49152" # Set alignment to 4MB [in KiB] IMAGE_ROOTFS_ALIGNMENT = "4096" diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index 18368c621..8b33a0fb7 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -18,46 +18,55 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/at86rf233.dtbo \ overlays/disable-bt.dtbo \ overlays/dwc2.dtbo \ + overlays/gpio-ir.dtbo \ + overlays/gpio-ir-tx.dtbo \ overlays/gpio-key.dtbo \ overlays/hifiberry-amp.dtbo \ overlays/hifiberry-dac.dtbo \ overlays/hifiberry-dacplus.dtbo \ overlays/hifiberry-digi.dtbo \ + overlays/justboom-both.dtbo \ + overlays/justboom-dac.dtbo \ + overlays/justboom-digi.dtbo \ overlays/i2c-rtc.dtbo \ + overlays/imx219.dtbo \ overlays/iqaudio-dac.dtbo \ overlays/iqaudio-dacplus.dtbo \ - overlays/miniuart-bt.dtbo \ overlays/mcp2515-can0.dtbo \ overlays/mcp2515-can1.dtbo \ + overlays/miniuart-bt.dtbo \ overlays/pitft22.dtbo \ - overlays/pitft28-resistive.dtbo \ overlays/pitft28-capacitive.dtbo \ + overlays/pitft28-resistive.dtbo \ overlays/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ overlays/rpi-ft5406.dtbo \ overlays/rpi-poe.dtbo \ - overlays/vc4-kms-v3d.dtbo \ overlays/vc4-fkms-v3d.dtbo \ - overlays/w1-gpio-pullup.dtbo \ + overlays/vc4-kms-v3d.dtbo \ + overlays/vc4-kms-dsi-7inch.dtbo \ overlays/w1-gpio.dtbo \ - overlays/gpio-ir.dtbo \ - overlays/gpio-ir-tx.dtbo \ - overlays/imx219.dtbo \ + overlays/w1-gpio-pullup.dtbo \ " RPI_KERNEL_DEVICETREE ?= " \ + bcm2708-rpi-zero.dtb \ bcm2708-rpi-zero-w.dtb \ bcm2708-rpi-b.dtb \ + bcm2708-rpi-b-rev1.dtb \ bcm2708-rpi-b-plus.dtb \ bcm2709-rpi-2-b.dtb \ + bcm2710-rpi-2-b.dtb \ bcm2710-rpi-3-b.dtb \ bcm2710-rpi-3-b-plus.dtb \ bcm2711-rpi-4-b.dtb \ + bcm2711-rpi-400.dtb \ bcm2708-rpi-cm.dtb \ bcm2710-rpi-cm3.dtb \ + bcm2711-rpi-cm4.dtb \ " -KERNEL_DEVICETREE ?= " \ +KERNEL_DEVICETREE ??= " \ ${RPI_KERNEL_DEVICETREE} \ ${RPI_KERNEL_DEVICETREE_OVERLAYS} \ " diff --git a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc index 181b9364b..c02d24879 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc @@ -1,6 +1,6 @@ # RaspberryPi BSP default providers -PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi" +PREFERRED_PROVIDER_virtual/kernel ??= "linux-raspberrypi" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" diff --git a/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc b/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc index e57c702b3..17d5bd6d5 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc @@ -1,3 +1,3 @@ # RaspberryPi BSP default versions -PREFERRED_VERSION_linux-raspberrypi ??= "5.4.%" +PREFERRED_VERSION_linux-raspberrypi ??= "5.10.%" diff --git a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf index 65e3302c3..539413219 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf @@ -18,11 +18,12 @@ RPI_KERNEL_DEVICETREE = " \ broadcom/bcm2710-rpi-3-b.dtb \ broadcom/bcm2710-rpi-3-b-plus.dtb \ broadcom/bcm2837-rpi-3-b.dtb \ + broadcom/bcm2710-rpi-cm3.dtb \ " SERIAL_CONSOLES ?= "115200;ttyS0" -UBOOT_MACHINE = "rpi_3_config" +UBOOT_MACHINE = "rpi_arm64_config" # When u-boot is enabled we need to use the "Image" format and the "booti" # command to load the kernel diff --git a/meta-raspberrypi/conf/machine/raspberrypi4-64.conf b/meta-raspberrypi/conf/machine/raspberrypi4-64.conf index 633d18801..12c8954d9 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi4-64.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi4-64.conf @@ -15,12 +15,14 @@ include conf/machine/include/rpi-base.inc RPI_KERNEL_DEVICETREE = " \ broadcom/bcm2711-rpi-4-b.dtb \ + broadcom/bcm2711-rpi-400.dtb \ + broadcom/bcm2711-rpi-cm4.dtb \ " SDIMG_KERNELIMAGE ?= "kernel8.img" SERIAL_CONSOLES ?= "115200;ttyS0" -UBOOT_MACHINE = "rpi_4_config" +UBOOT_MACHINE = "rpi_arm64_config" VC4DTBO ?= "vc4-fkms-v3d" @@ -31,6 +33,4 @@ KERNEL_IMAGETYPE_UBOOT ?= "Image" KERNEL_IMAGETYPE_DIRECT ?= "Image" KERNEL_BOOTCMD ?= "booti" -RPI_EXTRA_CONFIG ?= "\n# Force arm in 64bit mode. See: https://github.com/raspberrypi/firmware/issues/1193.\narm_64bit=1" - ARMSTUB ?= "armstub8-gic.bin" diff --git a/meta-raspberrypi/docs/extra-build-config.md b/meta-raspberrypi/docs/extra-build-config.md index 921dcc599..1caf904fd 100644 --- a/meta-raspberrypi/docs/extra-build-config.md +++ b/meta-raspberrypi/docs/extra-build-config.md @@ -269,6 +269,15 @@ local.conf: ENABLE_DWC2_PERIPHERAL = "1" +## Enable USB host support + +By default in case of the Compute Module 4 IO Board the standard USB driver +that usually supports host mode operations is disabled for power saving reasons. +Users who want to use the 2 USB built-in ports or the other ports provided via +the header extension should set the following in local.conf: + + ENABLE_DWC2_HOST = "1" + ## Enable Openlabs 802.15.4 radio module When using device tree kernels, set this variable to enable the 802.15.4 hat: diff --git a/meta-raspberrypi/kas-poky-rpi.yml b/meta-raspberrypi/kas-poky-rpi.yml index 2d80a57ed..d629e817f 100644 --- a/meta-raspberrypi/kas-poky-rpi.yml +++ b/meta-raspberrypi/kas-poky-rpi.yml @@ -11,6 +11,7 @@ repos: poky: url: https://git.yoctoproject.org/git/poky + path: layers/poky refspec: master layers: meta: @@ -19,6 +20,7 @@ repos: meta-openembedded: url: http://git.openembedded.org/meta-openembedded + path: layers/meta-openembedded refspec: master layers: meta-oe: @@ -28,6 +30,7 @@ repos: meta-qt5: url: https://github.com/meta-qt5/meta-qt5/ + path: layers/meta-qt5 refspec: master bblayers_conf_header: diff --git a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb index 97db4e36f..40a9949a1 100644 --- a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb +++ b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb @@ -37,7 +37,7 @@ CMDLINE = " \ " do_compile() { - echo "${CMDLINE}" > "${WORKDIR}/cmdline.txt" + echo "${@' '.join('${CMDLINE}'.split())}" > "${WORKDIR}/cmdline.txt" } do_deploy() { diff --git a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb index e1c330db1..de43c4b36 100644 --- a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb +++ b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb @@ -34,210 +34,220 @@ inherit deploy nopackages do_deploy() { install -d ${DEPLOYDIR}/${BOOTFILES_DIR_NAME} + CONFIG=${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - cp ${S}/config.txt ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/ + cp ${S}/config.txt $CONFIG if [ -n "${KEY_DECODE_MPG2}" ]; then - sed -i '/#decode_MPG2=/ c\decode_MPG2=${KEY_DECODE_MPG2}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#decode_MPG2=/ c\decode_MPG2=${KEY_DECODE_MPG2}' $CONFIG fi if [ -n "${KEY_DECODE_WVC1}" ]; then - sed -i '/#decode_WVC1=/ c\decode_WVC1=${KEY_DECODE_WVC1}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#decode_WVC1=/ c\decode_WVC1=${KEY_DECODE_WVC1}' $CONFIG fi if [ -n "${DISABLE_OVERSCAN}" ]; then - sed -i '/#disable_overscan=/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#disable_overscan=/ c\disable_overscan=${DISABLE_OVERSCAN}' $CONFIG fi if [ "${DISABLE_SPLASH}" = "1" ]; then - sed -i '/#disable_splash=/ c\disable_splash=${DISABLE_SPLASH}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#disable_splash=/ c\disable_splash=${DISABLE_SPLASH}' $CONFIG fi # Set overclocking options if [ -n "${ARM_FREQ}" ]; then - sed -i '/#arm_freq=/ c\arm_freq=${ARM_FREQ}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#arm_freq=/ c\arm_freq=${ARM_FREQ}' $CONFIG fi if [ -n "${GPU_FREQ}" ]; then - sed -i '/#gpu_freq=/ c\gpu_freq=${GPU_FREQ}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#gpu_freq=/ c\gpu_freq=${GPU_FREQ}' $CONFIG fi if [ -n "${CORE_FREQ}" ]; then - sed -i '/#core_freq=/ c\core_freq=${CORE_FREQ}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#core_freq=/ c\core_freq=${CORE_FREQ}' $CONFIG fi if [ -n "${SDRAM_FREQ}" ]; then - sed -i '/#sdram_freq=/ c\sdram_freq=${SDRAM_FREQ}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#sdram_freq=/ c\sdram_freq=${SDRAM_FREQ}' $CONFIG fi if [ -n "${OVER_VOLTAGE}" ]; then - sed -i '/#over_voltage=/ c\over_voltage=${OVER_VOLTAGE}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#over_voltage=/ c\over_voltage=${OVER_VOLTAGE}' $CONFIG fi # GPU memory if [ -n "${GPU_MEM}" ]; then - sed -i '/#gpu_mem=/ c\gpu_mem=${GPU_MEM}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#gpu_mem=/ c\gpu_mem=${GPU_MEM}' $CONFIG fi if [ -n "${GPU_MEM_256}" ]; then - sed -i '/#gpu_mem_256=/ c\gpu_mem_256=${GPU_MEM_256}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#gpu_mem_256=/ c\gpu_mem_256=${GPU_MEM_256}' $CONFIG fi if [ -n "${GPU_MEM_512}" ]; then - sed -i '/#gpu_mem_512=/ c\gpu_mem_512=${GPU_MEM_512}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#gpu_mem_512=/ c\gpu_mem_512=${GPU_MEM_512}' $CONFIG fi if [ -n "${GPU_MEM_1024}" ]; then - sed -i '/#gpu_mem_1024=/ c\gpu_mem_1024=${GPU_MEM_1024}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#gpu_mem_1024=/ c\gpu_mem_1024=${GPU_MEM_1024}' $CONFIG fi # Set boot delay if [ -n "${BOOT_DELAY}" ]; then - sed -i '/#boot_delay=/ c\boot_delay=${BOOT_DELAY}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#boot_delay=/ c\boot_delay=${BOOT_DELAY}' $CONFIG fi if [ -n "${BOOT_DELAY_MS}" ]; then - sed -i '/#boot_delay_ms=/ c\boot_delay_ms=${BOOT_DELAY_MS}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#boot_delay_ms=/ c\boot_delay_ms=${BOOT_DELAY_MS}' $CONFIG fi # Set HDMI and composite video options if [ -n "${HDMI_FORCE_HOTPLUG}" ]; then - sed -i '/#hdmi_force_hotplug=/ c\hdmi_force_hotplug=${HDMI_FORCE_HOTPLUG}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#hdmi_force_hotplug=/ c\hdmi_force_hotplug=${HDMI_FORCE_HOTPLUG}' $CONFIG fi if [ -n "${HDMI_DRIVE}" ]; then - sed -i '/#hdmi_drive=/ c\hdmi_drive=${HDMI_DRIVE}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#hdmi_drive=/ c\hdmi_drive=${HDMI_DRIVE}' $CONFIG fi if [ -n "${HDMI_GROUP}" ]; then - sed -i '/#hdmi_group=/ c\hdmi_group=${HDMI_GROUP}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#hdmi_group=/ c\hdmi_group=${HDMI_GROUP}' $CONFIG fi if [ -n "${HDMI_MODE}" ]; then - sed -i '/#hdmi_mode=/ c\hdmi_mode=${HDMI_MODE}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#hdmi_mode=/ c\hdmi_mode=${HDMI_MODE}' $CONFIG fi if [ -n "${CONFIG_HDMI_BOOST}" ]; then - sed -i '/#config_hdmi_boost=/ c\config_hdmi_boost=${CONFIG_HDMI_BOOST}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#config_hdmi_boost=/ c\config_hdmi_boost=${CONFIG_HDMI_BOOST}' $CONFIG fi if [ -n "${SDTV_MODE}" ]; then - sed -i '/#sdtv_mode=/ c\sdtv_mode=${SDTV_MODE}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#sdtv_mode=/ c\sdtv_mode=${SDTV_MODE}' $CONFIG fi if [ -n "${SDTV_ASPECT}" ]; then - sed -i '/#sdtv_aspect=/ c\sdtv_aspect=${SDTV_ASPECT}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#sdtv_aspect=/ c\sdtv_aspect=${SDTV_ASPECT}' $CONFIG fi if [ -n "${DISPLAY_ROTATE}" ]; then - sed -i '/#display_rotate=/ c\display_rotate=${DISPLAY_ROTATE}' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + sed -i '/#display_rotate=/ c\display_rotate=${DISPLAY_ROTATE}' $CONFIG fi # Video camera support if [ "${VIDEO_CAMERA}" = "1" ]; then - echo "# Enable video camera" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "start_x=1" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + # TODO: It has been observed that Raspberry Pi 4B 4GB may fail to enable the camera if "start_x=1" is at the end + # of the file. The underlying cause is unknown, but it can be related with a file size limitation affecting + # this variable. Therefore, "start_x=1" has been set to replace the original occurrence in config.txt, + # which is at the middle of the file. + sed -i '/#start_x=/ c\start_x=1' $CONFIG fi # Offline compositing support if [ "${DISPMANX_OFFLINE}" = "1" ]; then - echo "# Enable offline compositing" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dispmanx_offline=1" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable offline compositing" >>$CONFIG + echo "dispmanx_offline=1" >>$CONFIG fi # SPI bus support if [ "${ENABLE_SPI_BUS}" = "1" ] || [ "${PITFT}" = "1" ]; then - echo "# Enable SPI bus" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtparam=spi=on" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable SPI bus" >>$CONFIG + echo "dtparam=spi=on" >>$CONFIG fi # I2C support if [ "${ENABLE_I2C}" = "1" ] || [ "${PITFT}" = "1" ]; then - echo "# Enable I2C" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtparam=i2c1=on" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtparam=i2c_arm=on" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable I2C" >>$CONFIG + echo "dtparam=i2c1=on" >>$CONFIG + echo "dtparam=i2c_arm=on" >>$CONFIG fi # PiTFT22 display support if [ "${PITFT22}" = "1" ]; then - echo "# Enable PITFT22 display" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=pitft22,rotate=270,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable PITFT22 display" >>$CONFIG + echo "dtoverlay=pitft22,rotate=270,speed=32000000,txbuflen=32768" >>$CONFIG fi if [ "${PITFT28r}" = "1" ]; then - echo "# Enable PITFT28r display" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=pitft28-resistive,rotate=90,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable PITFT28r display" >>$CONFIG + echo "dtoverlay=pitft28-resistive,rotate=90,speed=32000000,txbuflen=32768" >>$CONFIG fi if [ "${PITFT28c}" = "1" ]; then - echo "# Enable PITFT28c display" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=pitft28-capacitive,rotate=90,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=pitft28-capacitive,touch-swapxy,touch-invx" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable PITFT28c display" >>$CONFIG + echo "dtoverlay=pitft28-capacitive,rotate=90,speed=32000000,txbuflen=32768" >>$CONFIG + echo "dtoverlay=pitft28-capacitive,touch-swapxy,touch-invx" >>$CONFIG fi if [ "${PITFT35r}" = "1" ]; then - echo "# Enable PITFT35r display" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=pitft35-resistive,rotate=90,speed=42000000,fps=20" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable PITFT35r display" >>$CONFIG + echo "dtoverlay=pitft35-resistive,rotate=90,speed=42000000,fps=20" >>$CONFIG fi # UART support if [ "${ENABLE_UART}" = "1" ]; then - echo "# Enable UART" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "enable_uart=1" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable UART" >>$CONFIG + echo "enable_uart=1" >>$CONFIG fi # Infrared support if [ "${ENABLE_IR}" = "1" ]; then - echo "# Enable infrared" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=gpio-ir,gpio_pin=${GPIO_IR}" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=gpio-ir-tx,gpio_pin=${GPIO_IR_TX}" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable infrared" >>$CONFIG + echo "dtoverlay=gpio-ir,gpio_pin=${GPIO_IR}" >>$CONFIG + echo "dtoverlay=gpio-ir-tx,gpio_pin=${GPIO_IR_TX}" >>$CONFIG fi # VC4 Graphics support if [ "${VC4GRAPHICS}" = "1" ]; then - echo "# Enable VC4 Graphics" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=${VC4DTBO}" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable VC4 Graphics" >> $CONFIG + echo "dtoverlay=${VC4DTBO}" >> $CONFIG fi # Choose Camera Sensor to be used, default imx219 sensor if [ "${RASPBERRYPI_CAMERA_V2}" = "1" ]; then - echo "# Enable Sony RaspberryPi Camera" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=imx219" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable Sony RaspberryPi Camera" >> $CONFIG + echo "dtoverlay=imx219" >> $CONFIG fi # Waveshare "C" 1024x600 7" Rev2.1 IPS capacitive touch (http://www.waveshare.com/7inch-HDMI-LCD-C.htm) if [ "${WAVESHARE_1024X600_C_2_1}" = "1" ]; then - echo "# Waveshare \"C\" 1024x600 7\" Rev2.1 IPS capacitive touch screen" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "max_usb_current=1" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "hdmi_group=2" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "hdmi_mode=87" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "hdmi_cvt 1024 600 60 6 0 0 0" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "hdmi_drive=1" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Waveshare \"C\" 1024x600 7\" Rev2.1 IPS capacitive touch screen" >> $CONFIG + echo "max_usb_current=1" >> $CONFIG + echo "hdmi_group=2" >> $CONFIG + echo "hdmi_mode=87" >> $CONFIG + echo "hdmi_cvt 1024 600 60 6 0 0 0" >> $CONFIG + echo "hdmi_drive=1" >> $CONFIG fi # DWC2 USB peripheral support if [ "${ENABLE_DWC2_PERIPHERAL}" = "1" ]; then - echo "# Enable USB peripheral mode" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=dwc2,dr_mode=peripheral" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable USB peripheral mode" >> $CONFIG + echo "dtoverlay=dwc2,dr_mode=peripheral" >> $CONFIG + fi + + # DWC2 USB host mode support + if [ "${ENABLE_DWC2_HOST}" = "1" ]; then + echo "# Enable USB host mode" >> $CONFIG + echo "dtoverlay=dwc2,dr_mode=host" >> $CONFIG fi # AT86RF23X support if [ "${ENABLE_AT86RF}" = "1" ]; then - echo "# Enable AT86RF23X" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=at86rf233,speed=3000000" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable AT86RF23X" >>$CONFIG + echo "dtoverlay=at86rf233,speed=3000000" >>$CONFIG fi # ENABLE DUAL CAN if [ "${ENABLE_DUAL_CAN}" = "1" ]; then - echo "# Enable DUAL CAN" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=25" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=mcp2515-can1,oscillator=${CAN_OSCILLATOR},interrupt=24" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable DUAL CAN" >>$CONFIG + echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=25" >>$CONFIG + echo "dtoverlay=mcp2515-can1,oscillator=${CAN_OSCILLATOR},interrupt=24" >>$CONFIG # ENABLE CAN elif [ "${ENABLE_CAN}" = "1" ]; then - echo "# Enable CAN" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=25" >>${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable CAN" >>$CONFIG + echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=25" >>$CONFIG fi # Append extra config if the user has provided any - printf "${RPI_EXTRA_CONFIG}\n" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + printf "${RPI_EXTRA_CONFIG}\n" >> $CONFIG # Handle setup with armstub file if [ "${@bb.utils.contains("MACHINE_FEATURES", "armstub", "1", "0", d)}" = "1" ]; then - echo "\n# ARM stub configuration" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "armstub=${ARMSTUB}" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "\n# ARM stub configuration" >> $CONFIG + echo "armstub=${ARMSTUB}" >> $CONFIG case "${ARMSTUB}" in *-gic.bin) - echo "enable_gic=1" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "enable_gic=1" >> $CONFIG ;; esac fi } do_deploy_append_raspberrypi3-64() { - echo "# have a properly sized image" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "disable_overscan=1" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# have a properly sized image" >> $CONFIG + echo "disable_overscan=1" >> $CONFIG - echo "# Enable audio (loads snd_bcm2835)" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt - echo "dtparam=audio=on" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt + echo "# Enable audio (loads snd_bcm2835)" >> $CONFIG + echo "dtparam=audio=on" >> $CONFIG } addtask deploy before do_build after do_install diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index 649c7ea97..591c6157f 100644 --- a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc +++ b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc @@ -1,9 +1,9 @@ -RPIFW_DATE ?= "20201123" -SRCREV ?= "8f13114b9ea29bd004151d4a8afa500b2df721be" +RPIFW_DATE ?= "20210205" +SRCREV ?= "7d91570f20378afc9414107dccdad70705a8a342" RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/${SRCREV}.tar.gz;downloadfilename=raspberrypi-firmware-${SRCREV}.tar.gz" RPIFW_S ?= "${WORKDIR}/firmware-${SRCREV}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[sha256sum] = "f9be0cc177aae7dddaa0a2967d090ea33a95be9dd519d2eee3bc740af8ffb19e" +SRC_URI[sha256sum] = "2cc9bf2cbcab8283db2eb53ed2a49372b70fe76538994c32f6d261e2da3e9ff4" PV = "${RPIFW_DATE}" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb new file mode 100644 index 000000000..7d3120f76 --- /dev/null +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb @@ -0,0 +1,30 @@ +SUMMARY = "CircuitPython APIs for non-CircuitPython versions of Python such as CPython on Linux and MicroPython." +HOMEPAGE = "https://github.com/adafruit/Adafruit_Blinka" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=660e614bc7efb0697cc793d8a22a55c2" + +SRC_URI = "git://github.com/adafruit/Adafruit_Blinka.git" +SRCREV = "dc688f354fe779c9267c208b99f310af87e79272" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += "python3-setuptools-scm-native" + +do_install_append() { +# it ships ./bcm283x/pulseio/libgpiod_pulsein which is a prebuilt +# 32bit binary therefore we should make this specific to 32bit rpi machines (based on bcm283x) only + if [ ${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '1', '0', d)} = "0" ]; then + rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/adafruit_blinka/microcontroller/bcm283x + fi +} + +RDEPENDS_${PN} += " \ + libgpiod \ + python3-adafruit-platformdetect \ + python3-adafruit-pureio \ + python3-core \ +" + +RDEPENDS_${PN}_append_rpi = " rpi-gpio" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb new file mode 100644 index 000000000..c14d6f3d6 --- /dev/null +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb @@ -0,0 +1,18 @@ +SUMMARY = "CircuitPython bus device classes to manage bus sharing." +HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_BusDevice" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec69d6e9e6c85adfb7799d7f8cf044e" + +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git" +SRCREV = "1bfe8005293205e2f7b2cc498ab5a946f1133b40" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += "python3-setuptools-scm-native" + +RDEPENDS_${PN} += " \ + python3-adafruit-blinka \ + python3-core \ +" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb new file mode 100644 index 000000000..e05e2ab5e --- /dev/null +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb @@ -0,0 +1,18 @@ +SUMMARY = "CircuitPython helper library provides higher level objects to control motors and servos." +HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_Motor" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b72678307cc7c10910b5ef460216af07" + +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Motor.git" +SRCREV = "2251bfc0501d0acfb96c0a43f4f2b4c6a10ca14e" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += "python3-setuptools-scm-native" + +RDEPENDS_${PN} += " \ + python3-adafruit-blinka \ + python3-core \ +" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb new file mode 100644 index 000000000..f35d48cf2 --- /dev/null +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "CircuitPython helper library for DC & Stepper Motor FeatherWing, Shield, and Pi Hat kits." +HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_MotorKit" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6ad4a8854b39ad474755ef1aea813bac" + +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_MotorKit.git" +SRCREV = "8c1462b4129b21f6db156d1517abb017bb74b982" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += "python3-setuptools-scm-native" + +RDEPENDS_${PN} += " \ + python3-adafruit-blinka \ + python3-adafruit-circuitpython-busdevice \ + python3-adafruit-circuitpython-motor \ + python3-adafruit-circuitpython-pca9685 \ + python3-adafruit-circuitpython-register \ + python3-core \ +" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb new file mode 100644 index 000000000..0b65c81ea --- /dev/null +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb @@ -0,0 +1,20 @@ +SUMMARY = "CircuitPython driver for motor, stepper, and servo based on PCA9685." +HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_PCA9685" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e7eb6b599fb0cfb06485c64cd4242f62" + +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_PCA9685.git" +SRCREV = "2780c4102f4c23fbab252aa1198b61ba7e2d1b2c" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += "python3-setuptools-scm-native" + +RDEPENDS_${PN} += " \ + python3-adafruit-blinka \ + python3-adafruit-circuitpython-busdevice \ + python3-adafruit-circuitpython-register \ + python3-core \ +" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb new file mode 100644 index 000000000..f1af80bea --- /dev/null +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "CircuitPython data descriptor classes to represent hardware registers on I2C and SPI devices." +HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_Register" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec69d6e9e6c85adfb7799d7f8cf044e" + +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Register.git" + +S = "${WORKDIR}/git" +SRCREV = "5fee6e0c3878110844bc51e16063eeae7d94c457" + +DEPENDS += "python3-setuptools-scm-native" + +inherit setuptools3 + +RDEPENDS_${PN} += "python3-core" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb new file mode 100644 index 000000000..4454d247d --- /dev/null +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "Platform detection for use by libraries like Adafruit-Blinka." +HOMEPAGE = "https://github.com/adafruit/Adafruit_Python_PlatformDetect" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fccd531dce4b989c05173925f0bbb76c" + +SRC_URI = "git://github.com/adafruit/Adafruit_Python_PlatformDetect.git" +SRCREV = "e0fe1b012898fa824944d6805ca74be0fa027968" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += "python3-setuptools-scm-native" + +RDEPENDS_${PN} += "python3-core" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb new file mode 100644 index 000000000..82415f954 --- /dev/null +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb @@ -0,0 +1,19 @@ +SUMMARY = "Pure python (i.e. no native extensions) access to Linux IO including I2C and SPI. Drop in replacement for smbus and spidev modules." +HOMEPAGE = "https://github.com/adafruit/Adafruit_Python_PureIO" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2a21fcca821a506d4c36f7bbecc0d009" + +SRC_URI = "git://github.com/adafruit/Adafruit_Python_PureIO.git" +SRCREV = "f4d0973da05b8b21905ff6bab69cdb652128f342" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += "python3-setuptools-scm-native" + +RDEPENDS_${PN} += " \ + python3-core \ + python3-ctypes \ + python3-fcntl \ +" diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-dev.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-dev.bb index 9b2b6f322..ff8ce7993 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-dev.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-dev.bb @@ -22,9 +22,7 @@ SRC_URI = " \ require linux-raspberrypi.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -KERNEL_EXTRA_ARGS += "DTC_FLAGS='-@ -H epapr'" +KERNEL_DTC_FLAGS += "-@ -H epapr" # Disable version check so that we don't have to edit this recipe every time # upstream bumps the version diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc index db1dbdb85..5ad9b781b 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc @@ -1,14 +1,14 @@ DESCRIPTION = "Linux Kernel for Raspberry Pi" SECTION = "kernel" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" COMPATIBLE_MACHINE = "^rpi$" PE = "1" PV = "${LINUX_VERSION}+git${SRCPV}" -inherit kernel siteinfo +inherit siteinfo require recipes-kernel/linux/linux-yocto.inc SRC_URI += " \ diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb new file mode 100644 index 000000000..6af434e07 --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb @@ -0,0 +1,18 @@ +LINUX_VERSION ?= "5.10.13" +LINUX_RPI_BRANCH ?= "rpi-5.10.y" + +SRCREV_machine = "34263dc81a12862c66e2593bb26c09d5fd20f46d" +SRCREV_meta = "5833ca701711d487c9094bd1efc671e8ef7d001e" + +KMETA = "kernel-meta" + +SRC_URI = " \ + git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH} \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA} \ + file://powersave.cfg \ + file://android-drivers.cfg \ + " + +require linux-raspberrypi.inc + +KERNEL_DTC_FLAGS += "-@ -H epapr" diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb index 1d04c2fa7..ba97ed56e 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb @@ -1,8 +1,8 @@ -LINUX_VERSION ?= "5.4.79" +LINUX_VERSION ?= "5.4.83" LINUX_RPI_BRANCH ?= "rpi-5.4.y" -SRCREV_machine = "9797f1a4938c20139b00a25de93cc99efb5c291b" -SRCREV_meta = "5d52d9eea95fa09d404053360c2351b2b91b323b" +SRCREV_machine = "08ae2dd9e7dc89c20bff823a3ef045de09bfd090" +SRCREV_meta = "d676bf5ff7b7071e14f44498d2482c0a596f14cd" KMETA = "kernel-meta" @@ -19,4 +19,4 @@ require linux-raspberrypi.inc LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -KERNEL_EXTRA_ARGS += "DTC_FLAGS='-@ -H epapr'" +KERNEL_DTC_FLAGS += "-@ -H epapr" diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0001-config-files-path.patch b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0001-config-files-path.patch deleted file mode 100644 index 6903c1770..000000000 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0001-config-files-path.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 0dc88ed881eb8420dad4cf0934a900d85b6ef313 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 11 Feb 2016 12:53:20 -0800 - ---- - config/bellagio/gstomx.conf | 8 ++++---- - config/rpi/gstomx.conf | 22 +++++++++++----------- - 2 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/config/bellagio/gstomx.conf b/config/bellagio/gstomx.conf -index 5ca8ba6..8931255 100644 ---- a/config/bellagio/gstomx.conf -+++ b/config/bellagio/gstomx.conf -@@ -1,6 +1,6 @@ - [omxmpeg4videodec] - type-name=GstOMXMPEG4VideoDec --core-name=/usr/local/lib/libomxil-bellagio.so.0 -+core-name=/usr/lib/libomxil-bellagio.so.0 - component-name=OMX.st.video_decoder.mpeg4 - rank=257 - in-port-index=0 -@@ -9,7 +9,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang - - [omxh264dec] - type-name=GstOMXH264Dec --core-name=/usr/local/lib/libomxil-bellagio.so.0 -+core-name=/usr/lib/libomxil-bellagio.so.0 - component-name=OMX.st.video_decoder.avc - rank=257 - in-port-index=0 -@@ -18,7 +18,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang - - [omxmpeg4videoenc] - type-name=GstOMXMPEG4VideoEnc --core-name=/usr/local/lib/libomxil-bellagio.so.0 -+core-name=/usr/lib/libomxil-bellagio.so.0 - component-name=OMX.st.video_encoder.mpeg4 - rank=0 - in-port-index=0 -@@ -27,7 +27,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;video-framerate-integer;s - - [omxaacenc] - type-name=GstOMXAACEnc --core-name=/usr/local/lib/libomxil-bellagio.so.0 -+core-name=/usr/lib/libomxil-bellagio.so.0 - component-name=OMX.st.audio_encoder.aac - rank=0 - in-port-index=0 -diff --git a/config/rpi/gstomx.conf b/config/rpi/gstomx.conf -index d3ea56a..2508dae 100644 ---- a/config/rpi/gstomx.conf -+++ b/config/rpi/gstomx.conf -@@ -1,6 +1,6 @@ - [omxmpeg2videodec] - type-name=GstOMXMPEG2VideoDec --core-name=/opt/vc/lib/libopenmaxil.so -+core-name=/usr/lib/libopenmaxil.so - component-name=OMX.broadcom.video_decode - rank=257 - in-port-index=130 -@@ -9,7 +9,7 @@ hacks=no-component-role - - [omxmpeg4videodec] - type-name=GstOMXMPEG4VideoDec --core-name=/opt/vc/lib/libopenmaxil.so -+core-name=/usr/lib/libopenmaxil.so - component-name=OMX.broadcom.video_decode - rank=257 - in-port-index=130 -@@ -18,7 +18,7 @@ hacks=no-component-role - - [omxh263dec] - type-name=GstOMXH263Dec --core-name=/opt/vc/lib/libopenmaxil.so -+core-name=/usr/lib/libopenmaxil.so - component-name=OMX.broadcom.video_decode - rank=257 - in-port-index=130 -@@ -27,7 +27,7 @@ hacks=no-component-role - - [omxh264dec] - type-name=GstOMXH264Dec --core-name=/opt/vc/lib/libopenmaxil.so -+core-name=/usr/lib/libopenmaxil.so - component-name=OMX.broadcom.video_decode - rank=257 - in-port-index=130 -@@ -36,7 +36,7 @@ hacks=no-component-role;signals-premature-eos - - [omxtheoradec] - type-name=GstOMXTheoraDec --core-name=/opt/vc/lib/libopenmaxil.so -+core-name=/usr/lib/libopenmaxil.so - component-name=OMX.broadcom.video_decode - rank=257 - in-port-index=130 -@@ -45,7 +45,7 @@ hacks=no-component-role - - [omxvp8dec] - type-name=GstOMXVP8Dec --core-name=/opt/vc/lib/libopenmaxil.so -+core-name=/usr/lib/libopenmaxil.so - component-name=OMX.broadcom.video_decode - rank=257 - in-port-index=130 -@@ -54,7 +54,7 @@ hacks=no-component-role - - [omxmjpegdec] - type-name=GstOMXMJPEGDec --core-name=/opt/vc/lib/libopenmaxil.so -+core-name=/usr/lib/libopenmaxil.so - component-name=OMX.broadcom.video_decode - rank=257 - in-port-index=130 -@@ -63,7 +63,7 @@ hacks=no-component-role - - [omxvc1dec] - type-name=GstOMXWMVDec --core-name=/opt/vc/lib/libopenmaxil.so -+core-name=/usr/lib/libopenmaxil.so - component-name=OMX.broadcom.video_decode - rank=257 - in-port-index=130 -@@ -73,7 +73,7 @@ sink-template-caps=video/x-wmv,wmvversion=(int)3,format=(string){WMV3,WVC1},widt - - [omxh264enc] - type-name=GstOMXH264Enc --core-name=/opt/vc/lib/libopenmaxil.so -+core-name=/usr/lib/libopenmaxil.so - component-name=OMX.broadcom.video_encode - rank=257 - in-port-index=200 -@@ -82,7 +82,7 @@ hacks=no-component-role;no-component-reconfigure - - [omxanalogaudiosink] - type-name=GstOMXAnalogAudioSink --core-name=/opt/vc/lib/libopenmaxil.so -+core-name=/usr/lib/libopenmaxil.so - component-name=OMX.broadcom.audio_render - rank=257 - in-port-index=100 -@@ -92,7 +92,7 @@ sink-template-caps=audio/x-raw,format=(string){S16LE,S32LE},layout=(string)inter - - [omxhdmiaudiosink] - type-name=GstOMXHdmiAudioSink --core-name=/opt/vc/lib/libopenmaxil.so -+core-name=/usr/lib/libopenmaxil.so - component-name=OMX.broadcom.audio_render - rank=258 - in-port-index=100 diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch index c8af7da0e..c8af7da0e 100644 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch +++ b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0003-no-timeout-on-get-state.patch b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx/0003-no-timeout-on-get-state.patch index 434232661..434232661 100644 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0003-no-timeout-on-get-state.patch +++ b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx/0003-no-timeout-on-get-state.patch diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0004-Properly-handle-drain-requests-while-flushing.patch b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx/0004-Properly-handle-drain-requests-while-flushing.patch index 144ced6ab..144ced6ab 100644 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0004-Properly-handle-drain-requests-while-flushing.patch +++ b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx/0004-Properly-handle-drain-requests-while-flushing.patch diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch index 3245294ea..3245294ea 100644 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.18/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch +++ b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend index a7aa8d9c3..a971236f2 100644 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend +++ b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend @@ -1,8 +1,12 @@ +FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:" + +SRC_URI_append_rpi = " \ + file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \ + file://0003-no-timeout-on-get-state.patch \ + file://0004-Properly-handle-drain-requests-while-flushing.patch \ + file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \ +" + GSTREAMER_1_0_OMX_TARGET_rpi = "rpi" GSTREAMER_1_0_OMX_CORE_NAME_rpi = "${libdir}/libopenmaxil.so" -EXTRA_OEMESON_append_rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include" -CFLAGS_append_rpi = " \ - -I${STAGING_DIR_TARGET}/usr/include/IL \ - -I${STAGING_DIR_TARGET}/usr/include/interface/vcos/pthreads \ - -I${STAGING_DIR_TARGET}/usr/include/interface/vmcs_host/linux \ -" +EXTRA_OEMESON_append_rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include/IL" diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18%.bbappend b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18%.bbappend deleted file mode 100644 index 56606553c..000000000 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -# -# Need to make this conditional to gstreamer1 -# -SRC_URI_append_rpi = " \ - file://0001-config-files-path.patch \ - file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \ - file://0003-no-timeout-on-get-state.patch \ - file://0004-Properly-handle-drain-requests-while-flushing.patch \ - file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \ -" - -FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/gstreamer1.0-omx-1.18:" diff --git a/meta-security/kas/kas-security-base.yml b/meta-security/kas/kas-security-base.yml index 94188c8c0..fca0ebe09 100644 --- a/meta-security/kas/kas-security-base.yml +++ b/meta-security/kas/kas-security-base.yml @@ -34,12 +34,19 @@ local_conf_header: CONF_VERSION = "1" SOURCE_MIRROR_URL = "http://downloads.yoctoproject.org/mirror/sources/" SSTATE_MIRRORS = "file://.* http://sstate.yoctoproject.org/dev/PATH;downloadfilename=PATH \n" - DL_DIR = "/home/srv/downloads/master" BB_HASHSERVE = "auto" BB_SIGNATURE_HANDLER = "OEEquivHash" INHERIT += "buildstats buildstats-summary buildhistory" INHERIT += "report-error" INHERIT += "testimage" + INHERIT += "rm_work" + BB_NUMBER_THREADS="24" + BB_NUMBER_PARSE_THREADS="12" + PARALLEL_MAKE="-j 8" + BB_TASK_NICE_LEVEL = '5' + BB_TASK_NICE_LEVEL_task-testimage = '0' + BB_TASK_IONICE_LEVEL = '2.7' + BB_TASK_IONICE_LEVEL_task-testimage = '2.1' TEST_QEMUBOOT_TIMEOUT = "1500" EXTRA_IMAGE_FEATURES ?= "debug-tweaks" PACKAGE_CLASSES = "package_ipk" diff --git a/meta-security/meta-integrity/README.md b/meta-security/meta-integrity/README.md index 460794878..5048fba1e 100644 --- a/meta-security/meta-integrity/README.md +++ b/meta-security/meta-integrity/README.md @@ -73,8 +73,10 @@ Adding the layer only enables IMA (see below regarding EVM) during compilation of the Linux kernel. To also activate it when building the image, enable image signing in the local.conf like this: - INHERIT += "ima-evm-rootfs" + IMAGE_CLASSES += "ima-evm-rootfs" IMA_EVM_KEY_DIR = "${INTEGRITY_BASE}/data/debug-keys" + IMA_EVM_PRIVKEY = "${IMA_EVM_KEY_DIR}/privkey_ima.pem" + IMA_EVM_X509 = "${IMA_EVM_KEY_DIR}/x509_ima.der" This uses the default keys provided in the "data" directory of the layer. Because everyone has access to these private keys, such an image diff --git a/meta-security/meta-integrity/classes/ima-evm-rootfs.bbclass b/meta-security/meta-integrity/classes/ima-evm-rootfs.bbclass index d6ade3bf9..0acd6e7aa 100644 --- a/meta-security/meta-integrity/classes/ima-evm-rootfs.bbclass +++ b/meta-security/meta-integrity/classes/ima-evm-rootfs.bbclass @@ -28,6 +28,9 @@ IMA_EVM_ROOTFS_HASHED ?= ". -depth 0 -false" # the iversion flags (needed by IMA when allowing writing). IMA_EVM_ROOTFS_IVERSION ?= "" +# Avoid re-generating fstab when ima is enabled. +WIC_CREATE_EXTRA_ARGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ima', ' --no-fstab-update', '', d)}" + ima_evm_sign_rootfs () { cd ${IMAGE_ROOTFS} @@ -37,15 +40,6 @@ ima_evm_sign_rootfs () { # reasons (including a change of the signing keys) without also # re-running do_rootfs. - # Copy file(s) which must be on the device. Note that - # evmctl uses x509_evm.der also for "ima_verify", which is probably - # a bug (should default to x509_ima.der). Does not matter for us - # because we use the same key for both. - install -d ./${sysconfdir}/keys - rm -f ./${sysconfdir}/keys/x509_evm.der - install "${IMA_EVM_X509}" ./${sysconfdir}/keys/x509_evm.der - ln -sf x509_evm.der ./${sysconfdir}/keys/x509_ima.der - # Fix /etc/fstab: it must include the "i_version" mount option for # those file systems where writing files is allowed, otherwise # these changes will not get detected at runtime. @@ -80,13 +74,16 @@ ima_evm_sign_rootfs () { } # Signing must run as late as possible in the do_rootfs task. -# IMAGE_PREPROCESS_COMMAND runs after ROOTFS_POSTPROCESS_COMMAND, so -# append (not prepend!) to IMAGE_PREPROCESS_COMMAND, and do it with -# _append instead of += because _append gets evaluated later. In -# particular, we must run after prelink_image in -# IMAGE_PREPROCESS_COMMAND, because prelinking changes executables. +# To guarantee that, we append it to IMAGE_PREPROCESS_COMMAND in +# RecipePreFinalise event handler, this ensures it's the last +# function in IMAGE_PREPROCESS_COMMAND. +python ima_evm_sign_handler () { + if not e.data or 'ima' not in e.data.getVar('DISTRO_FEATURES').split(): + return -IMAGE_PREPROCESS_COMMAND_append = " ima_evm_sign_rootfs ; " - -# evmctl must have been installed first. -do_rootfs[depends] += "ima-evm-utils-native:do_populate_sysroot" + e.data.appendVar('IMAGE_PREPROCESS_COMMAND', ' ima_evm_sign_rootfs; ') + e.data.appendVar('IMAGE_INSTALL', ' ima-evm-keys') + e.data.appendVarFlag('do_rootfs', 'depends', ' ima-evm-utils-native:do_populate_sysroot') +} +addhandler ima_evm_sign_handler +ima_evm_sign_handler[eventmask] = "bb.event.RecipePreFinalise" diff --git a/meta-security/meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima.bb b/meta-security/meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima.bb index dacdc8bf0..77f6f7cff 100644 --- a/meta-security/meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima.bb +++ b/meta-security/meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima.bb @@ -27,5 +27,5 @@ do_install () { FILES_${PN} = "/init.d ${sysconfdir}" -RDEPENDS_${PN} = "keyutils ${IMA_POLICY}" +RDEPENDS_${PN} = "keyutils ima-evm-keys ${IMA_POLICY}" RDEPENDS_${PN} += "initramfs-framework-base" diff --git a/meta-security/meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima/ima b/meta-security/meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima/ima index 8616f9924..cff26a335 100644 --- a/meta-security/meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima/ima +++ b/meta-security/meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima/ima @@ -6,6 +6,7 @@ ima_enabled() { if [ "$bootparam_no_ima" = "true" ]; then return 1 fi + return 0 } ima_run() { @@ -46,7 +47,7 @@ ima_run() { # ("[Linux-ima-user] IMA policy loading via cat") and we get better error reporting when # checking the write of each line. To minimize the risk of policy loading going wrong we # also remove comments and blank lines ourselves. - if ! (set -e; while read i; do if echo "$i" | grep -q -e '^#' -e '^ *$'; then debug "Skipping IMA policy: $i"; else debug "Writing IMA policy: $i"; if echo $i; then sleep ${bootparam_ima_delay:-0}; else fatal "Invalid line in IMA policy: $i"; exit 1; fi; fi; done) </etc/ima-policy >/sys/kernel/security/ima/policy; then + if ! (set -e; while read i; do if echo "$i" | grep -q -e '^#' -e '^ *$'; then debug "Skipping IMA policy: $i"; else debug "Writing IMA policy: $i"; if echo $i; then sleep ${bootparam_ima_delay:-0}; else fatal "Invalid line in IMA policy: $i"; exit 1; fi; fi; done) </etc/ima/ima-policy >/sys/kernel/security/ima/policy; then fatal "Could not load IMA policy." fi } diff --git a/meta-security/meta-integrity/recipes-security/ima-evm-keys/ima-evm-keys_1.0.bb b/meta-security/meta-integrity/recipes-security/ima-evm-keys/ima-evm-keys_1.0.bb new file mode 100644 index 000000000..62685bbb0 --- /dev/null +++ b/meta-security/meta-integrity/recipes-security/ima-evm-keys/ima-evm-keys_1.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "IMA/EMV public keys" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +inherit features_check +REQUIRED_DISTRO_FEATURES = "ima" + +ALLOW_EMPTY_${PN} = "1" + +do_install () { + if [ -e "${IMA_EVM_X509}" ]; then + install -d ${D}/${sysconfdir}/keys + install "${IMA_EVM_X509}" ${D}${sysconfdir}/keys/x509_evm.der + lnr ${D}${sysconfdir}/keys/x509_evm.der ${D}${sysconfdir}/keys/x509_ima.der + fi +} diff --git a/meta-security/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils_git.bb b/meta-security/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils_git.bb index 7f649c2d6..bd8558303 100644 --- a/meta-security/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils_git.bb +++ b/meta-security/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils_git.bb @@ -26,6 +26,7 @@ S = "${WORKDIR}/git" inherit pkgconfig autotools features_check REQUIRED_DISTRO_FEATURES = "ima" +REQUIRED_DISTRO_FEATURES_class-native = "" EXTRA_OECONF_append_class-target = " --with-kernel-headers=${STAGING_KERNEL_BUILDDIR}" diff --git a/meta-security/meta-integrity/recipes-security/ima_policy_hashed/files/ima_policy_hashed b/meta-security/meta-integrity/recipes-security/ima_policy_hashed/files/ima_policy_hashed index 7f89c8d98..4d9e4ca50 100644 --- a/meta-security/meta-integrity/recipes-security/ima_policy_hashed/files/ima_policy_hashed +++ b/meta-security/meta-integrity/recipes-security/ima_policy_hashed/files/ima_policy_hashed @@ -53,6 +53,9 @@ dont_measure fsmagic=0x43415d53 # CGROUP_SUPER_MAGIC dont_appraise fsmagic=0x27e0eb dont_measure fsmagic=0x27e0eb +# CGROUP2_SUPER_MAGIC +dont_appraise fsmagic=0x63677270 +dont_measure fsmagic=0x63677270 # EFIVARFS_MAGIC dont_appraise fsmagic=0xde5e81e4 dont_measure fsmagic=0xde5e81e4 diff --git a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc index afa576a9b..812ea9f3a 100644 --- a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc +++ b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc @@ -11,7 +11,7 @@ DEPENDS_class-native = "pkgconfig-native swig-native curl-native libxml2-native S = "${WORKDIR}/git" -inherit cmake pkgconfig python3native perlnative +inherit cmake pkgconfig python3native python3targetconfig perlnative PACKAGECONFIG ?= "python3 rpm perl gcrypt ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" PACKAGECONFIG[python3] = "-DENABLE_PYTHON3=ON, ,python3, python3" diff --git a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch new file mode 100644 index 000000000..60664a371 --- /dev/null +++ b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch @@ -0,0 +1,46 @@ +From 2beb4bc83a157b21edb1a3fef295cd4cced467df Mon Sep 17 00:00:00 2001 +From: Jate Sujjavanich <jatedev@gmail.com> +Date: Thu, 7 Jan 2021 18:10:01 -0500 +Subject: [PATCH 1/3] Fix platform spec, file check, tests in installed OS + detect for openembedded + +Change platform to multi in openembedded installed check matching others +and allowing compile of xml into oval +--- + shared/checks/oval/installed_OS_is_openembedded.xml | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/shared/checks/oval/installed_OS_is_openembedded.xml b/shared/checks/oval/installed_OS_is_openembedded.xml +index 763d17bcb..01df16b43 100644 +--- a/shared/checks/oval/installed_OS_is_openembedded.xml ++++ b/shared/checks/oval/installed_OS_is_openembedded.xml +@@ -1,11 +1,9 @@ +-</def-group> +- + <def-group> + <definition class="inventory" id="installed_OS_is_openembedded" version="2"> + <metadata> + <title>OpenEmbedded</title> + <affected family="unix"> +- <platform>OPENEMBEDDED</platform> ++ <platform>multi_platform_all</platform> + </affected> + <reference ref_id="cpe:/o:openembedded:openembedded:0" + source="CPE" /> +@@ -20,8 +18,11 @@ + </criteria> + </definition> + +- <ind:textfilecontent54_object id="test_openembedded" version="1" comment="Check OPenEmbedded version"> +- <ind:filepath>/etc/os-release/ind:filepath> ++ <ind:textfilecontent54_test check="all" check_existence="at_least_one_exists" comment="Check OpenEmbedded version" id="test_openembedded" version="1"> ++ <ind:object object_ref="obj_openembedded" /> ++ </ind:textfilecontent54_test> ++ <ind:textfilecontent54_object id="obj_openembedded" version="1" comment="Check OpenEmbedded version"> ++ <ind:filepath>/etc/os-release</ind:filepath> + <ind:pattern operation="pattern match">^VERSION_ID=\"nodistro\.[0-9].$</ind:pattern> + <ind:instance datatype="int">1</ind:instance> + </ind:textfilecontent54_object> +-- +2.24.3 (Apple Git-128) + diff --git a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fix-missing-openembedded-from-ssg-constants.py.patch b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fix-missing-openembedded-from-ssg-constants.py.patch new file mode 100644 index 000000000..1e712f672 --- /dev/null +++ b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fix-missing-openembedded-from-ssg-constants.py.patch @@ -0,0 +1,34 @@ +From 037a12301968a56f0c7e492ea4a05d2eecbd4cc6 Mon Sep 17 00:00:00 2001 +From: Jate Sujjavanich <jatedev@gmail.com> +Date: Fri, 8 Jan 2021 20:18:00 -0500 +Subject: [PATCH 2/3] Fix missing openembedded from ssg/constants.py + +--- + ssg/constants.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/ssg/constants.py b/ssg/constants.py +index fab7cda5d..2ca289f84 100644 +--- a/ssg/constants.py ++++ b/ssg/constants.py +@@ -234,7 +234,8 @@ PRODUCT_TO_CPE_MAPPING = { + } + + MULTI_PLATFORM_LIST = ["rhel", "fedora", "rhosp", "rhv", "debian", "ubuntu", +- "wrlinux", "opensuse", "sle", "ol", "ocp", "example"] ++ "wrlinux", "opensuse", "sle", "ol", "ocp", "example", ++ "openembedded"] + + MULTI_PLATFORM_MAPPING = { + "multi_platform_debian": ["debian8"], +@@ -249,6 +250,7 @@ MULTI_PLATFORM_MAPPING = { + "multi_platform_sle": ["sle11", "sle12"], + "multi_platform_ubuntu": ["ubuntu1404", "ubuntu1604", "ubuntu1804"], + "multi_platform_wrlinux": ["wrlinux"], ++ "multi_platform_openembedded": ["openembedded"], + } + + RHEL_CENTOS_CPE_MAPPING = { +-- +2.24.3 (Apple Git-128) + diff --git a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc index 32fce0fbb..d1a9511f3 100644 --- a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc +++ b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc @@ -10,7 +10,7 @@ DEPENDS = "openscap-native python3 python3-pyyaml-native python3-jinja2-native l S = "${WORKDIR}/git" -inherit cmake pkgconfig python3native +inherit cmake pkgconfig python3native python3targetconfig STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts" export OSCAP_CPE_PATH="${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/cpe" diff --git a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb index 6e7180f55..0617c56e7 100644 --- a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb +++ b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb @@ -7,6 +7,8 @@ SRC_URI = "git://github.com/akuster/scap-security-guide.git;branch=oe-0.1.44; \ file://0001-fix-deprecated-instance-of-element.getchildren.patch \ file://0002-fix-deprecated-getiterator-function.patch \ file://0003-fix-remaining-getchildren-and-getiterator-functions.patch \ + file://0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch \ + file://0002-Fix-missing-openembedded-from-ssg-constants.py.patch \ " PV = "0.1.44+git${SRCPV}" diff --git a/meta-security/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1637.bb b/meta-security/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1637.bb index 32afd377d..301980dbe 100644 --- a/meta-security/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1637.bb +++ b/meta-security/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1637.bb @@ -27,7 +27,7 @@ SRC_URI[sha512sum] = "007aa415cccf19a2bcf789c426727dc4032dcb04cc9d11eedc231d2add S = "${WORKDIR}/src" -CFLAGS += "-Wno-error=maybe-uninitialized" +CFLAGS += "-Wno-error=maybe-uninitialized -DALG_CAMELLIA=ALG_NO" do_compile () { make CC='${CC}' diff --git a/meta-security/recipes-ids/samhain/samhain.inc b/meta-security/recipes-ids/samhain/samhain.inc index 3b4aab931..6a2eb0855 100644 --- a/meta-security/recipes-ids/samhain/samhain.inc +++ b/meta-security/recipes-ids/samhain/samhain.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.la-samhna.de/samhain/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b" -PV = "4.4.2" +PV = "4.4.3" SRC_URI = "https://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ file://${INITSCRIPT_NAME}.init \ @@ -20,7 +20,7 @@ SRC_URI = "https://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ file://fix-build-with-new-version-attr.patch \ " -SRC_URI[sha256sum] = "2bb2750b32646be32517d0b2259402559c72b96979800f6c33774fcdea327fff" +SRC_URI[sha256sum] = "3e57574036d5055e9557ec5095818b419ea6c4365370fc2ccce1e9f87f9fad08" UPSTREAM_CHECK_URI = "https://www.la-samhna.de/samhain/archive.html" UPSTREAM_CHECK_REGEX = "samhain_signed-(?P<pver>(\d+(\.\d+)+))\.tar" diff --git a/meta-security/recipes-ids/suricata/libhtp_0.5.35.bb b/meta-security/recipes-ids/suricata/libhtp_0.5.36.bb index 8305f7010..8305f7010 100644 --- a/meta-security/recipes-ids/suricata/libhtp_0.5.35.bb +++ b/meta-security/recipes-ids/suricata/libhtp_0.5.36.bb diff --git a/meta-security/recipes-ids/suricata/python3-suricata-update_1.1.1.bb b/meta-security/recipes-ids/suricata/python3-suricata-update_1.1.1.bb index 0070b5bcf..732ca9a11 100644 --- a/meta-security/recipes-ids/suricata/python3-suricata-update_1.1.1.bb +++ b/meta-security/recipes-ids/suricata/python3-suricata-update_1.1.1.bb @@ -10,6 +10,6 @@ SRC_URI = "git://github.com/OISF/suricata-update;branch='master-1.1.x'" S = "${WORKDIR}/git" -inherit python3native setuptools3 +inherit python3native python3targetconfig setuptools3 RDEPENDS_${PN} = "python3-pyyaml" diff --git a/meta-security/recipes-ids/suricata/suricata.inc b/meta-security/recipes-ids/suricata/suricata.inc index b94285f0d..1ce0d74a8 100644 --- a/meta-security/recipes-ids/suricata/suricata.inc +++ b/meta-security/recipes-ids/suricata/suricata.inc @@ -2,7 +2,7 @@ HOMEPAGE = "http://suricata-ids.org/" SECTION = "security Monitor/Admin" LICENSE = "GPLv2" -VER = "4.1.9" +VER = "4.1.10" SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz" -SRC_URI[sha256sum] = "3440cd1065b1b3999dc101a37c49321fab2791b38f16e2f7fe27369dd007eea7" +SRC_URI[sha256sum] = "4013cb13a2f3f7854328cf072319bba41896fad86d6b85b1cff4004f82aa7276" diff --git a/meta-security/recipes-ids/suricata/suricata_4.1.9.bb b/meta-security/recipes-ids/suricata/suricata_4.1.10.bb index 3f7beaacf..3f7beaacf 100644 --- a/meta-security/recipes-ids/suricata/suricata_4.1.9.bb +++ b/meta-security/recipes-ids/suricata/suricata_4.1.10.bb diff --git a/meta-security/recipes-mac/AppArmor/apparmor_3.0.bb b/meta-security/recipes-mac/AppArmor/apparmor_3.0.bb index 35e95a0a2..015205d49 100644 --- a/meta-security/recipes-mac/AppArmor/apparmor_3.0.bb +++ b/meta-security/recipes-mac/AppArmor/apparmor_3.0.bb @@ -39,7 +39,7 @@ PARALLEL_MAKE = "" COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" -inherit pkgconfig autotools-brokensep update-rc.d python3native perlnative cpan systemd features_check bash-completion +inherit pkgconfig autotools-brokensep update-rc.d python3native python3targetconfig perlnative cpan systemd features_check bash-completion REQUIRED_DISTRO_FEATURES = "apparmor" diff --git a/meta-security/recipes-scanners/arpwatch/arpwatch_3.0.bb b/meta-security/recipes-scanners/arpwatch/arpwatch_3.1.bb index 9be319adc..44aeca015 100644 --- a/meta-security/recipes-scanners/arpwatch/arpwatch_3.0.bb +++ b/meta-security/recipes-scanners/arpwatch/arpwatch_3.1.bb @@ -1,7 +1,7 @@ SUMARRY = "The ethernet monitor program; for keeping track of ethernet/ip address pairings" LICENSE = "BSD-4-Clause" HOME_PAGE = "http://ee.lbl.gov/" -LIC_FILES_CHKSUM = "file://configure;md5=212742e55562cf47527d31c2a492411a" +LIC_FILES_CHKSUM = "file://configure;md5=74ca964ed34fda7b46c6fe3e50bded9d" DEPENDS += "libpcap postfix" @@ -12,7 +12,7 @@ SRC_URI = "https://ee.lbl.gov/downloads/arpwatch/${BP}.tar.gz \ file://postfix_workaround.patch \ file://host_contam_fix.patch " -SRC_URI[sha256sum] = "82e137e104aca8b1280f5cca0ebe61b978f10eadcbb4c4802c181522ad02b25b" +SRC_URI[sha256sum] = "ee1d15d9a07952c0c017908b9dbfd5ac988fed0058c3cc4fa6c13e0be36f3a9f" inherit autotools-brokensep update-rc.d useradd diff --git a/meta-security/recipes-scanners/buck-security/buck-security_0.7.bb b/meta-security/recipes-scanners/buck-security/buck-security_0.7.bb index 179eedae2..20a1fb026 100644 --- a/meta-security/recipes-scanners/buck-security/buck-security_0.7.bb +++ b/meta-security/recipes-scanners/buck-security/buck-security_0.7.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Buck-Security is a security scanner for Debian and Ubuntu Linux. system. This enables you to quickly overview the security status of your Linux system." SECTION = "security" LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "http://sourceforge.net/projects/buck-security/files/buck-security/buck-security_${PV}/${BPN}_${PV}.tar.gz" diff --git a/meta-security/recipes-scanners/checksec/checksec_2.1.0.bb b/meta-security/recipes-scanners/checksec/checksec_2.4.0.bb index b67c98bb6..52bcf7cfb 100644 --- a/meta-security/recipes-scanners/checksec/checksec_2.1.0.bb +++ b/meta-security/recipes-scanners/checksec/checksec_2.4.0.bb @@ -4,9 +4,9 @@ SECTION = "security" LICENSE = "BSD" HOMEPAGE="https://github.com/slimm609/checksec.sh" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=93fddcca19f6c897871f9b5f9a035f4a" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8d90285f711cf1f378e2c024457066d8" -SRCREV = "04582bad41589ad479ca8b1f0170ed317475b5a5" +SRCREV = "c3754e45e04f9104db93b2048afd094427102d48" SRC_URI = "git://github.com/slimm609/checksec.sh" S = "${WORKDIR}/git" diff --git a/meta-security/recipes-scanners/checksecurity/checksecurity_2.0.15.bb b/meta-security/recipes-scanners/checksecurity/checksecurity_2.0.15.bb index 204123d84..0161b4cc2 100644 --- a/meta-security/recipes-scanners/checksecurity/checksecurity_2.0.15.bb +++ b/meta-security/recipes-scanners/checksecurity/checksecurity_2.0.15.bb @@ -2,7 +2,7 @@ SUMMARY = "basic system security checks" DESCRIPTION = "checksecurity is a simple package which will scan your system for several simple security holes." SECTION = "security" LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "http://ftp.de.debian.org/debian/pool/main/c/checksecurity/checksecurity_${PV}.tar.gz \ file://setuid-log-folder.patch \ diff --git a/meta-security/recipes-security/fail2ban/files/0001-python3-fail2ban-2-3-conversion.patch b/meta-security/recipes-security/fail2ban/files/0001-python3-fail2ban-2-3-conversion.patch deleted file mode 100644 index ee872ec41..000000000 --- a/meta-security/recipes-security/fail2ban/files/0001-python3-fail2ban-2-3-conversion.patch +++ /dev/null @@ -1,2527 +0,0 @@ -From abaa20435bac7decffa69e6f965aac9ce29aff6a Mon Sep 17 00:00:00 2001 -From: Armin Kuster <akuster808@gmail.com> -Date: Wed, 12 Feb 2020 17:19:15 +0000 -Subject: [PATCH] python3-fail2ban: 2-3 conversion - -Upstream-Status: OE specific. - -fail2ban handles py3 via a 2-3 conversion utility. - -Signed-off-by: Armin Kuster <akuster808@gmail.com> ---- - fail2ban/client/actionreader.py | 4 +- - fail2ban/client/configparserinc.py | 10 +- - fail2ban/client/configreader.py | 4 +- - fail2ban/client/csocket.py | 4 +- - fail2ban/client/fail2banclient.py | 4 +- - fail2ban/client/fail2banregex.py | 20 +- - fail2ban/client/filterreader.py | 2 +- - fail2ban/client/jailreader.py | 4 +- - fail2ban/helpers.py | 15 +- - fail2ban/server/action.py | 19 +- - fail2ban/server/actions.py | 24 +- - fail2ban/server/asyncserver.py | 4 +- - fail2ban/server/banmanager.py | 18 +- - fail2ban/server/database.py | 6 +- - fail2ban/server/failmanager.py | 8 +- - fail2ban/server/failregex.py | 9 +- - fail2ban/server/filter.py | 12 +- - fail2ban/server/filterpoll.py | 2 +- - fail2ban/server/filterpyinotify.py | 6 +- - fail2ban/server/ipdns.py | 16 +- - fail2ban/server/jail.py | 14 +- - fail2ban/server/mytime.py | 2 +- - fail2ban/server/server.py | 18 +- - fail2ban/server/strptime.py | 6 +- - fail2ban/server/ticket.py | 14 +- - fail2ban/server/transmitter.py | 2 +- - fail2ban/server/utils.py | 6 +- - fail2ban/tests/action_d/test_badips.py | 2 +- - fail2ban/tests/actiontestcase.py | 4 +- - fail2ban/tests/clientreadertestcase.py | 4 +- - fail2ban/tests/databasetestcase.py | 16 +- - fail2ban/tests/datedetectortestcase.py | 6 +- - fail2ban/tests/fail2banclienttestcase.py | 8 +- - fail2ban/tests/failmanagertestcase.py | 10 +- - .../tests/files/config/apache-auth/digest.py | 20 +- - fail2ban/tests/filtertestcase.py | 92 ++--- - fail2ban/tests/misctestcase.py | 22 +- - fail2ban/tests/observertestcase.py | 34 +- - fail2ban/tests/samplestestcase.py | 8 +- - fail2ban/tests/servertestcase.py | 28 +- - fail2ban/tests/sockettestcase.py | 2 +- - fail2ban/tests/utils.py | 22 +- - setup.py | 326 ------------------ - 43 files changed, 264 insertions(+), 593 deletions(-) - delete mode 100755 setup.py - -diff --git a/fail2ban/client/actionreader.py b/fail2ban/client/actionreader.py -index 80617a50..ecf323c5 100644 ---- a/fail2ban/client/actionreader.py -+++ b/fail2ban/client/actionreader.py -@@ -90,11 +90,11 @@ class ActionReader(DefinitionInitConfigReader): - stream = list() - stream.append(head + ["addaction", self._name]) - multi = [] -- for opt, optval in opts.iteritems(): -+ for opt, optval in opts.items(): - if opt in self._configOpts and not opt.startswith('known/'): - multi.append([opt, optval]) - if self._initOpts: -- for opt, optval in self._initOpts.iteritems(): -+ for opt, optval in self._initOpts.items(): - if opt not in self._configOpts and not opt.startswith('known/'): - multi.append([opt, optval]) - if len(multi) > 1: -diff --git a/fail2ban/client/configparserinc.py b/fail2ban/client/configparserinc.py -index e0f39579..45c77437 100644 ---- a/fail2ban/client/configparserinc.py -+++ b/fail2ban/client/configparserinc.py -@@ -62,7 +62,7 @@ if sys.version_info >= (3,2): - parser, option, accum, rest, section, map, *args, **kwargs) - - else: # pragma: no cover -- from ConfigParser import SafeConfigParser, \ -+ from configparser import SafeConfigParser, \ - InterpolationMissingOptionError, NoOptionError, NoSectionError - - # Interpolate missing known/option as option from default section -@@ -327,7 +327,7 @@ after = 1.conf - # mix it with defaults: - return set(opts.keys()) | set(self._defaults) - # only own option names: -- return opts.keys() -+ return list(opts.keys()) - - def read(self, filenames, get_includes=True): - if not isinstance(filenames, list): -@@ -356,7 +356,7 @@ after = 1.conf - ret += i - # merge defaults and all sections to self: - alld.update(cfg.get_defaults()) -- for n, s in cfg.get_sections().iteritems(): -+ for n, s in cfg.get_sections().items(): - # conditional sections - cond = SafeConfigParserWithIncludes.CONDITIONAL_RE.match(n) - if cond: -@@ -366,7 +366,7 @@ after = 1.conf - del(s['__name__']) - except KeyError: - pass -- for k in s.keys(): -+ for k in list(s.keys()): - v = s.pop(k) - s[k + cond] = v - s2 = alls.get(n) -@@ -399,7 +399,7 @@ after = 1.conf - sec.update(options) - return - sk = {} -- for k, v in options.iteritems(): -+ for k, v in options.items(): - if not k.startswith(pref) and k != '__name__': - sk[pref+k] = v - sec.update(sk) -diff --git a/fail2ban/client/configreader.py b/fail2ban/client/configreader.py -index 20709b72..b5167409 100644 ---- a/fail2ban/client/configreader.py -+++ b/fail2ban/client/configreader.py -@@ -26,7 +26,7 @@ __license__ = "GPL" - - import glob - import os --from ConfigParser import NoOptionError, NoSectionError -+from configparser import NoOptionError, NoSectionError - - from .configparserinc import sys, SafeConfigParserWithIncludes, logLevel - from ..helpers import getLogger, _as_bool, _merge_dicts, substituteRecursiveTags -@@ -197,7 +197,7 @@ class ConfigReaderUnshared(SafeConfigParserWithIncludes): - config_files += sorted(glob.glob('%s/*.local' % config_dir)) - - # choose only existing ones -- config_files = filter(os.path.exists, config_files) -+ config_files = list(filter(os.path.exists, config_files)) - - if len(config_files): - # at least one config exists and accessible -diff --git a/fail2ban/client/csocket.py b/fail2ban/client/csocket.py -index ab3e294b..9417cde9 100644 ---- a/fail2ban/client/csocket.py -+++ b/fail2ban/client/csocket.py -@@ -47,7 +47,7 @@ class CSocket: - - def send(self, msg, nonblocking=False, timeout=None): - # Convert every list member to string -- obj = dumps(map(CSocket.convert, msg), HIGHEST_PROTOCOL) -+ obj = dumps(list(map(CSocket.convert, msg)), HIGHEST_PROTOCOL) - self.__csock.send(obj + CSPROTO.END) - return self.receive(self.__csock, nonblocking, timeout) - -@@ -71,7 +71,7 @@ class CSocket: - @staticmethod - def convert(m): - """Convert every "unexpected" member of message to string""" -- if isinstance(m, (basestring, bool, int, float, list, dict, set)): -+ if isinstance(m, (str, bool, int, float, list, dict, set)): - return m - else: # pragma: no cover - return str(m) -diff --git a/fail2ban/client/fail2banclient.py b/fail2ban/client/fail2banclient.py -index 7c90ca40..7eb11684 100755 ---- a/fail2ban/client/fail2banclient.py -+++ b/fail2ban/client/fail2banclient.py -@@ -45,7 +45,7 @@ def _thread_name(): - return threading.current_thread().__class__.__name__ - - def input_command(): # pragma: no cover -- return raw_input(PROMPT) -+ return input(PROMPT) - - ## - # -@@ -444,7 +444,7 @@ class Fail2banClient(Fail2banCmdLine, Thread): - return False - finally: - self._alive = False -- for s, sh in _prev_signals.iteritems(): -+ for s, sh in _prev_signals.items(): - signal.signal(s, sh) - - -diff --git a/fail2ban/client/fail2banregex.py b/fail2ban/client/fail2banregex.py -index 513b765d..4a71b3c0 100644 ---- a/fail2ban/client/fail2banregex.py -+++ b/fail2ban/client/fail2banregex.py -@@ -41,10 +41,10 @@ import shlex - import sys - import time - import time --import urllib -+import urllib.request, urllib.parse, urllib.error - from optparse import OptionParser, Option - --from ConfigParser import NoOptionError, NoSectionError, MissingSectionHeaderError -+from configparser import NoOptionError, NoSectionError, MissingSectionHeaderError - - try: # pragma: no cover - from ..server.filtersystemd import FilterSystemd -@@ -68,7 +68,7 @@ def debuggexURL(sample, regex, multiline=False, useDns="yes"): - 'flavor': 'python' - } - if multiline: args['flags'] = 'm' -- return 'https://www.debuggex.com/?' + urllib.urlencode(args) -+ return 'https://www.debuggex.com/?' + urllib.parse.urlencode(args) - - def output(args): # pragma: no cover (overriden in test-cases) - print(args) -@@ -244,7 +244,7 @@ class Fail2banRegex(object): - - def __init__(self, opts): - # set local protected members from given options: -- self.__dict__.update(dict(('_'+o,v) for o,v in opts.__dict__.iteritems())) -+ self.__dict__.update(dict(('_'+o,v) for o,v in opts.__dict__.items())) - self._opts = opts - self._maxlines_set = False # so we allow to override maxlines in cmdline - self._datepattern_set = False -@@ -304,7 +304,7 @@ class Fail2banRegex(object): - realopts = {} - combopts = reader.getCombined() - # output all options that are specified in filter-argument as well as some special (mostly interested): -- for k in ['logtype', 'datepattern'] + fltOpt.keys(): -+ for k in ['logtype', 'datepattern'] + list(fltOpt.keys()): - # combined options win, but they contain only a sub-set in filter expected keys, - # so get the rest from definition section: - try: -@@ -424,7 +424,7 @@ class Fail2banRegex(object): - self.output( "Use %11s line : %s" % (regex, shortstr(value)) ) - regex_values = {regextype: [RegexStat(value)]} - -- for regextype, regex_values in regex_values.iteritems(): -+ for regextype, regex_values in regex_values.items(): - regex = regextype + 'regex' - setattr(self, "_" + regex, regex_values) - for regex in regex_values: -@@ -523,10 +523,10 @@ class Fail2banRegex(object): - output(ret[1]) - elif self._opts.out == 'msg': - for ret in ret: -- output('\n'.join(map(lambda v:''.join(v for v in v), ret[3].get('matches')))) -+ output('\n'.join([''.join(v for v in v) for v in ret[3].get('matches')])) - elif self._opts.out == 'row': - for ret in ret: -- output('[%r,\t%r,\t%r],' % (ret[1],ret[2],dict((k,v) for k, v in ret[3].iteritems() if k != 'matches'))) -+ output('[%r,\t%r,\t%r],' % (ret[1],ret[2],dict((k,v) for k, v in ret[3].items() if k != 'matches'))) - else: - for ret in ret: - output(ret[3].get(self._opts.out)) -@@ -565,9 +565,9 @@ class Fail2banRegex(object): - ans = [[]] - for arg in [l, regexlist]: - ans = [ x + [y] for x in ans for y in arg ] -- b = map(lambda a: a[0] + ' | ' + a[1].getFailRegex() + ' | ' + -+ b = [a[0] + ' | ' + a[1].getFailRegex() + ' | ' + - debuggexURL(self.encode_line(a[0]), a[1].getFailRegex(), -- multiline, self._opts.usedns), ans) -+ multiline, self._opts.usedns) for a in ans] - pprint_list([x.rstrip() for x in b], header) - else: - output( "%s too many to print. Use --print-all-%s " \ -diff --git a/fail2ban/client/filterreader.py b/fail2ban/client/filterreader.py -index 413f125e..4f0cc4cf 100644 ---- a/fail2ban/client/filterreader.py -+++ b/fail2ban/client/filterreader.py -@@ -71,7 +71,7 @@ class FilterReader(DefinitionInitConfigReader): - @staticmethod - def _fillStream(stream, opts, jailName): - prio0idx = 0 -- for opt, value in opts.iteritems(): -+ for opt, value in opts.items(): - if opt in ("failregex", "ignoreregex"): - if value is None: continue - multi = [] -diff --git a/fail2ban/client/jailreader.py b/fail2ban/client/jailreader.py -index 50c1d047..969d0bc0 100644 ---- a/fail2ban/client/jailreader.py -+++ b/fail2ban/client/jailreader.py -@@ -117,7 +117,7 @@ class JailReader(ConfigReader): - } - _configOpts.update(FilterReader._configOpts) - -- _ignoreOpts = set(['action', 'filter', 'enabled'] + FilterReader._configOpts.keys()) -+ _ignoreOpts = set(['action', 'filter', 'enabled'] + list(FilterReader._configOpts.keys())) - - def getOptions(self): - -@@ -236,7 +236,7 @@ class JailReader(ConfigReader): - stream.extend(self.__filter.convert()) - # and using options from jail: - FilterReader._fillStream(stream, self.__opts, self.__name) -- for opt, value in self.__opts.iteritems(): -+ for opt, value in self.__opts.items(): - if opt == "logpath": - if self.__opts.get('backend', '').startswith("systemd"): continue - found_files = 0 -diff --git a/fail2ban/helpers.py b/fail2ban/helpers.py -index 6f2bcdd7..7e563696 100644 ---- a/fail2ban/helpers.py -+++ b/fail2ban/helpers.py -@@ -31,6 +31,7 @@ import traceback - from threading import Lock - - from .server.mytime import MyTime -+import importlib - - try: - import ctypes -@@ -63,7 +64,7 @@ if sys.version_info < (3,): # pragma: 3.x no cover - from imp import load_dynamic as __ldm - _sys = __ldm('_sys', 'sys') - except ImportError: # pragma: no cover - only if load_dynamic fails -- reload(sys) -+ importlib.reload(sys) - _sys = sys - if hasattr(_sys, "setdefaultencoding"): - _sys.setdefaultencoding(encoding) -@@ -101,7 +102,7 @@ if sys.version_info >= (3,): # pragma: 2.x no cover - else: # pragma: 3.x no cover - def uni_decode(x, enc=PREFER_ENC, errors='strict'): - try: -- if isinstance(x, unicode): -+ if isinstance(x, str): - return x.encode(enc, errors) - return x - except (UnicodeDecodeError, UnicodeEncodeError): # pragma: no cover - unsure if reachable -@@ -110,7 +111,7 @@ else: # pragma: 3.x no cover - return x.encode(enc, 'replace') - if sys.getdefaultencoding().upper() != 'UTF-8': # pragma: no cover - utf-8 is default encoding now - def uni_string(x): -- if not isinstance(x, unicode): -+ if not isinstance(x, str): - return str(x) - return x.encode(PREFER_ENC, 'replace') - else: -@@ -118,7 +119,7 @@ else: # pragma: 3.x no cover - - - def _as_bool(val): -- return bool(val) if not isinstance(val, basestring) \ -+ return bool(val) if not isinstance(val, str) \ - else val.lower() in ('1', 'on', 'true', 'yes') - - -@@ -326,7 +327,7 @@ def splitwords(s): - """ - if not s: - return [] -- return filter(bool, map(lambda v: v.strip(), re.split('[ ,\n]+', s))) -+ return list(filter(bool, [v.strip() for v in re.split('[ ,\n]+', s)])) - - if sys.version_info >= (3,5): - eval(compile(r'''if 1: -@@ -436,7 +437,7 @@ def substituteRecursiveTags(inptags, conditional='', - while True: - repFlag = False - # substitute each value: -- for tag in tags.iterkeys(): -+ for tag in tags.keys(): - # ignore escaped or already done (or in ignore list): - if tag in ignore or tag in done: continue - # ignore replacing callable items from calling map - should be converted on demand only (by get): -@@ -476,7 +477,7 @@ def substituteRecursiveTags(inptags, conditional='', - m = tre_search(value, m.end()) - continue - # if calling map - be sure we've string: -- if not isinstance(repl, basestring): repl = uni_string(repl) -+ if not isinstance(repl, str): repl = uni_string(repl) - value = value.replace('<%s>' % rtag, repl) - #logSys.log(5, 'value now: %s' % value) - # increment reference count: -diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py -index 5c817fc0..81d50689 100644 ---- a/fail2ban/server/action.py -+++ b/fail2ban/server/action.py -@@ -111,9 +111,9 @@ class CallingMap(MutableMapping, object): - def _asdict(self, calculated=False, checker=None): - d = dict(self.data, **self.storage) - if not calculated: -- return dict((n,v) for n,v in d.iteritems() \ -+ return dict((n,v) for n,v in d.items() \ - if not callable(v) or n in self.CM_REPR_ITEMS) -- for n,v in d.items(): -+ for n,v in list(d.items()): - if callable(v): - try: - # calculate: -@@ -179,7 +179,7 @@ class CallingMap(MutableMapping, object): - return self.__class__(_merge_copy_dicts(self.data, self.storage)) - - --class ActionBase(object): -+class ActionBase(object, metaclass=ABCMeta): - """An abstract base class for actions in Fail2Ban. - - Action Base is a base definition of what methods need to be in -@@ -209,7 +209,6 @@ class ActionBase(object): - Any additional arguments specified in `jail.conf` or passed - via `fail2ban-client` will be passed as keyword arguments. - """ -- __metaclass__ = ABCMeta - - @classmethod - def __subclasshook__(cls, C): -@@ -420,7 +419,7 @@ class CommandAction(ActionBase): - if not callable(family): # pragma: no cover - return self.__substCache.get(key, {}).get(family) - # family as expression - use it to filter values: -- return [v for f, v in self.__substCache.get(key, {}).iteritems() if family(f)] -+ return [v for f, v in self.__substCache.get(key, {}).items() if family(f)] - cmd = args[0] - if cmd: # set: - try: -@@ -432,7 +431,7 @@ class CommandAction(ActionBase): - try: - famd = self.__substCache[key] - cmd = famd.pop(family) -- for family, v in famd.items(): -+ for family, v in list(famd.items()): - if v == cmd: - del famd[family] - except KeyError: # pragma: no cover -@@ -448,7 +447,7 @@ class CommandAction(ActionBase): - res = True - err = 'Script error' - if not family: # all started: -- family = [famoper for (famoper,v) in self.__started.iteritems() if v] -+ family = [famoper for (famoper,v) in self.__started.items() if v] - for famoper in family: - try: - cmd = self._getOperation(tag, famoper) -@@ -617,7 +616,7 @@ class CommandAction(ActionBase): - and executes the resulting command. - """ - # collect started families, may be started on demand (conditional): -- family = [f for (f,v) in self.__started.iteritems() if v & 3 == 3]; # started and contains items -+ family = [f for (f,v) in self.__started.items() if v & 3 == 3]; # started and contains items - # if nothing contains items: - if not family: return True - # flush: -@@ -642,7 +641,7 @@ class CommandAction(ActionBase): - """ - # collect started families, if started on demand (conditional): - if family is None: -- family = [f for (f,v) in self.__started.iteritems() if v] -+ family = [f for (f,v) in self.__started.items() if v] - # if no started (on demand) actions: - if not family: return True - self.__started = {} -@@ -676,7 +675,7 @@ class CommandAction(ActionBase): - ret = True - # for each started family: - if self.actioncheck: -- for (family, started) in self.__started.items(): -+ for (family, started) in list(self.__started.items()): - if started and not self._invariantCheck(family, beforeRepair): - # reset started flag and command of executed operation: - self.__started[family] = 0 -diff --git a/fail2ban/server/actions.py b/fail2ban/server/actions.py -index 24fea838..94b9c3ed 100644 ---- a/fail2ban/server/actions.py -+++ b/fail2ban/server/actions.py -@@ -156,11 +156,11 @@ class Actions(JailThread, Mapping): - else: - if hasattr(self, '_reload_actions'): - # reload actions after all parameters set via stream: -- for name, initOpts in self._reload_actions.iteritems(): -+ for name, initOpts in self._reload_actions.items(): - if name in self._actions: - self._actions[name].reload(**(initOpts if initOpts else {})) - # remove obsolete actions (untouched by reload process): -- delacts = OrderedDict((name, action) for name, action in self._actions.iteritems() -+ delacts = OrderedDict((name, action) for name, action in self._actions.items() - if name not in self._reload_actions) - if len(delacts): - # unban all tickets using removed actions only: -@@ -289,7 +289,7 @@ class Actions(JailThread, Mapping): - """ - if actions is None: - actions = self._actions -- revactions = actions.items() -+ revactions = list(actions.items()) - revactions.reverse() - for name, action in revactions: - try: -@@ -314,7 +314,7 @@ class Actions(JailThread, Mapping): - True when the thread exits nicely. - """ - cnt = 0 -- for name, action in self._actions.iteritems(): -+ for name, action in self._actions.items(): - try: - action.start() - except Exception as e: -@@ -474,7 +474,7 @@ class Actions(JailThread, Mapping): - Observers.Main.add('banFound', bTicket, self._jail, btime) - logSys.notice("[%s] %sBan %s", self._jail.name, ('' if not bTicket.restored else 'Restore '), ip) - # do actions : -- for name, action in self._actions.iteritems(): -+ for name, action in self._actions.items(): - try: - if ticket.restored and getattr(action, 'norestored', False): - continue -@@ -511,13 +511,13 @@ class Actions(JailThread, Mapping): - if bTicket.banEpoch == self.banEpoch and diftm > 3: - # avoid too often checks: - if not rebanacts and MyTime.time() > self.__lastConsistencyCheckTM + 3: -- for action in self._actions.itervalues(): -+ for action in self._actions.values(): - action.consistencyCheck() - self.__lastConsistencyCheckTM = MyTime.time() - # check epoch in order to reban it: - if bTicket.banEpoch < self.banEpoch: - if not rebanacts: rebanacts = dict( -- (name, action) for name, action in self._actions.iteritems() -+ (name, action) for name, action in self._actions.items() - if action.banEpoch > bTicket.banEpoch) - cnt += self.__reBan(bTicket, actions=rebanacts) - else: # pragma: no cover - unexpected: ticket is not banned for some reasons - reban using all actions: -@@ -542,8 +542,8 @@ class Actions(JailThread, Mapping): - ip = ticket.getIP() - aInfo = self.__getActionInfo(ticket) - if log: -- logSys.notice("[%s] Reban %s%s", self._jail.name, aInfo["ip"], (', action %r' % actions.keys()[0] if len(actions) == 1 else '')) -- for name, action in actions.iteritems(): -+ logSys.notice("[%s] Reban %s%s", self._jail.name, aInfo["ip"], (', action %r' % list(actions.keys())[0] if len(actions) == 1 else '')) -+ for name, action in actions.items(): - try: - logSys.debug("[%s] action %r: reban %s", self._jail.name, name, ip) - if not aInfo.immutable: aInfo.reset() -@@ -567,7 +567,7 @@ class Actions(JailThread, Mapping): - if not self.__banManager._inBanList(ticket): return - # do actions : - aInfo = None -- for name, action in self._actions.iteritems(): -+ for name, action in self._actions.items(): - try: - if ticket.restored and getattr(action, 'norestored', False): - continue -@@ -616,7 +616,7 @@ class Actions(JailThread, Mapping): - cnt = 0 - # first we'll execute flush for actions supporting this operation: - unbactions = {} -- for name, action in (actions if actions is not None else self._actions).iteritems(): -+ for name, action in (actions if actions is not None else self._actions).items(): - try: - if hasattr(action, 'flush') and (not isinstance(action, CommandAction) or action.actionflush): - logSys.notice("[%s] Flush ticket(s) with %s", self._jail.name, name) -@@ -671,7 +671,7 @@ class Actions(JailThread, Mapping): - aInfo = self.__getActionInfo(ticket) - if log: - logSys.notice("[%s] Unban %s", self._jail.name, aInfo["ip"]) -- for name, action in unbactions.iteritems(): -+ for name, action in unbactions.items(): - try: - logSys.debug("[%s] action %r: unban %s", self._jail.name, name, ip) - if not aInfo.immutable: aInfo.reset() -diff --git a/fail2ban/server/asyncserver.py b/fail2ban/server/asyncserver.py -index e3400737..f5f9740b 100644 ---- a/fail2ban/server/asyncserver.py -+++ b/fail2ban/server/asyncserver.py -@@ -178,7 +178,7 @@ def loop(active, timeout=None, use_poll=False, err_count=None): - elif err_count['listen'] > 100: # pragma: no cover - normally unreachable - if ( - e.args[0] == errno.EMFILE # [Errno 24] Too many open files -- or sum(err_count.itervalues()) > 1000 -+ or sum(err_count.values()) > 1000 - ): - logSys.critical("Too many errors - critical count reached %r", err_count) - break -@@ -220,7 +220,7 @@ class AsyncServer(asyncore.dispatcher): - elif self.__errCount['accept'] > 100: - if ( - (isinstance(e, socket.error) and e.args[0] == errno.EMFILE) # [Errno 24] Too many open files -- or sum(self.__errCount.itervalues()) > 1000 -+ or sum(self.__errCount.values()) > 1000 - ): - logSys.critical("Too many errors - critical count reached %r", self.__errCount) - self.stop() -diff --git a/fail2ban/server/banmanager.py b/fail2ban/server/banmanager.py -index 5770bfd7..9bb44971 100644 ---- a/fail2ban/server/banmanager.py -+++ b/fail2ban/server/banmanager.py -@@ -105,9 +105,9 @@ class BanManager: - def getBanList(self, ordered=False, withTime=False): - with self.__lock: - if not ordered: -- return self.__banList.keys() -+ return list(self.__banList.keys()) - lst = [] -- for ticket in self.__banList.itervalues(): -+ for ticket in self.__banList.values(): - eob = ticket.getEndOfBanTime(self.__banTime) - lst.append((ticket,eob)) - lst.sort(key=lambda t: t[1]) -@@ -126,7 +126,7 @@ class BanManager: - - def __iter__(self): - with self.__lock: -- return self.__banList.itervalues() -+ return iter(self.__banList.values()) - - ## - # Returns normalized value -@@ -165,7 +165,7 @@ class BanManager: - return return_dict - # get ips in lock: - with self.__lock: -- banIPs = [banData.getIP() for banData in self.__banList.values()] -+ banIPs = [banData.getIP() for banData in list(self.__banList.values())] - # get cymru info: - try: - for ip in banIPs: -@@ -341,7 +341,7 @@ class BanManager: - # Gets the list of ticket to remove (thereby correct next unban time). - unBanList = {} - nextUnbanTime = BanTicket.MAX_TIME -- for fid,ticket in self.__banList.iteritems(): -+ for fid,ticket in self.__banList.items(): - # current time greater as end of ban - timed out: - eob = ticket.getEndOfBanTime(self.__banTime) - if time > eob: -@@ -357,15 +357,15 @@ class BanManager: - if len(unBanList): - if len(unBanList) / 2.0 <= len(self.__banList) / 3.0: - # few as 2/3 should be removed - remove particular items: -- for fid in unBanList.iterkeys(): -+ for fid in unBanList.keys(): - del self.__banList[fid] - else: - # create new dictionary without items to be deleted: -- self.__banList = dict((fid,ticket) for fid,ticket in self.__banList.iteritems() \ -+ self.__banList = dict((fid,ticket) for fid,ticket in self.__banList.items() \ - if fid not in unBanList) - - # return list of tickets: -- return unBanList.values() -+ return list(unBanList.values()) - - ## - # Flush the ban list. -@@ -375,7 +375,7 @@ class BanManager: - - def flushBanList(self): - with self.__lock: -- uBList = self.__banList.values() -+ uBList = list(self.__banList.values()) - self.__banList = dict() - return uBList - -diff --git a/fail2ban/server/database.py b/fail2ban/server/database.py -index ed736a7a..0e8c9aec 100644 ---- a/fail2ban/server/database.py -+++ b/fail2ban/server/database.py -@@ -67,13 +67,13 @@ if sys.version_info >= (3,): # pragma: 2.x no cover - else: # pragma: 3.x no cover - def _normalize(x): - if isinstance(x, dict): -- return dict((_normalize(k), _normalize(v)) for k, v in x.iteritems()) -+ return dict((_normalize(k), _normalize(v)) for k, v in x.items()) - elif isinstance(x, (list, set)): - return [_normalize(element) for element in x] -- elif isinstance(x, unicode): -+ elif isinstance(x, str): - # in 2.x default text_factory is unicode - so return proper unicode here: - return x.encode(PREFER_ENC, 'replace').decode(PREFER_ENC) -- elif isinstance(x, basestring): -+ elif isinstance(x, str): - return x.decode(PREFER_ENC, 'replace') - return x - -diff --git a/fail2ban/server/failmanager.py b/fail2ban/server/failmanager.py -index 93c028fb..a9c6b5f6 100644 ---- a/fail2ban/server/failmanager.py -+++ b/fail2ban/server/failmanager.py -@@ -57,7 +57,7 @@ class FailManager: - def getFailCount(self): - # may be slow on large list of failures, should be used for test purposes only... - with self.__lock: -- return len(self.__failList), sum([f.getRetry() for f in self.__failList.values()]) -+ return len(self.__failList), sum([f.getRetry() for f in list(self.__failList.values())]) - - def getFailTotal(self): - with self.__lock: -@@ -125,7 +125,7 @@ class FailManager: - # in case of having many active failures, it should be ran only - # if debug level is "low" enough - failures_summary = ', '.join(['%s:%d' % (k, v.getRetry()) -- for k,v in self.__failList.iteritems()]) -+ for k,v in self.__failList.items()]) - logSys.log(logLevel, "Total # of detected failures: %d. Current failures from %d IPs (IP:count): %s" - % (self.__failTotal, len(self.__failList), failures_summary)) - -@@ -138,7 +138,7 @@ class FailManager: - - def cleanup(self, time): - with self.__lock: -- todelete = [fid for fid,item in self.__failList.iteritems() \ -+ todelete = [fid for fid,item in self.__failList.items() \ - if item.getLastTime() + self.__maxTime <= time] - if len(todelete) == len(self.__failList): - # remove all: -@@ -152,7 +152,7 @@ class FailManager: - del self.__failList[fid] - else: - # create new dictionary without items to be deleted: -- self.__failList = dict((fid,item) for fid,item in self.__failList.iteritems() \ -+ self.__failList = dict((fid,item) for fid,item in self.__failList.items() \ - if item.getLastTime() + self.__maxTime > time) - self.__bgSvc.service() - -diff --git a/fail2ban/server/failregex.py b/fail2ban/server/failregex.py -index f7dafbef..fb75187d 100644 ---- a/fail2ban/server/failregex.py -+++ b/fail2ban/server/failregex.py -@@ -128,10 +128,7 @@ class Regex: - self._regexObj = re.compile(regex, re.MULTILINE if multiline else 0) - self._regex = regex - self._altValues = {} -- for k in filter( -- lambda k: len(k) > len(ALTNAME_PRE) and k.startswith(ALTNAME_PRE), -- self._regexObj.groupindex -- ): -+ for k in [k for k in self._regexObj.groupindex if len(k) > len(ALTNAME_PRE) and k.startswith(ALTNAME_PRE)]: - n = ALTNAME_CRE.match(k).group(1) - self._altValues[k] = n - self._altValues = list(self._altValues.items()) if len(self._altValues) else None -@@ -211,7 +208,7 @@ class Regex: - # - @staticmethod - def _tupleLinesBuf(tupleLines): -- return "\n".join(map(lambda v: "".join(v[::2]), tupleLines)) + "\n" -+ return "\n".join(["".join(v[::2]) for v in tupleLines]) + "\n" - - ## - # Searches the regular expression. -@@ -223,7 +220,7 @@ class Regex: - - def search(self, tupleLines, orgLines=None): - buf = tupleLines -- if not isinstance(tupleLines, basestring): -+ if not isinstance(tupleLines, str): - buf = Regex._tupleLinesBuf(tupleLines) - self._matchCache = self._regexObj.search(buf) - if self._matchCache: -diff --git a/fail2ban/server/filter.py b/fail2ban/server/filter.py -index 998fe298..d181fd38 100644 ---- a/fail2ban/server/filter.py -+++ b/fail2ban/server/filter.py -@@ -292,7 +292,7 @@ class Filter(JailThread): - dd = DateDetector() - dd.default_tz = self.__logtimezone - if not isinstance(pattern, (list, tuple)): -- pattern = filter(bool, map(str.strip, re.split('\n+', pattern))) -+ pattern = list(filter(bool, list(map(str.strip, re.split('\n+', pattern))))) - for pattern in pattern: - dd.appendTemplate(pattern) - self.dateDetector = dd -@@ -987,7 +987,7 @@ class FileFilter(Filter): - # @return log paths - - def getLogPaths(self): -- return self.__logs.keys() -+ return list(self.__logs.keys()) - - ## - # Get the log containers -@@ -995,7 +995,7 @@ class FileFilter(Filter): - # @return log containers - - def getLogs(self): -- return self.__logs.values() -+ return list(self.__logs.values()) - - ## - # Get the count of log containers -@@ -1021,7 +1021,7 @@ class FileFilter(Filter): - - def setLogEncoding(self, encoding): - encoding = super(FileFilter, self).setLogEncoding(encoding) -- for log in self.__logs.itervalues(): -+ for log in self.__logs.values(): - log.setEncoding(encoding) - - def getLog(self, path): -@@ -1183,7 +1183,7 @@ class FileFilter(Filter): - """Status of Filter plus files being monitored. - """ - ret = super(FileFilter, self).status(flavor=flavor) -- path = self.__logs.keys() -+ path = list(self.__logs.keys()) - ret.append(("File list", path)) - return ret - -@@ -1191,7 +1191,7 @@ class FileFilter(Filter): - """Stop monitoring of log-file(s) - """ - # stop files monitoring: -- for path in self.__logs.keys(): -+ for path in list(self.__logs.keys()): - self.delLogPath(path) - # stop thread: - super(Filter, self).stop() -diff --git a/fail2ban/server/filterpoll.py b/fail2ban/server/filterpoll.py -index 228a2c8b..d49315cc 100644 ---- a/fail2ban/server/filterpoll.py -+++ b/fail2ban/server/filterpoll.py -@@ -176,4 +176,4 @@ class FilterPoll(FileFilter): - return False - - def getPendingPaths(self): -- return self.__file404Cnt.keys() -+ return list(self.__file404Cnt.keys()) -diff --git a/fail2ban/server/filterpyinotify.py b/fail2ban/server/filterpyinotify.py -index ca6b253f..b683b860 100644 ---- a/fail2ban/server/filterpyinotify.py -+++ b/fail2ban/server/filterpyinotify.py -@@ -158,7 +158,7 @@ class FilterPyinotify(FileFilter): - except KeyError: pass - - def getPendingPaths(self): -- return self.__pending.keys() -+ return list(self.__pending.keys()) - - def _checkPending(self): - if not self.__pending: -@@ -168,7 +168,7 @@ class FilterPyinotify(FileFilter): - return - found = {} - minTime = 60 -- for path, (retardTM, isDir) in self.__pending.iteritems(): -+ for path, (retardTM, isDir) in self.__pending.items(): - if ntm - self.__pendingChkTime < retardTM: - if minTime > retardTM: minTime = retardTM - continue -@@ -184,7 +184,7 @@ class FilterPyinotify(FileFilter): - self.__pendingChkTime = time.time() - self.__pendingMinTime = minTime - # process now because we've missed it in monitoring: -- for path, isDir in found.iteritems(): -+ for path, isDir in found.items(): - self._delPending(path) - # refresh monitoring of this: - self._refreshWatcher(path, isDir=isDir) -diff --git a/fail2ban/server/ipdns.py b/fail2ban/server/ipdns.py -index 6648dac6..fe8f8db8 100644 ---- a/fail2ban/server/ipdns.py -+++ b/fail2ban/server/ipdns.py -@@ -275,7 +275,7 @@ class IPAddr(object): - raise ValueError("invalid ipstr %r, too many plen representation" % (ipstr,)) - if "." in s[1] or ":" in s[1]: # 255.255.255.0 resp. ffff:: style mask - s[1] = IPAddr.masktoplen(s[1]) -- s[1] = long(s[1]) -+ s[1] = int(s[1]) - return s - - def __init(self, ipstr, cidr=CIDR_UNSPEC): -@@ -309,7 +309,7 @@ class IPAddr(object): - - # mask out host portion if prefix length is supplied - if cidr is not None and cidr >= 0: -- mask = ~(0xFFFFFFFFL >> cidr) -+ mask = ~(0xFFFFFFFF >> cidr) - self._addr &= mask - self._plen = cidr - -@@ -321,13 +321,13 @@ class IPAddr(object): - - # mask out host portion if prefix length is supplied - if cidr is not None and cidr >= 0: -- mask = ~(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFL >> cidr) -+ mask = ~(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF >> cidr) - self._addr &= mask - self._plen = cidr - - # if IPv6 address is a IPv4-compatible, make instance a IPv4 - elif self.isInNet(IPAddr.IP6_4COMPAT): -- self._addr = lo & 0xFFFFFFFFL -+ self._addr = lo & 0xFFFFFFFF - self._family = socket.AF_INET - self._plen = 32 - else: -@@ -445,7 +445,7 @@ class IPAddr(object): - elif self.isIPv6: - # convert network to host byte order - hi = self._addr >> 64 -- lo = self._addr & 0xFFFFFFFFFFFFFFFFL -+ lo = self._addr & 0xFFFFFFFFFFFFFFFF - binary = struct.pack("!QQ", hi, lo) - if self._plen and self._plen < 128: - add = "/%d" % self._plen -@@ -503,9 +503,9 @@ class IPAddr(object): - if self.family != net.family: - return False - if self.isIPv4: -- mask = ~(0xFFFFFFFFL >> net.plen) -+ mask = ~(0xFFFFFFFF >> net.plen) - elif self.isIPv6: -- mask = ~(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFL >> net.plen) -+ mask = ~(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF >> net.plen) - else: - return False - -@@ -517,7 +517,7 @@ class IPAddr(object): - m4 = (1 << 32)-1 - mmap = {m6: 128, m4: 32, 0: 0} - m = 0 -- for i in xrange(0, 128): -+ for i in range(0, 128): - m |= 1 << i - if i < 32: - mmap[m ^ m4] = 32-1-i -diff --git a/fail2ban/server/jail.py b/fail2ban/server/jail.py -index ce9968a8..5fa5ef10 100644 ---- a/fail2ban/server/jail.py -+++ b/fail2ban/server/jail.py -@@ -26,7 +26,7 @@ __license__ = "GPL" - import logging - import math - import random --import Queue -+import queue - - from .actions import Actions - from ..helpers import getLogger, _as_bool, extractOptions, MyTime -@@ -76,7 +76,7 @@ class Jail(object): - "might not function correctly. Please shorten" - % name) - self.__name = name -- self.__queue = Queue.Queue() -+ self.__queue = queue.Queue() - self.__filter = None - # Extra parameters for increase ban time - self._banExtra = {}; -@@ -127,25 +127,25 @@ class Jail(object): - "Failed to initialize any backend for Jail %r" % self.name) - - def _initPolling(self, **kwargs): -- from filterpoll import FilterPoll -+ from .filterpoll import FilterPoll - logSys.info("Jail '%s' uses poller %r" % (self.name, kwargs)) - self.__filter = FilterPoll(self, **kwargs) - - def _initGamin(self, **kwargs): - # Try to import gamin -- from filtergamin import FilterGamin -+ from .filtergamin import FilterGamin - logSys.info("Jail '%s' uses Gamin %r" % (self.name, kwargs)) - self.__filter = FilterGamin(self, **kwargs) - - def _initPyinotify(self, **kwargs): - # Try to import pyinotify -- from filterpyinotify import FilterPyinotify -+ from .filterpyinotify import FilterPyinotify - logSys.info("Jail '%s' uses pyinotify %r" % (self.name, kwargs)) - self.__filter = FilterPyinotify(self, **kwargs) - - def _initSystemd(self, **kwargs): # pragma: systemd no cover - # Try to import systemd -- from filtersystemd import FilterSystemd -+ from .filtersystemd import FilterSystemd - logSys.info("Jail '%s' uses systemd %r" % (self.name, kwargs)) - self.__filter = FilterSystemd(self, **kwargs) - -@@ -213,7 +213,7 @@ class Jail(object): - try: - ticket = self.__queue.get(False) - return ticket -- except Queue.Empty: -+ except queue.Empty: - return False - - def setBanTimeExtra(self, opt, value): -diff --git a/fail2ban/server/mytime.py b/fail2ban/server/mytime.py -index 98b69bd4..24bba5cf 100644 ---- a/fail2ban/server/mytime.py -+++ b/fail2ban/server/mytime.py -@@ -162,7 +162,7 @@ class MyTime: - - @returns number (calculated seconds from expression "val") - """ -- if isinstance(val, (int, long, float, complex)): -+ if isinstance(val, (int, float, complex)): - return val - # replace together standing abbreviations, example '1d12h' -> '1d 12h': - val = MyTime._str2sec_prep.sub(r" \1", val) -diff --git a/fail2ban/server/server.py b/fail2ban/server/server.py -index 159f6506..fc948e8c 100644 ---- a/fail2ban/server/server.py -+++ b/fail2ban/server/server.py -@@ -97,7 +97,7 @@ class Server: - - def start(self, sock, pidfile, force=False, observer=True, conf={}): - # First set the mask to only allow access to owner -- os.umask(0077) -+ os.umask(0o077) - # Second daemonize before logging etc, because it will close all handles: - if self.__daemon: # pragma: no cover - logSys.info("Starting in daemon mode") -@@ -190,7 +190,7 @@ class Server: - - # Restore default signal handlers: - if _thread_name() == '_MainThread': -- for s, sh in self.__prev_signals.iteritems(): -+ for s, sh in self.__prev_signals.items(): - signal.signal(s, sh) - - # Give observer a small chance to complete its work before exit -@@ -268,10 +268,10 @@ class Server: - logSys.info("Stopping all jails") - with self.__lock: - # 1st stop all jails (signal and stop actions/filter thread): -- for name in self.__jails.keys(): -+ for name in list(self.__jails.keys()): - self.delJail(name, stop=True, join=False) - # 2nd wait for end and delete jails: -- for name in self.__jails.keys(): -+ for name in list(self.__jails.keys()): - self.delJail(name, stop=False, join=True) - - def reloadJails(self, name, opts, begin): -@@ -302,7 +302,7 @@ class Server: - if "--restart" in opts: - self.stopAllJail() - # first set all affected jail(s) to idle and reset filter regex and other lists/dicts: -- for jn, jail in self.__jails.iteritems(): -+ for jn, jail in self.__jails.items(): - if name == '--all' or jn == name: - jail.idle = True - self.__reload_state[jn] = jail -@@ -313,7 +313,7 @@ class Server: - # end reload, all affected (or new) jails have already all new parameters (via stream) and (re)started: - with self.__lock: - deljails = [] -- for jn, jail in self.__jails.iteritems(): -+ for jn, jail in self.__jails.items(): - # still in reload state: - if jn in self.__reload_state: - # remove jails that are not reloaded (untouched, so not in new configuration) -@@ -513,7 +513,7 @@ class Server: - jails = [self.__jails[name]] - else: - # in all jails: -- jails = self.__jails.values() -+ jails = list(self.__jails.values()) - # unban given or all (if value is None): - cnt = 0 - ifexists |= (name is None) -@@ -551,7 +551,7 @@ class Server: - def isAlive(self, jailnum=None): - if jailnum is not None and len(self.__jails) != jailnum: - return 0 -- for jail in self.__jails.values(): -+ for jail in list(self.__jails.values()): - if not jail.isAlive(): - return 0 - return 1 -@@ -759,7 +759,7 @@ class Server: - return "flushed" - - def setThreadOptions(self, value): -- for o, v in value.iteritems(): -+ for o, v in value.items(): - if o == 'stacksize': - threading.stack_size(int(v)*1024) - else: # pragma: no cover -diff --git a/fail2ban/server/strptime.py b/fail2ban/server/strptime.py -index 498d284b..a5579fdc 100644 ---- a/fail2ban/server/strptime.py -+++ b/fail2ban/server/strptime.py -@@ -79,7 +79,7 @@ timeRE['ExY'] = r"(?P<Y>%s\d)" % _getYearCentRE(cent=(0,3), distance=3) - timeRE['Exy'] = r"(?P<y>%s\d)" % _getYearCentRE(cent=(2,3), distance=3) - - def getTimePatternRE(): -- keys = timeRE.keys() -+ keys = list(timeRE.keys()) - patt = (r"%%(%%|%s|[%s])" % ( - "|".join([k for k in keys if len(k) > 1]), - "".join([k for k in keys if len(k) == 1]), -@@ -134,7 +134,7 @@ def zone2offset(tz, dt): - """ - if isinstance(tz, int): - return tz -- if isinstance(tz, basestring): -+ if isinstance(tz, str): - return validateTimeZone(tz) - tz, tzo = tz - if tzo is None or tzo == '': # without offset -@@ -171,7 +171,7 @@ def reGroupDictStrptime(found_dict, msec=False, default_tz=None): - year = month = day = hour = minute = tzoffset = \ - weekday = julian = week_of_year = None - second = fraction = 0 -- for key, val in found_dict.iteritems(): -+ for key, val in found_dict.items(): - if val is None: continue - # Directives not explicitly handled below: - # c, x, X -diff --git a/fail2ban/server/ticket.py b/fail2ban/server/ticket.py -index f67e0d23..f0b727c2 100644 ---- a/fail2ban/server/ticket.py -+++ b/fail2ban/server/ticket.py -@@ -55,7 +55,7 @@ class Ticket(object): - self._time = time if time is not None else MyTime.time() - self._data = {'matches': matches or [], 'failures': 0} - if data is not None: -- for k,v in data.iteritems(): -+ for k,v in data.items(): - if v is not None: - self._data[k] = v - if ticket: -@@ -89,7 +89,7 @@ class Ticket(object): - - def setIP(self, value): - # guarantee using IPAddr instead of unicode, str for the IP -- if isinstance(value, basestring): -+ if isinstance(value, str): - value = IPAddr(value) - self._ip = value - -@@ -181,7 +181,7 @@ class Ticket(object): - if len(args) == 1: - # todo: if support >= 2.7 only: - # self._data = {k:v for k,v in args[0].iteritems() if v is not None} -- self._data = dict([(k,v) for k,v in args[0].iteritems() if v is not None]) -+ self._data = dict([(k,v) for k,v in args[0].items() if v is not None]) - # add k,v list or dict (merge): - elif len(args) == 2: - self._data.update((args,)) -@@ -192,7 +192,7 @@ class Ticket(object): - # filter (delete) None values: - # todo: if support >= 2.7 only: - # self._data = {k:v for k,v in self._data.iteritems() if v is not None} -- self._data = dict([(k,v) for k,v in self._data.iteritems() if v is not None]) -+ self._data = dict([(k,v) for k,v in self._data.items() if v is not None]) - - def getData(self, key=None, default=None): - # return whole data dict: -@@ -201,17 +201,17 @@ class Ticket(object): - # return default if not exists: - if not self._data: - return default -- if not isinstance(key,(str,unicode,type(None),int,float,bool,complex)): -+ if not isinstance(key,(str,type(None),int,float,bool,complex)): - # return filtered by lambda/function: - if callable(key): - # todo: if support >= 2.7 only: - # return {k:v for k,v in self._data.iteritems() if key(k)} -- return dict([(k,v) for k,v in self._data.iteritems() if key(k)]) -+ return dict([(k,v) for k,v in self._data.items() if key(k)]) - # return filtered by keys: - if hasattr(key, '__iter__'): - # todo: if support >= 2.7 only: - # return {k:v for k,v in self._data.iteritems() if k in key} -- return dict([(k,v) for k,v in self._data.iteritems() if k in key]) -+ return dict([(k,v) for k,v in self._data.items() if k in key]) - # return single value of data: - return self._data.get(key, default) - -diff --git a/fail2ban/server/transmitter.py b/fail2ban/server/transmitter.py -index f83e9d5f..80726cb4 100644 ---- a/fail2ban/server/transmitter.py -+++ b/fail2ban/server/transmitter.py -@@ -475,7 +475,7 @@ class Transmitter: - opt = command[1][len("bantime."):] - return self.__server.getBanTimeExtra(name, opt) - elif command[1] == "actions": -- return self.__server.getActions(name).keys() -+ return list(self.__server.getActions(name).keys()) - elif command[1] == "action": - actionname = command[2] - actionvalue = command[3] -diff --git a/fail2ban/server/utils.py b/fail2ban/server/utils.py -index d4461a7d..13c24e76 100644 ---- a/fail2ban/server/utils.py -+++ b/fail2ban/server/utils.py -@@ -57,7 +57,7 @@ _RETCODE_HINTS = { - - # Dictionary to lookup signal name from number - signame = dict((num, name) -- for name, num in signal.__dict__.iteritems() if name.startswith("SIG")) -+ for name, num in signal.__dict__.items() if name.startswith("SIG")) - - class Utils(): - """Utilities provide diverse static methods like executes OS shell commands, etc. -@@ -109,7 +109,7 @@ class Utils(): - break - else: # pragma: 3.x no cover (dict is in 2.6 only) - remlst = [] -- for (ck, cv) in cache.iteritems(): -+ for (ck, cv) in cache.items(): - # if expired: - if cv[1] <= t: - remlst.append(ck) -@@ -152,7 +152,7 @@ class Utils(): - if not isinstance(realCmd, list): - realCmd = [realCmd] - i = len(realCmd)-1 -- for k, v in varsDict.iteritems(): -+ for k, v in varsDict.items(): - varsStat += "%s=$%s " % (k, i) - realCmd.append(v) - i += 1 -diff --git a/fail2ban/tests/action_d/test_badips.py b/fail2ban/tests/action_d/test_badips.py -index 013c0fdb..3c35e4d7 100644 ---- a/fail2ban/tests/action_d/test_badips.py -+++ b/fail2ban/tests/action_d/test_badips.py -@@ -32,7 +32,7 @@ from ..utils import LogCaptureTestCase, CONFIG_DIR - if sys.version_info >= (3, ): # pragma: 2.x no cover - from urllib.error import HTTPError, URLError - else: # pragma: 3.x no cover -- from urllib2 import HTTPError, URLError -+ from urllib.error import HTTPError, URLError - - def skip_if_not_available(f): - """Helper to decorate tests to skip in case of timeout/http-errors like "502 bad gateway". -diff --git a/fail2ban/tests/actiontestcase.py b/fail2ban/tests/actiontestcase.py -index 1a00c040..ecd09246 100644 ---- a/fail2ban/tests/actiontestcase.py -+++ b/fail2ban/tests/actiontestcase.py -@@ -244,14 +244,14 @@ class CommandActionTest(LogCaptureTestCase): - setattr(self.__action, 'ab', "<ac>") - setattr(self.__action, 'x?family=inet6', "") - # produce self-referencing properties except: -- self.assertRaisesRegexp(ValueError, r"properties contain self referencing definitions", -+ self.assertRaisesRegex(ValueError, r"properties contain self referencing definitions", - lambda: self.__action.replaceTag("<a><b>", - self.__action._properties, conditional="family=inet4") - ) - # remore self-referencing in props: - delattr(self.__action, 'ac') - # produce self-referencing query except: -- self.assertRaisesRegexp(ValueError, r"possible self referencing definitions in query", -+ self.assertRaisesRegex(ValueError, r"possible self referencing definitions in query", - lambda: self.__action.replaceTag("<x<x<x<x<x<x<x<x<x<x<x<x<x<x<x<x<x<x<x<x<x>>>>>>>>>>>>>>>>>>>>>", - self.__action._properties, conditional="family=inet6") - ) -diff --git a/fail2ban/tests/clientreadertestcase.py b/fail2ban/tests/clientreadertestcase.py -index 2c1d0a0e..aa7908c4 100644 ---- a/fail2ban/tests/clientreadertestcase.py -+++ b/fail2ban/tests/clientreadertestcase.py -@@ -390,7 +390,7 @@ class JailReaderTest(LogCaptureTestCase): - # And multiple groups (`][` instead of `,`) - result = extractOptions(option.replace(',', '][')) - expected2 = (expected[0], -- dict((k, v.replace(',', '][')) for k, v in expected[1].iteritems()) -+ dict((k, v.replace(',', '][')) for k, v in expected[1].items()) - ) - self.assertEqual(expected2, result) - -@@ -975,7 +975,7 @@ filter = testfilter1 - self.assertEqual(add_actions[-1][-1], "{}") - - def testLogPathFileFilterBackend(self): -- self.assertRaisesRegexp(ValueError, r"Have not found any log file for .* jail", -+ self.assertRaisesRegex(ValueError, r"Have not found any log file for .* jail", - self._testLogPath, backend='polling') - - def testLogPathSystemdBackend(self): -diff --git a/fail2ban/tests/databasetestcase.py b/fail2ban/tests/databasetestcase.py -index 9a5e9fa1..562461a6 100644 ---- a/fail2ban/tests/databasetestcase.py -+++ b/fail2ban/tests/databasetestcase.py -@@ -67,7 +67,7 @@ class DatabaseTest(LogCaptureTestCase): - - @property - def db(self): -- if isinstance(self._db, basestring) and self._db == ':auto-create-in-memory:': -+ if isinstance(self._db, str) and self._db == ':auto-create-in-memory:': - self._db = getFail2BanDb(self.dbFilename) - return self._db - @db.setter -@@ -159,7 +159,7 @@ class DatabaseTest(LogCaptureTestCase): - self.db = Fail2BanDb(self.dbFilename) - self.assertEqual(self.db.getJailNames(), set(['DummyJail #29162448 with 0 tickets'])) - self.assertEqual(self.db.getLogPaths(), set(['/tmp/Fail2BanDb_pUlZJh.log'])) -- ticket = FailTicket("127.0.0.1", 1388009242.26, [u"abc\n"]) -+ ticket = FailTicket("127.0.0.1", 1388009242.26, ["abc\n"]) - self.assertEqual(self.db.getBans()[0], ticket) - - self.assertEqual(self.db.updateDb(Fail2BanDb.__version__), Fail2BanDb.__version__) -@@ -185,9 +185,9 @@ class DatabaseTest(LogCaptureTestCase): - self.assertEqual(len(bans), 2) - # compare first ticket completely: - ticket = FailTicket("1.2.3.7", 1417595494, [ -- u'Dec 3 09:31:08 f2btest test:auth[27658]: pam_unix(test:auth): authentication failure; logname= uid=0 euid=0 tty=test ruser= rhost=1.2.3.7', -- u'Dec 3 09:31:32 f2btest test:auth[27671]: pam_unix(test:auth): authentication failure; logname= uid=0 euid=0 tty=test ruser= rhost=1.2.3.7', -- u'Dec 3 09:31:34 f2btest test:auth[27673]: pam_unix(test:auth): authentication failure; logname= uid=0 euid=0 tty=test ruser= rhost=1.2.3.7' -+ 'Dec 3 09:31:08 f2btest test:auth[27658]: pam_unix(test:auth): authentication failure; logname= uid=0 euid=0 tty=test ruser= rhost=1.2.3.7', -+ 'Dec 3 09:31:32 f2btest test:auth[27671]: pam_unix(test:auth): authentication failure; logname= uid=0 euid=0 tty=test ruser= rhost=1.2.3.7', -+ 'Dec 3 09:31:34 f2btest test:auth[27673]: pam_unix(test:auth): authentication failure; logname= uid=0 euid=0 tty=test ruser= rhost=1.2.3.7' - ]) - ticket.setAttempt(3) - self.assertEqual(bans[0], ticket) -@@ -286,11 +286,11 @@ class DatabaseTest(LogCaptureTestCase): - # invalid + valid, invalid + valid unicode, invalid + valid dual converted (like in filter:readline by fallback) ... - tickets = [ - FailTicket("127.0.0.1", 0, ['user "test"', 'user "\xd1\xe2\xe5\xf2\xe0"', 'user "\xc3\xa4\xc3\xb6\xc3\xbc\xc3\x9f"']), -- FailTicket("127.0.0.2", 0, ['user "test"', u'user "\xd1\xe2\xe5\xf2\xe0"', u'user "\xc3\xa4\xc3\xb6\xc3\xbc\xc3\x9f"']), -+ FailTicket("127.0.0.2", 0, ['user "test"', 'user "\xd1\xe2\xe5\xf2\xe0"', 'user "\xc3\xa4\xc3\xb6\xc3\xbc\xc3\x9f"']), - FailTicket("127.0.0.3", 0, ['user "test"', b'user "\xd1\xe2\xe5\xf2\xe0"', b'user "\xc3\xa4\xc3\xb6\xc3\xbc\xc3\x9f"']), -- FailTicket("127.0.0.4", 0, ['user "test"', 'user "\xd1\xe2\xe5\xf2\xe0"', u'user "\xe4\xf6\xfc\xdf"']), -+ FailTicket("127.0.0.4", 0, ['user "test"', 'user "\xd1\xe2\xe5\xf2\xe0"', 'user "\xe4\xf6\xfc\xdf"']), - FailTicket("127.0.0.5", 0, ['user "test"', 'unterminated \xcf']), -- FailTicket("127.0.0.6", 0, ['user "test"', u'unterminated \xcf']), -+ FailTicket("127.0.0.6", 0, ['user "test"', 'unterminated \xcf']), - FailTicket("127.0.0.7", 0, ['user "test"', b'unterminated \xcf']) - ] - for ticket in tickets: -diff --git a/fail2ban/tests/datedetectortestcase.py b/fail2ban/tests/datedetectortestcase.py -index 458f76ef..49ada60d 100644 ---- a/fail2ban/tests/datedetectortestcase.py -+++ b/fail2ban/tests/datedetectortestcase.py -@@ -279,7 +279,7 @@ class DateDetectorTest(LogCaptureTestCase): - self.assertEqual(logTime, mu) - self.assertEqual(logMatch.group(1), '2012/10/11 02:37:17') - # confuse it with year being at the end -- for i in xrange(10): -+ for i in range(10): - ( logTime, logMatch ) = self.datedetector.getTime('11/10/2012 02:37:17 [error] 18434#0') - self.assertEqual(logTime, mu) - self.assertEqual(logMatch.group(1), '11/10/2012 02:37:17') -@@ -505,7 +505,7 @@ class CustomDateFormatsTest(unittest.TestCase): - date = dd.getTime(line) - if matched: - self.assertTrue(date) -- if isinstance(matched, basestring): -+ if isinstance(matched, str): - self.assertEqual(matched, date[1].group(1)) - else: - self.assertEqual(matched, date[0]) -@@ -537,7 +537,7 @@ class CustomDateFormatsTest(unittest.TestCase): - date = dd.getTime(line) - if matched: - self.assertTrue(date) -- if isinstance(matched, basestring): # pragma: no cover -+ if isinstance(matched, str): # pragma: no cover - self.assertEqual(matched, date[1].group(1)) - else: - self.assertEqual(matched, date[0]) -diff --git a/fail2ban/tests/fail2banclienttestcase.py b/fail2ban/tests/fail2banclienttestcase.py -index 95f73ed3..bba354fa 100644 ---- a/fail2ban/tests/fail2banclienttestcase.py -+++ b/fail2ban/tests/fail2banclienttestcase.py -@@ -367,10 +367,10 @@ def with_foreground_server_thread(startextra={}): - # several commands to server in body of decorated function: - return f(self, tmp, startparams, *args, **kwargs) - except Exception as e: # pragma: no cover -- print('=== Catch an exception: %s' % e) -+ print(('=== Catch an exception: %s' % e)) - log = self.getLog() - if log: -- print('=== Error of server, log: ===\n%s===' % log) -+ print(('=== Error of server, log: ===\n%s===' % log)) - self.pruneLog() - raise - finally: -@@ -440,7 +440,7 @@ class Fail2banClientServerBase(LogCaptureTestCase): - ) - except: # pragma: no cover - if _inherited_log(startparams): -- print('=== Error by wait fot server, log: ===\n%s===' % self.getLog()) -+ print(('=== Error by wait fot server, log: ===\n%s===' % self.getLog())) - self.pruneLog() - log = pjoin(tmp, "f2b.log") - if isfile(log): -@@ -1610,6 +1610,6 @@ class Fail2banServerTest(Fail2banClientServerBase): - self.stopAndWaitForServerEnd(SUCCESS) - - def testServerStartStop(self): -- for i in xrange(2000): -+ for i in range(2000): - self._testServerStartStop() - -diff --git a/fail2ban/tests/failmanagertestcase.py b/fail2ban/tests/failmanagertestcase.py -index a5425286..2a94cc82 100644 ---- a/fail2ban/tests/failmanagertestcase.py -+++ b/fail2ban/tests/failmanagertestcase.py -@@ -45,11 +45,11 @@ class AddFailure(unittest.TestCase): - super(AddFailure, self).tearDown() - - def _addDefItems(self): -- self.__items = [[u'193.168.0.128', 1167605999.0], -- [u'193.168.0.128', 1167605999.0], -- [u'193.168.0.128', 1167605999.0], -- [u'193.168.0.128', 1167605999.0], -- [u'193.168.0.128', 1167605999.0], -+ self.__items = [['193.168.0.128', 1167605999.0], -+ ['193.168.0.128', 1167605999.0], -+ ['193.168.0.128', 1167605999.0], -+ ['193.168.0.128', 1167605999.0], -+ ['193.168.0.128', 1167605999.0], - ['87.142.124.10', 1167605999.0], - ['87.142.124.10', 1167605999.0], - ['87.142.124.10', 1167605999.0], -diff --git a/fail2ban/tests/files/config/apache-auth/digest.py b/fail2ban/tests/files/config/apache-auth/digest.py -index 03588594..e2297ab3 100755 ---- a/fail2ban/tests/files/config/apache-auth/digest.py -+++ b/fail2ban/tests/files/config/apache-auth/digest.py -@@ -41,7 +41,7 @@ def auth(v): - response="%s" - """ % ( username, algorithm, realm, url, nonce, qop, response ) - # opaque="%s", -- print(p.method, p.url, p.headers) -+ print((p.method, p.url, p.headers)) - s = requests.Session() - return s.send(p) - -@@ -76,18 +76,18 @@ r = auth(v) - - # [Sun Jul 28 21:41:20 2013] [error] [client 127.0.0.1] Digest: unknown algorithm `super funky chicken' received: /digest/ - --print(r.status_code,r.headers, r.text) -+print((r.status_code,r.headers, r.text)) - v['algorithm'] = algorithm - - - r = auth(v) --print(r.status_code,r.headers, r.text) -+print((r.status_code,r.headers, r.text)) - - nonce = v['nonce'] - v['nonce']=v['nonce'][5:-5] - - r = auth(v) --print(r.status_code,r.headers, r.text) -+print((r.status_code,r.headers, r.text)) - - # [Sun Jul 28 21:05:31.178340 2013] [auth_digest:error] [pid 24224:tid 139895539455744] [client 127.0.0.1:56906] AH01793: invalid qop `auth' received: /digest/qop_none/ - -@@ -95,7 +95,7 @@ print(r.status_code,r.headers, r.text) - v['nonce']=nonce[0:11] + 'ZZZ' + nonce[14:] - - r = auth(v) --print(r.status_code,r.headers, r.text) -+print((r.status_code,r.headers, r.text)) - - #[Sun Jul 28 21:18:11.769228 2013] [auth_digest:error] [pid 24752:tid 139895505884928] [client 127.0.0.1:56964] AH01776: invalid nonce b9YAiJDiBAZZZ1b1abe02d20063ea3b16b544ea1b0d981c1bafe received - hash is not d42d824dee7aaf50c3ba0a7c6290bd453e3dd35b - -@@ -107,7 +107,7 @@ import time - time.sleep(1) - - r = auth(v) --print(r.status_code,r.headers, r.text) -+print((r.status_code,r.headers, r.text)) - - # Obtained by putting the following code in modules/aaa/mod_auth_digest.c - # in the function initialize_secret -@@ -137,7 +137,7 @@ s = sha.sha(apachesecret) - - v=preauth() - --print(v['nonce']) -+print((v['nonce'])) - realm = v['Digest realm'][1:-1] - - (t,) = struct.unpack('l',base64.b64decode(v['nonce'][1:13])) -@@ -156,13 +156,13 @@ print(v) - - r = auth(v) - #[Mon Jul 29 02:12:55.539813 2013] [auth_digest:error] [pid 9647:tid 139895522670336] [client 127.0.0.1:58474] AH01777: invalid nonce 59QJppTiBAA=b08983fd166ade9840407df1b0f75b9e6e07d88d received - user attempted time travel --print(r.status_code,r.headers, r.text) -+print((r.status_code,r.headers, r.text)) - - url='/digest_onetime/' - v=preauth() - - # Need opaque header handling in auth - r = auth(v) --print(r.status_code,r.headers, r.text) -+print((r.status_code,r.headers, r.text)) - r = auth(v) --print(r.status_code,r.headers, r.text) -+print((r.status_code,r.headers, r.text)) -diff --git a/fail2ban/tests/filtertestcase.py b/fail2ban/tests/filtertestcase.py -index 35785a58..8eeb6902 100644 ---- a/fail2ban/tests/filtertestcase.py -+++ b/fail2ban/tests/filtertestcase.py -@@ -22,7 +22,7 @@ - __copyright__ = "Copyright (c) 2004 Cyril Jaquier; 2012 Yaroslav Halchenko" - __license__ = "GPL" - --from __builtin__ import open as fopen -+from builtins import open as fopen - import unittest - import os - import re -@@ -204,7 +204,7 @@ def _copy_lines_between_files(in_, fout, n=None, skip=0, mode='a', terminal_line - else: - fin = in_ - # Skip -- for i in xrange(skip): -+ for i in range(skip): - fin.readline() - # Read - i = 0 -@@ -244,7 +244,7 @@ def _copy_lines_to_journal(in_, fields={},n=None, skip=0, terminal_line=""): # p - # Required for filtering - fields.update(TEST_JOURNAL_FIELDS) - # Skip -- for i in xrange(skip): -+ for i in range(skip): - fin.readline() - # Read/Write - i = 0 -@@ -306,18 +306,18 @@ class BasicFilter(unittest.TestCase): - def testTest_tm(self): - unittest.F2B.SkipIfFast() - ## test function "_tm" works correct (returns the same as slow strftime): -- for i in xrange(1417512352, (1417512352 // 3600 + 3) * 3600): -+ for i in range(1417512352, (1417512352 // 3600 + 3) * 3600): - tm = MyTime.time2str(i) - if _tm(i) != tm: # pragma: no cover - never reachable - self.assertEqual((_tm(i), i), (tm, i)) - - def testWrongCharInTupleLine(self): - ## line tuple has different types (ascii after ascii / unicode): -- for a1 in ('', u'', b''): -- for a2 in ('2016-09-05T20:18:56', u'2016-09-05T20:18:56', b'2016-09-05T20:18:56'): -+ for a1 in ('', '', b''): -+ for a2 in ('2016-09-05T20:18:56', '2016-09-05T20:18:56', b'2016-09-05T20:18:56'): - for a3 in ( - 'Fail for "g\xc3\xb6ran" from 192.0.2.1', -- u'Fail for "g\xc3\xb6ran" from 192.0.2.1', -+ 'Fail for "g\xc3\xb6ran" from 192.0.2.1', - b'Fail for "g\xc3\xb6ran" from 192.0.2.1' - ): - # join should work if all arguments have the same type: -@@ -435,7 +435,7 @@ class IgnoreIP(LogCaptureTestCase): - - def testAddAttempt(self): - self.filter.setMaxRetry(3) -- for i in xrange(1, 1+3): -+ for i in range(1, 1+3): - self.filter.addAttempt('192.0.2.1') - self.assertLogged('Attempt 192.0.2.1', '192.0.2.1:%d' % i, all=True, wait=True) - self.jail.actions._Actions__checkBan() -@@ -472,7 +472,7 @@ class IgnoreIP(LogCaptureTestCase): - # like both test-cases above, just cached (so once per key)... - self.filter.ignoreCache = {"key":"<ip>"} - self.filter.ignoreCommand = 'if [ "<ip>" = "10.0.0.1" ]; then exit 0; fi; exit 1' -- for i in xrange(5): -+ for i in range(5): - self.pruneLog() - self.assertTrue(self.filter.inIgnoreIPList("10.0.0.1")) - self.assertFalse(self.filter.inIgnoreIPList("10.0.0.0")) -@@ -483,7 +483,7 @@ class IgnoreIP(LogCaptureTestCase): - # by host of IP: - self.filter.ignoreCache = {"key":"<ip-host>"} - self.filter.ignoreCommand = 'if [ "<ip-host>" = "test-host" ]; then exit 0; fi; exit 1' -- for i in xrange(5): -+ for i in range(5): - self.pruneLog() - self.assertTrue(self.filter.inIgnoreIPList(FailTicket("2001:db8::1"))) - self.assertFalse(self.filter.inIgnoreIPList(FailTicket("2001:db8::ffff"))) -@@ -495,7 +495,7 @@ class IgnoreIP(LogCaptureTestCase): - self.filter.ignoreCache = {"key":"<F-USER>", "max-count":"10", "max-time":"1h"} - self.assertEqual(self.filter.ignoreCache, ["<F-USER>", 10, 60*60]) - self.filter.ignoreCommand = 'if [ "<F-USER>" = "tester" ]; then exit 0; fi; exit 1' -- for i in xrange(5): -+ for i in range(5): - self.pruneLog() - self.assertTrue(self.filter.inIgnoreIPList(FailTicket("tester", data={'user': 'tester'}))) - self.assertFalse(self.filter.inIgnoreIPList(FailTicket("root", data={'user': 'root'}))) -@@ -644,7 +644,7 @@ class LogFileFilterPoll(unittest.TestCase): - fc = FileContainer(fname, self.filter.getLogEncoding()) - fc.open() - # no time - nothing should be found : -- for i in xrange(10): -+ for i in range(10): - f.write("[sshd] error: PAM: failure len 1\n") - f.flush() - fc.setPos(0); self.filter.seekToTime(fc, time) -@@ -718,14 +718,14 @@ class LogFileFilterPoll(unittest.TestCase): - # variable length of file (ca 45K or 450K before and hereafter): - # write lines with smaller as search time: - t = time - count - 1 -- for i in xrange(count): -+ for i in range(count): - f.write("%s [sshd] error: PAM: failure\n" % _tm(t)) - t += 1 - f.flush() - fc.setPos(0); self.filter.seekToTime(fc, time) - self.assertEqual(fc.getPos(), 47*count) - # write lines with exact search time: -- for i in xrange(10): -+ for i in range(10): - f.write("%s [sshd] error: PAM: failure\n" % _tm(time)) - f.flush() - fc.setPos(0); self.filter.seekToTime(fc, time) -@@ -734,8 +734,8 @@ class LogFileFilterPoll(unittest.TestCase): - self.assertEqual(fc.getPos(), 47*count) - # write lines with greater as search time: - t = time+1 -- for i in xrange(count//500): -- for j in xrange(500): -+ for i in range(count//500): -+ for j in range(500): - f.write("%s [sshd] error: PAM: failure\n" % _tm(t)) - t += 1 - f.flush() -@@ -1488,10 +1488,10 @@ def get_monitor_failures_journal_testcase(Filter_): # pragma: systemd no cover - # Add direct utf, unicode, blob: - for l in ( - "error: PAM: Authentication failure for \xe4\xf6\xfc\xdf from 192.0.2.1", -- u"error: PAM: Authentication failure for \xe4\xf6\xfc\xdf from 192.0.2.1", -+ "error: PAM: Authentication failure for \xe4\xf6\xfc\xdf from 192.0.2.1", - b"error: PAM: Authentication failure for \xe4\xf6\xfc\xdf from 192.0.2.1".decode('utf-8', 'replace'), - "error: PAM: Authentication failure for \xc3\xa4\xc3\xb6\xc3\xbc\xc3\x9f from 192.0.2.2", -- u"error: PAM: Authentication failure for \xc3\xa4\xc3\xb6\xc3\xbc\xc3\x9f from 192.0.2.2", -+ "error: PAM: Authentication failure for \xc3\xa4\xc3\xb6\xc3\xbc\xc3\x9f from 192.0.2.2", - b"error: PAM: Authentication failure for \xc3\xa4\xc3\xb6\xc3\xbc\xc3\x9f from 192.0.2.2".decode('utf-8', 'replace') - ): - fields = self.journal_fields -@@ -1520,7 +1520,7 @@ class GetFailures(LogCaptureTestCase): - - # so that they could be reused by other tests - FAILURES_01 = ('193.168.0.128', 3, 1124013599.0, -- [u'Aug 14 11:59:59 [sshd] error: PAM: Authentication failure for kevin from 193.168.0.128']*3) -+ ['Aug 14 11:59:59 [sshd] error: PAM: Authentication failure for kevin from 193.168.0.128']*3) - - def setUp(self): - """Call before every test case.""" -@@ -1595,8 +1595,8 @@ class GetFailures(LogCaptureTestCase): - - def testGetFailures02(self): - output = ('141.3.81.106', 4, 1124013539.0, -- [u'Aug 14 11:%d:59 i60p295 sshd[12365]: Failed publickey for roehl from ::ffff:141.3.81.106 port 51332 ssh2' -- % m for m in 53, 54, 57, 58]) -+ ['Aug 14 11:%d:59 i60p295 sshd[12365]: Failed publickey for roehl from ::ffff:141.3.81.106 port 51332 ssh2' -+ % m for m in (53, 54, 57, 58)]) - - self.filter.addLogPath(GetFailures.FILENAME_02, autoSeek=0) - self.filter.addFailRegex(r"Failed .* from <HOST>") -@@ -1691,17 +1691,17 @@ class GetFailures(LogCaptureTestCase): - # We should still catch failures with usedns = no ;-) - output_yes = ( - ('93.184.216.34', 2, 1124013539.0, -- [u'Aug 14 11:54:59 i60p295 sshd[12365]: Failed publickey for roehl from example.com port 51332 ssh2', -- u'Aug 14 11:58:59 i60p295 sshd[12365]: Failed publickey for roehl from ::ffff:93.184.216.34 port 51332 ssh2'] -+ ['Aug 14 11:54:59 i60p295 sshd[12365]: Failed publickey for roehl from example.com port 51332 ssh2', -+ 'Aug 14 11:58:59 i60p295 sshd[12365]: Failed publickey for roehl from ::ffff:93.184.216.34 port 51332 ssh2'] - ), - ('2606:2800:220:1:248:1893:25c8:1946', 1, 1124013299.0, -- [u'Aug 14 11:54:59 i60p295 sshd[12365]: Failed publickey for roehl from example.com port 51332 ssh2'] -+ ['Aug 14 11:54:59 i60p295 sshd[12365]: Failed publickey for roehl from example.com port 51332 ssh2'] - ), - ) - - output_no = ( - ('93.184.216.34', 1, 1124013539.0, -- [u'Aug 14 11:58:59 i60p295 sshd[12365]: Failed publickey for roehl from ::ffff:93.184.216.34 port 51332 ssh2'] -+ ['Aug 14 11:58:59 i60p295 sshd[12365]: Failed publickey for roehl from ::ffff:93.184.216.34 port 51332 ssh2'] - ) - ) - -@@ -1807,9 +1807,9 @@ class DNSUtilsTests(unittest.TestCase): - self.assertTrue(c.get('a') is None) - self.assertEqual(c.get('a', 'test'), 'test') - # exact 5 elements : -- for i in xrange(5): -+ for i in range(5): - c.set(i, i) -- for i in xrange(5): -+ for i in range(5): - self.assertEqual(c.get(i), i) - # remove unavailable key: - c.unset('a'); c.unset('a') -@@ -1817,30 +1817,30 @@ class DNSUtilsTests(unittest.TestCase): - def testCacheMaxSize(self): - c = Utils.Cache(maxCount=5, maxTime=60) - # exact 5 elements : -- for i in xrange(5): -+ for i in range(5): - c.set(i, i) -- self.assertEqual([c.get(i) for i in xrange(5)], [i for i in xrange(5)]) -- self.assertNotIn(-1, (c.get(i, -1) for i in xrange(5))) -+ self.assertEqual([c.get(i) for i in range(5)], [i for i in range(5)]) -+ self.assertNotIn(-1, (c.get(i, -1) for i in range(5))) - # add one - too many: - c.set(10, i) - # one element should be removed : -- self.assertIn(-1, (c.get(i, -1) for i in xrange(5))) -+ self.assertIn(-1, (c.get(i, -1) for i in range(5))) - # test max size (not expired): -- for i in xrange(10): -+ for i in range(10): - c.set(i, 1) - self.assertEqual(len(c), 5) - - def testCacheMaxTime(self): - # test max time (expired, timeout reached) : - c = Utils.Cache(maxCount=5, maxTime=0.0005) -- for i in xrange(10): -+ for i in range(10): - c.set(i, 1) - st = time.time() - self.assertTrue(Utils.wait_for(lambda: time.time() >= st + 0.0005, 1)) - # we have still 5 elements (or fewer if too slow test mashine): - self.assertTrue(len(c) <= 5) - # but all that are expiered also: -- for i in xrange(10): -+ for i in range(10): - self.assertTrue(c.get(i) is None) - # here the whole cache should be empty: - self.assertEqual(len(c), 0) -@@ -1861,7 +1861,7 @@ class DNSUtilsTests(unittest.TestCase): - c = count - while c: - c -= 1 -- s = xrange(0, 256, 1) if forw else xrange(255, -1, -1) -+ s = range(0, 256, 1) if forw else range(255, -1, -1) - if random: shuffle([i for i in s]) - for i in s: - IPAddr('192.0.2.'+str(i), IPAddr.FAM_IPv4) -@@ -1983,15 +1983,15 @@ class DNSUtilsNetworkTests(unittest.TestCase): - - def testAddr2bin(self): - res = IPAddr('10.0.0.0') -- self.assertEqual(res.addr, 167772160L) -+ self.assertEqual(res.addr, 167772160) - res = IPAddr('10.0.0.0', cidr=None) -- self.assertEqual(res.addr, 167772160L) -- res = IPAddr('10.0.0.0', cidr=32L) -- self.assertEqual(res.addr, 167772160L) -- res = IPAddr('10.0.0.1', cidr=32L) -- self.assertEqual(res.addr, 167772161L) -- res = IPAddr('10.0.0.1', cidr=31L) -- self.assertEqual(res.addr, 167772160L) -+ self.assertEqual(res.addr, 167772160) -+ res = IPAddr('10.0.0.0', cidr=32) -+ self.assertEqual(res.addr, 167772160) -+ res = IPAddr('10.0.0.1', cidr=32) -+ self.assertEqual(res.addr, 167772161) -+ res = IPAddr('10.0.0.1', cidr=31) -+ self.assertEqual(res.addr, 167772160) - - self.assertEqual(IPAddr('10.0.0.0').hexdump, '0a000000') - self.assertEqual(IPAddr('1::2').hexdump, '00010000000000000000000000000002') -@@ -2067,9 +2067,9 @@ class DNSUtilsNetworkTests(unittest.TestCase): - '93.184.216.34': 'ip4-test', - '2606:2800:220:1:248:1893:25c8:1946': 'ip6-test' - } -- d2 = dict([(IPAddr(k), v) for k, v in d.iteritems()]) -- self.assertTrue(isinstance(d.keys()[0], basestring)) -- self.assertTrue(isinstance(d2.keys()[0], IPAddr)) -+ d2 = dict([(IPAddr(k), v) for k, v in d.items()]) -+ self.assertTrue(isinstance(list(d.keys())[0], str)) -+ self.assertTrue(isinstance(list(d2.keys())[0], IPAddr)) - self.assertEqual(d.get(ip4[2], ''), 'ip4-test') - self.assertEqual(d.get(ip6[2], ''), 'ip6-test') - self.assertEqual(d2.get(str(ip4[2]), ''), 'ip4-test') -diff --git a/fail2ban/tests/misctestcase.py b/fail2ban/tests/misctestcase.py -index 9b986f53..94f7a8de 100644 ---- a/fail2ban/tests/misctestcase.py -+++ b/fail2ban/tests/misctestcase.py -@@ -29,9 +29,9 @@ import tempfile - import shutil - import fnmatch - from glob import glob --from StringIO import StringIO -+from io import StringIO - --from utils import LogCaptureTestCase, logSys as DefLogSys -+from .utils import LogCaptureTestCase, logSys as DefLogSys - - from ..helpers import formatExceptionInfo, mbasename, TraceBack, FormatterWithTraceBack, getLogger, \ - splitwords, uni_decode, uni_string -@@ -67,7 +67,7 @@ class HelpersTest(unittest.TestCase): - self.assertEqual(splitwords(' 1\n 2'), ['1', '2']) - self.assertEqual(splitwords(' 1\n 2, 3'), ['1', '2', '3']) - # string as unicode: -- self.assertEqual(splitwords(u' 1\n 2, 3'), ['1', '2', '3']) -+ self.assertEqual(splitwords(' 1\n 2, 3'), ['1', '2', '3']) - - - if sys.version_info >= (2,7): -@@ -197,11 +197,11 @@ class TestsUtilsTest(LogCaptureTestCase): - - def testUniConverters(self): - self.assertRaises(Exception, uni_decode, -- (b'test' if sys.version_info >= (3,) else u'test'), 'f2b-test::non-existing-encoding') -- uni_decode((b'test\xcf' if sys.version_info >= (3,) else u'test\xcf')) -+ (b'test' if sys.version_info >= (3,) else 'test'), 'f2b-test::non-existing-encoding') -+ uni_decode((b'test\xcf' if sys.version_info >= (3,) else 'test\xcf')) - uni_string(b'test\xcf') - uni_string('test\xcf') -- uni_string(u'test\xcf') -+ uni_string('test\xcf') - - def testSafeLogging(self): - # logging should be exception-safe, to avoid possible errors (concat, str. conversion, representation failures, etc) -@@ -213,7 +213,7 @@ class TestsUtilsTest(LogCaptureTestCase): - if self.err: - raise Exception('no represenation for test!') - else: -- return u'conv-error (\xf2\xf0\xe5\xf2\xe8\xe9), unterminated utf \xcf' -+ return 'conv-error (\xf2\xf0\xe5\xf2\xe8\xe9), unterminated utf \xcf' - test = Test() - logSys.log(logging.NOTICE, "test 1a: %r", test) - self.assertLogged("Traceback", "no represenation for test!") -@@ -261,7 +261,7 @@ class TestsUtilsTest(LogCaptureTestCase): - func_raise() - - try: -- print deep_function(3) -+ print(deep_function(3)) - except ValueError: - s = tb() - -@@ -278,7 +278,7 @@ class TestsUtilsTest(LogCaptureTestCase): - self.assertIn(':', s) - - def _testAssertionErrorRE(self, regexp, fun, *args, **kwargs): -- self.assertRaisesRegexp(AssertionError, regexp, fun, *args, **kwargs) -+ self.assertRaisesRegex(AssertionError, regexp, fun, *args, **kwargs) - - def testExtendedAssertRaisesRE(self): - ## test _testAssertionErrorRE several fail cases: -@@ -316,13 +316,13 @@ class TestsUtilsTest(LogCaptureTestCase): - self._testAssertionErrorRE(r"'a' unexpectedly found in 'cba'", - self.assertNotIn, 'a', 'cba') - self._testAssertionErrorRE(r"1 unexpectedly found in \[0, 1, 2\]", -- self.assertNotIn, 1, xrange(3)) -+ self.assertNotIn, 1, range(3)) - self._testAssertionErrorRE(r"'A' unexpectedly found in \['C', 'A'\]", - self.assertNotIn, 'A', (c.upper() for c in 'cba' if c != 'b')) - self._testAssertionErrorRE(r"'a' was not found in 'xyz'", - self.assertIn, 'a', 'xyz') - self._testAssertionErrorRE(r"5 was not found in \[0, 1, 2\]", -- self.assertIn, 5, xrange(3)) -+ self.assertIn, 5, range(3)) - self._testAssertionErrorRE(r"'A' was not found in \['C', 'B'\]", - self.assertIn, 'A', (c.upper() for c in 'cba' if c != 'a')) - ## assertLogged, assertNotLogged positive case: -diff --git a/fail2ban/tests/observertestcase.py b/fail2ban/tests/observertestcase.py -index 8e944454..ed520286 100644 ---- a/fail2ban/tests/observertestcase.py -+++ b/fail2ban/tests/observertestcase.py -@@ -69,7 +69,7 @@ class BanTimeIncr(LogCaptureTestCase): - a.setBanTimeExtra('multipliers', multipliers) - # test algorithm and max time 24 hours : - self.assertEqual( -- [a.calcBanTime(600, i) for i in xrange(1, 11)], -+ [a.calcBanTime(600, i) for i in range(1, 11)], - [1200, 2400, 4800, 9600, 19200, 38400, 76800, 86400, 86400, 86400] - ) - # with extra large max time (30 days): -@@ -81,38 +81,38 @@ class BanTimeIncr(LogCaptureTestCase): - if multcnt < 11: - arr = arr[0:multcnt-1] + ([arr[multcnt-2]] * (11-multcnt)) - self.assertEqual( -- [a.calcBanTime(600, i) for i in xrange(1, 11)], -+ [a.calcBanTime(600, i) for i in range(1, 11)], - arr - ) - a.setBanTimeExtra('maxtime', '1d') - # change factor : - a.setBanTimeExtra('factor', '2'); - self.assertEqual( -- [a.calcBanTime(600, i) for i in xrange(1, 11)], -+ [a.calcBanTime(600, i) for i in range(1, 11)], - [2400, 4800, 9600, 19200, 38400, 76800, 86400, 86400, 86400, 86400] - ) - # factor is float : - a.setBanTimeExtra('factor', '1.33'); - self.assertEqual( -- [int(a.calcBanTime(600, i)) for i in xrange(1, 11)], -+ [int(a.calcBanTime(600, i)) for i in range(1, 11)], - [1596, 3192, 6384, 12768, 25536, 51072, 86400, 86400, 86400, 86400] - ) - a.setBanTimeExtra('factor', None); - # change max time : - a.setBanTimeExtra('maxtime', '12h') - self.assertEqual( -- [a.calcBanTime(600, i) for i in xrange(1, 11)], -+ [a.calcBanTime(600, i) for i in range(1, 11)], - [1200, 2400, 4800, 9600, 19200, 38400, 43200, 43200, 43200, 43200] - ) - a.setBanTimeExtra('maxtime', '24h') - ## test randomization - not possibe all 10 times we have random = 0: - a.setBanTimeExtra('rndtime', '5m') - self.assertTrue( -- False in [1200 in [a.calcBanTime(600, 1) for i in xrange(10)] for c in xrange(10)] -+ False in [1200 in [a.calcBanTime(600, 1) for i in range(10)] for c in range(10)] - ) - a.setBanTimeExtra('rndtime', None) - self.assertFalse( -- False in [1200 in [a.calcBanTime(600, 1) for i in xrange(10)] for c in xrange(10)] -+ False in [1200 in [a.calcBanTime(600, 1) for i in range(10)] for c in range(10)] - ) - # restore default: - a.setBanTimeExtra('multipliers', None) -@@ -124,7 +124,7 @@ class BanTimeIncr(LogCaptureTestCase): - # this multipliers has the same values as default formula, we test stop growing after count 9: - self.testDefault('1 2 4 8 16 32 64 128 256') - # this multipliers has exactly the same values as default formula, test endless growing (stops by count 31 only): -- self.testDefault(' '.join([str(1<<i) for i in xrange(31)])) -+ self.testDefault(' '.join([str(1<<i) for i in range(31)])) - - def testFormula(self): - a = self.__jail; -@@ -136,38 +136,38 @@ class BanTimeIncr(LogCaptureTestCase): - a.setBanTimeExtra('multipliers', None) - # test algorithm and max time 24 hours : - self.assertEqual( -- [int(a.calcBanTime(600, i)) for i in xrange(1, 11)], -+ [int(a.calcBanTime(600, i)) for i in range(1, 11)], - [1200, 2400, 4800, 9600, 19200, 38400, 76800, 86400, 86400, 86400] - ) - # with extra large max time (30 days): - a.setBanTimeExtra('maxtime', '30d') - self.assertEqual( -- [int(a.calcBanTime(600, i)) for i in xrange(1, 11)], -+ [int(a.calcBanTime(600, i)) for i in range(1, 11)], - [1200, 2400, 4800, 9600, 19200, 38400, 76800, 153601, 307203, 614407] - ) - a.setBanTimeExtra('maxtime', '24h') - # change factor : - a.setBanTimeExtra('factor', '1'); - self.assertEqual( -- [int(a.calcBanTime(600, i)) for i in xrange(1, 11)], -+ [int(a.calcBanTime(600, i)) for i in range(1, 11)], - [1630, 4433, 12051, 32758, 86400, 86400, 86400, 86400, 86400, 86400] - ) - a.setBanTimeExtra('factor', '2.0 / 2.885385') - # change max time : - a.setBanTimeExtra('maxtime', '12h') - self.assertEqual( -- [int(a.calcBanTime(600, i)) for i in xrange(1, 11)], -+ [int(a.calcBanTime(600, i)) for i in range(1, 11)], - [1200, 2400, 4800, 9600, 19200, 38400, 43200, 43200, 43200, 43200] - ) - a.setBanTimeExtra('maxtime', '24h') - ## test randomization - not possibe all 10 times we have random = 0: - a.setBanTimeExtra('rndtime', '5m') - self.assertTrue( -- False in [1200 in [int(a.calcBanTime(600, 1)) for i in xrange(10)] for c in xrange(10)] -+ False in [1200 in [int(a.calcBanTime(600, 1)) for i in range(10)] for c in range(10)] - ) - a.setBanTimeExtra('rndtime', None) - self.assertFalse( -- False in [1200 in [int(a.calcBanTime(600, 1)) for i in xrange(10)] for c in xrange(10)] -+ False in [1200 in [int(a.calcBanTime(600, 1)) for i in range(10)] for c in range(10)] - ) - # restore default: - a.setBanTimeExtra('factor', None); -@@ -230,7 +230,7 @@ class BanTimeIncrDB(LogCaptureTestCase): - ticket = FailTicket(ip, stime, []) - # test ticket not yet found - self.assertEqual( -- [self.incrBanTime(ticket, 10) for i in xrange(3)], -+ [self.incrBanTime(ticket, 10) for i in range(3)], - [10, 10, 10] - ) - # add a ticket banned -@@ -285,7 +285,7 @@ class BanTimeIncrDB(LogCaptureTestCase): - ) - # increase ban multiple times: - lastBanTime = 20 -- for i in xrange(10): -+ for i in range(10): - ticket.setTime(stime + lastBanTime + 5) - banTime = self.incrBanTime(ticket, 10) - self.assertEqual(banTime, lastBanTime * 2) -@@ -481,7 +481,7 @@ class BanTimeIncrDB(LogCaptureTestCase): - ticket = FailTicket(ip, stime-120, []) - failManager = FailManager() - failManager.setMaxRetry(3) -- for i in xrange(3): -+ for i in range(3): - failManager.addFailure(ticket) - obs.add('failureFound', failManager, jail, ticket) - obs.wait_empty(5) -diff --git a/fail2ban/tests/samplestestcase.py b/fail2ban/tests/samplestestcase.py -index 0bbd05f5..479b564a 100644 ---- a/fail2ban/tests/samplestestcase.py -+++ b/fail2ban/tests/samplestestcase.py -@@ -138,7 +138,7 @@ class FilterSamplesRegex(unittest.TestCase): - - @staticmethod - def _filterOptions(opts): -- return dict((k, v) for k, v in opts.iteritems() if not k.startswith('test.')) -+ return dict((k, v) for k, v in opts.items() if not k.startswith('test.')) - - def testSampleRegexsFactory(name, basedir): - def testFilter(self): -@@ -249,10 +249,10 @@ def testSampleRegexsFactory(name, basedir): - self.assertTrue(faildata.get('match', False), - "Line matched when shouldn't have") - self.assertEqual(len(ret), 1, -- "Multiple regexs matched %r" % (map(lambda x: x[0], ret))) -+ "Multiple regexs matched %r" % ([x[0] for x in ret])) - - # Verify match captures (at least fid/host) and timestamp as expected -- for k, v in faildata.iteritems(): -+ for k, v in faildata.items(): - if k not in ("time", "match", "desc", "filter"): - fv = fail.get(k, None) - if fv is None: -@@ -294,7 +294,7 @@ def testSampleRegexsFactory(name, basedir): - '\n'.join(pprint.pformat(fail).splitlines()))) - - # check missing samples for regex using each filter-options combination: -- for fltName, flt in self._filters.iteritems(): -+ for fltName, flt in self._filters.items(): - flt, regexsUsedIdx = flt - regexList = flt.getFailRegex() - for failRegexIndex, failRegex in enumerate(regexList): -diff --git a/fail2ban/tests/servertestcase.py b/fail2ban/tests/servertestcase.py -index 55e72455..7925ab1e 100644 ---- a/fail2ban/tests/servertestcase.py -+++ b/fail2ban/tests/servertestcase.py -@@ -124,14 +124,14 @@ class TransmitterBase(LogCaptureTestCase): - self.transm.proceed(["get", jail, cmd]), (0, [])) - for n, value in enumerate(values): - ret = self.transm.proceed(["set", jail, cmdAdd, value]) -- self.assertSortedEqual((ret[0], map(str, ret[1])), (0, map(str, values[:n+1])), level=2) -+ self.assertSortedEqual((ret[0], list(map(str, ret[1]))), (0, list(map(str, values[:n+1]))), level=2) - ret = self.transm.proceed(["get", jail, cmd]) -- self.assertSortedEqual((ret[0], map(str, ret[1])), (0, map(str, values[:n+1])), level=2) -+ self.assertSortedEqual((ret[0], list(map(str, ret[1]))), (0, list(map(str, values[:n+1]))), level=2) - for n, value in enumerate(values): - ret = self.transm.proceed(["set", jail, cmdDel, value]) -- self.assertSortedEqual((ret[0], map(str, ret[1])), (0, map(str, values[n+1:])), level=2) -+ self.assertSortedEqual((ret[0], list(map(str, ret[1]))), (0, list(map(str, values[n+1:]))), level=2) - ret = self.transm.proceed(["get", jail, cmd]) -- self.assertSortedEqual((ret[0], map(str, ret[1])), (0, map(str, values[n+1:])), level=2) -+ self.assertSortedEqual((ret[0], list(map(str, ret[1]))), (0, list(map(str, values[n+1:]))), level=2) - - def jailAddDelRegexTest(self, cmd, inValues, outValues, jail): - cmdAdd = "add" + cmd -@@ -930,7 +930,7 @@ class TransmitterLogging(TransmitterBase): - - def testLogTarget(self): - logTargets = [] -- for _ in xrange(3): -+ for _ in range(3): - tmpFile = tempfile.mkstemp("fail2ban", "transmitter") - logTargets.append(tmpFile[1]) - os.close(tmpFile[0]) -@@ -1003,26 +1003,26 @@ class TransmitterLogging(TransmitterBase): - self.assertEqual(self.transm.proceed(["flushlogs"]), (0, "rolled over")) - l.warning("After flushlogs") - with open(fn2,'r') as f: -- line1 = f.next() -+ line1 = next(f) - if line1.find('Changed logging target to') >= 0: -- line1 = f.next() -+ line1 = next(f) - self.assertTrue(line1.endswith("Before file moved\n")) -- line2 = f.next() -+ line2 = next(f) - self.assertTrue(line2.endswith("After file moved\n")) - try: -- n = f.next() -+ n = next(f) - if n.find("Command: ['flushlogs']") >=0: -- self.assertRaises(StopIteration, f.next) -+ self.assertRaises(StopIteration, f.__next__) - else: - self.fail("Exception StopIteration or Command: ['flushlogs'] expected. Got: %s" % n) - except StopIteration: - pass # on higher debugging levels this is expected - with open(fn,'r') as f: -- line1 = f.next() -+ line1 = next(f) - if line1.find('rollover performed on') >= 0: -- line1 = f.next() -+ line1 = next(f) - self.assertTrue(line1.endswith("After flushlogs\n")) -- self.assertRaises(StopIteration, f.next) -+ self.assertRaises(StopIteration, f.__next__) - f.close() - finally: - os.remove(fn2) -@@ -1185,7 +1185,7 @@ class LoggingTests(LogCaptureTestCase): - os.remove(f) - - --from clientreadertestcase import ActionReader, JailsReader, CONFIG_DIR -+from .clientreadertestcase import ActionReader, JailsReader, CONFIG_DIR - - class ServerConfigReaderTests(LogCaptureTestCase): - -diff --git a/fail2ban/tests/sockettestcase.py b/fail2ban/tests/sockettestcase.py -index 69bf8d8b..60f49e57 100644 ---- a/fail2ban/tests/sockettestcase.py -+++ b/fail2ban/tests/sockettestcase.py -@@ -153,7 +153,7 @@ class Socket(LogCaptureTestCase): - org_handler = RequestHandler.found_terminator - try: - RequestHandler.found_terminator = lambda self: self.close() -- self.assertRaisesRegexp(RuntimeError, r"socket connection broken", -+ self.assertRaisesRegex(RuntimeError, r"socket connection broken", - lambda: client.send(testMessage, timeout=unittest.F2B.maxWaitTime(10))) - finally: - RequestHandler.found_terminator = org_handler -diff --git a/fail2ban/tests/utils.py b/fail2ban/tests/utils.py -index fcfddba7..cb234e0d 100644 ---- a/fail2ban/tests/utils.py -+++ b/fail2ban/tests/utils.py -@@ -35,7 +35,7 @@ import time - import threading - import unittest - --from cStringIO import StringIO -+from io import StringIO - from functools import wraps - - from ..helpers import getLogger, str2LogLevel, getVerbosityFormat, uni_decode -@@ -174,8 +174,8 @@ def initProcess(opts): - - # Let know the version - if opts.verbosity != 0: -- print("Fail2ban %s test suite. Python %s. Please wait..." \ -- % (version, str(sys.version).replace('\n', ''))) -+ print(("Fail2ban %s test suite. Python %s. Please wait..." \ -+ % (version, str(sys.version).replace('\n', '')))) - - return opts; - -@@ -322,7 +322,7 @@ def initTests(opts): - c = DNSUtils.CACHE_ipToName - # increase max count and max time (too many entries, long time testing): - c.setOptions(maxCount=10000, maxTime=5*60) -- for i in xrange(256): -+ for i in range(256): - c.set('192.0.2.%s' % i, None) - c.set('198.51.100.%s' % i, None) - c.set('203.0.113.%s' % i, None) -@@ -541,8 +541,8 @@ def gatherTests(regexps=None, opts=None): - import difflib, pprint - if not hasattr(unittest.TestCase, 'assertDictEqual'): - def assertDictEqual(self, d1, d2, msg=None): -- self.assert_(isinstance(d1, dict), 'First argument is not a dictionary') -- self.assert_(isinstance(d2, dict), 'Second argument is not a dictionary') -+ self.assertTrue(isinstance(d1, dict), 'First argument is not a dictionary') -+ self.assertTrue(isinstance(d2, dict), 'Second argument is not a dictionary') - if d1 != d2: - standardMsg = '%r != %r' % (d1, d2) - diff = ('\n' + '\n'.join(difflib.ndiff( -@@ -560,7 +560,7 @@ def assertSortedEqual(self, a, b, level=1, nestedOnly=True, key=repr, msg=None): - # used to recognize having element as nested dict, list or tuple: - def _is_nested(v): - if isinstance(v, dict): -- return any(isinstance(v, (dict, list, tuple)) for v in v.itervalues()) -+ return any(isinstance(v, (dict, list, tuple)) for v in v.values()) - return any(isinstance(v, (dict, list, tuple)) for v in v) - # level comparison routine: - def _assertSortedEqual(a, b, level, nestedOnly, key): -@@ -573,7 +573,7 @@ def assertSortedEqual(self, a, b, level=1, nestedOnly=True, key=repr, msg=None): - return - raise ValueError('%r != %r' % (a, b)) - if isinstance(a, dict) and isinstance(b, dict): # compare dict's: -- for k, v1 in a.iteritems(): -+ for k, v1 in a.items(): - v2 = b[k] - if isinstance(v1, (dict, list, tuple)) and isinstance(v2, (dict, list, tuple)): - _assertSortedEqual(v1, v2, level-1 if level != 0 else 0, nestedOnly, key) -@@ -608,14 +608,14 @@ if not hasattr(unittest.TestCase, 'assertRaisesRegexp'): - self.fail('\"%s\" does not match \"%s\"' % (regexp, e)) - else: - self.fail('%s not raised' % getattr(exccls, '__name__')) -- unittest.TestCase.assertRaisesRegexp = assertRaisesRegexp -+ unittest.TestCase.assertRaisesRegex = assertRaisesRegexp - - # always custom following methods, because we use atm better version of both (support generators) - if True: ## if not hasattr(unittest.TestCase, 'assertIn'): - def assertIn(self, a, b, msg=None): - bb = b - wrap = False -- if msg is None and hasattr(b, '__iter__') and not isinstance(b, basestring): -+ if msg is None and hasattr(b, '__iter__') and not isinstance(b, str): - b, bb = itertools.tee(b) - wrap = True - if a not in b: -@@ -626,7 +626,7 @@ if True: ## if not hasattr(unittest.TestCase, 'assertIn'): - def assertNotIn(self, a, b, msg=None): - bb = b - wrap = False -- if msg is None and hasattr(b, '__iter__') and not isinstance(b, basestring): -+ if msg is None and hasattr(b, '__iter__') and not isinstance(b, str): - b, bb = itertools.tee(b) - wrap = True - if a in b: -diff --git a/setup.py b/setup.py -deleted file mode 100755 -index ce1eedf6..00000000 ---- a/setup.py -+++ /dev/null -@@ -1,326 +0,0 @@ --#!/usr/bin/env python --# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: t -*- --# vi: set ft=python sts=4 ts=4 sw=4 noet : -- --# This file is part of Fail2Ban. --# --# Fail2Ban is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# Fail2Ban 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 General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with Fail2Ban; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- --__author__ = "Cyril Jaquier, Steven Hiscocks, Yaroslav Halchenko" --__copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2008-2016 Fail2Ban Contributors" --__license__ = "GPL" -- --import platform -- --try: -- import setuptools -- from setuptools import setup -- from setuptools.command.install import install -- from setuptools.command.install_scripts import install_scripts --except ImportError: -- setuptools = None -- from distutils.core import setup -- --# all versions --from distutils.command.build_py import build_py --from distutils.command.build_scripts import build_scripts --if setuptools is None: -- from distutils.command.install import install -- from distutils.command.install_scripts import install_scripts --try: -- # python 3.x -- from distutils.command.build_py import build_py_2to3 -- from distutils.command.build_scripts import build_scripts_2to3 -- _2to3 = True --except ImportError: -- # python 2.x -- _2to3 = False -- --import os --from os.path import isfile, join, isdir, realpath --import re --import sys --import warnings --from glob import glob -- --from fail2ban.setup import updatePyExec -- -- --source_dir = os.path.realpath(os.path.dirname( -- # __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.): -- sys.argv[0] if os.path.basename(sys.argv[0]) == 'setup.py' else __file__ --)) -- --# Wrapper to install python binding (to current python version): --class install_scripts_f2b(install_scripts): -- -- def get_outputs(self): -- outputs = install_scripts.get_outputs(self) -- # setup.py --dry-run install: -- dry_run = not outputs -- self.update_scripts(dry_run) -- if dry_run: -- #bindir = self.install_dir -- bindir = self.build_dir -- print('creating fail2ban-python binding -> %s (dry-run, real path can be different)' % (bindir,)) -- print('Copying content of %s to %s' % (self.build_dir, self.install_dir)); -- return outputs -- fn = None -- for fn in outputs: -- if os.path.basename(fn) == 'fail2ban-server': -- break -- bindir = os.path.dirname(fn) -- print('creating fail2ban-python binding -> %s' % (bindir,)) -- updatePyExec(bindir) -- return outputs -- -- def update_scripts(self, dry_run=False): -- buildroot = os.path.dirname(self.build_dir) -- install_dir = self.install_dir -- try: -- # remove root-base from install scripts path: -- root = self.distribution.command_options['install']['root'][1] -- if install_dir.startswith(root): -- install_dir = install_dir[len(root):] -- except: # pragma: no cover -- print('WARNING: Cannot find root-base option, check the bin-path to fail2ban-scripts in "fail2ban.service".') -- print('Creating %s/fail2ban.service (from fail2ban.service.in): @BINDIR@ -> %s' % (buildroot, install_dir)) -- with open(os.path.join(source_dir, 'files/fail2ban.service.in'), 'r') as fn: -- lines = fn.readlines() -- fn = None -- if not dry_run: -- fn = open(os.path.join(buildroot, 'fail2ban.service'), 'w') -- try: -- for ln in lines: -- ln = re.sub(r'@BINDIR@', lambda v: install_dir, ln) -- if dry_run: -- sys.stdout.write(' | ' + ln) -- continue -- fn.write(ln) -- finally: -- if fn: fn.close() -- if dry_run: -- print(' `') -- -- --# Wrapper to specify fail2ban own options: --class install_command_f2b(install): -- user_options = install.user_options + [ -- ('disable-2to3', None, 'Specify to deactivate 2to3, e.g. if the install runs from fail2ban test-cases.'), -- ('without-tests', None, 'without tests files installation'), -- ] -- def initialize_options(self): -- self.disable_2to3 = None -- self.without_tests = None -- install.initialize_options(self) -- def finalize_options(self): -- global _2to3 -- ## in the test cases 2to3 should be already done (fail2ban-2to3): -- if self.disable_2to3: -- _2to3 = False -- if _2to3: -- cmdclass = self.distribution.cmdclass -- cmdclass['build_py'] = build_py_2to3 -- cmdclass['build_scripts'] = build_scripts_2to3 -- if self.without_tests: -- self.distribution.scripts.remove('bin/fail2ban-testcases') -- -- self.distribution.packages.remove('fail2ban.tests') -- self.distribution.packages.remove('fail2ban.tests.action_d') -- -- del self.distribution.package_data['fail2ban.tests'] -- install.finalize_options(self) -- def run(self): -- install.run(self) -- -- --# Update fail2ban-python env to current python version (where f2b-modules located/installed) --updatePyExec(os.path.join(source_dir, 'bin')) -- --if setuptools and "test" in sys.argv: -- import logging -- logSys = logging.getLogger("fail2ban") -- hdlr = logging.StreamHandler(sys.stdout) -- fmt = logging.Formatter("%(asctime)-15s %(message)s") -- hdlr.setFormatter(fmt) -- logSys.addHandler(hdlr) -- if set(["-q", "--quiet"]) & set(sys.argv): -- logSys.setLevel(logging.CRITICAL) -- warnings.simplefilter("ignore") -- sys.warnoptions.append("ignore") -- elif set(["-v", "--verbose"]) & set(sys.argv): -- logSys.setLevel(logging.DEBUG) -- else: -- logSys.setLevel(logging.INFO) --elif "test" in sys.argv: -- print("python distribute required to execute fail2ban tests") -- print("") -- --longdesc = ''' --Fail2Ban scans log files like /var/log/pwdfail or --/var/log/apache/error_log and bans IP that makes --too many password failures. It updates firewall rules --to reject the IP address or executes user defined --commands.''' -- --if setuptools: -- setup_extra = { -- 'test_suite': "fail2ban.tests.utils.gatherTests", -- 'use_2to3': True, -- } --else: -- setup_extra = {} -- --data_files_extra = [] --if os.path.exists('/var/run'): -- # if we are on the system with /var/run -- we are to use it for having fail2ban/ -- # directory there for socket file etc. -- # realpath is used to possibly resolve /var/run -> /run symlink -- data_files_extra += [(realpath('/var/run/fail2ban'), '')] -- --# Installing documentation files only under Linux or other GNU/ systems --# (e.g. GNU/kFreeBSD), since others might have protective mechanisms forbidding --# installation there (see e.g. #1233) --platform_system = platform.system().lower() --doc_files = ['README.md', 'DEVELOP', 'FILTERS', 'doc/run-rootless.txt'] --if platform_system in ('solaris', 'sunos'): -- doc_files.append('README.Solaris') --if platform_system in ('linux', 'solaris', 'sunos') or platform_system.startswith('gnu'): -- data_files_extra.append( -- ('/usr/share/doc/fail2ban', doc_files) -- ) -- --# Get version number, avoiding importing fail2ban. --# This is due to tests not functioning for python3 as 2to3 takes place later --exec(open(join("fail2ban", "version.py")).read()) -- --setup( -- name = "fail2ban", -- version = version, -- description = "Ban IPs that make too many password failures", -- long_description = longdesc, -- author = "Cyril Jaquier & Fail2Ban Contributors", -- author_email = "cyril.jaquier@fail2ban.org", -- url = "http://www.fail2ban.org", -- license = "GPL", -- platforms = "Posix", -- cmdclass = { -- 'build_py': build_py, 'build_scripts': build_scripts, -- 'install_scripts': install_scripts_f2b, 'install': install_command_f2b -- }, -- scripts = [ -- 'bin/fail2ban-client', -- 'bin/fail2ban-server', -- 'bin/fail2ban-regex', -- 'bin/fail2ban-testcases', -- # 'bin/fail2ban-python', -- link (binary), will be installed via install_scripts_f2b wrapper -- ], -- packages = [ -- 'fail2ban', -- 'fail2ban.client', -- 'fail2ban.server', -- 'fail2ban.tests', -- 'fail2ban.tests.action_d', -- ], -- package_data = { -- 'fail2ban.tests': -- [ join(w[0], f).replace("fail2ban/tests/", "", 1) -- for w in os.walk('fail2ban/tests/files') -- for f in w[2]] + -- [ join(w[0], f).replace("fail2ban/tests/", "", 1) -- for w in os.walk('fail2ban/tests/config') -- for f in w[2]] + -- [ join(w[0], f).replace("fail2ban/tests/", "", 1) -- for w in os.walk('fail2ban/tests/action_d') -- for f in w[2]] -- }, -- data_files = [ -- ('/etc/fail2ban', -- glob("config/*.conf") -- ), -- ('/etc/fail2ban/filter.d', -- glob("config/filter.d/*.conf") -- ), -- ('/etc/fail2ban/filter.d/ignorecommands', -- [p for p in glob("config/filter.d/ignorecommands/*") if isfile(p)] -- ), -- ('/etc/fail2ban/action.d', -- glob("config/action.d/*.conf") + -- glob("config/action.d/*.py") -- ), -- ('/etc/fail2ban/fail2ban.d', -- '' -- ), -- ('/etc/fail2ban/jail.d', -- '' -- ), -- ('/var/lib/fail2ban', -- '' -- ), -- ] + data_files_extra, -- **setup_extra --) -- --# Do some checks after installation --# Search for obsolete files. --obsoleteFiles = [] --elements = { -- "/etc/": -- [ -- "fail2ban.conf" -- ], -- "/usr/bin/": -- [ -- "fail2ban.py" -- ], -- "/usr/lib/fail2ban/": -- [ -- "version.py", -- "protocol.py" -- ] --} -- --for directory in elements: -- for f in elements[directory]: -- path = join(directory, f) -- if isfile(path): -- obsoleteFiles.append(path) -- --if obsoleteFiles: -- print("") -- print("Obsolete files from previous Fail2Ban versions were found on " -- "your system.") -- print("Please delete them:") -- print("") -- for f in obsoleteFiles: -- print("\t" + f) -- print("") -- --if isdir("/usr/lib/fail2ban"): -- print("") -- print("Fail2ban is not installed under /usr/lib anymore. The new " -- "location is under /usr/share. Please remove the directory " -- "/usr/lib/fail2ban and everything under this directory.") -- print("") -- --# Update config file --if sys.argv[1] == "install": -- print("") -- print("Please do not forget to update your configuration files.") -- print("They are in \"/etc/fail2ban/\".") -- print("") -- print("You can also install systemd service-unit file from \"build/fail2ban.service\"") -- print("resp. corresponding init script from \"files/*-initd\".") -- print("") --- -2.17.1 - diff --git a/meta-security/recipes-security/fail2ban/python3-fail2ban_0.10.4.0.bb b/meta-security/recipes-security/fail2ban/python3-fail2ban_0.11.2.bb index e737f502a..6767d80cf 100644 --- a/meta-security/recipes-security/fail2ban/python3-fail2ban_0.10.4.0.bb +++ b/meta-security/recipes-security/fail2ban/python3-fail2ban_0.11.2.bb @@ -9,12 +9,11 @@ HOMEPAGE = "http://www.fail2ban.org" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ecabc31e90311da843753ba772885d9f" -SRCREV ="3befbb177017957869425c81a560edb8e27db75a" +SRCREV ="eea1881b734b73599a21df2bfbe58b11f78d0a46" SRC_URI = " git://github.com/fail2ban/fail2ban.git;branch=0.11 \ file://initd \ file://fail2ban_setup.py \ file://run-ptest \ - file://0001-python3-fail2ban-2-3-conversion.patch \ " inherit update-rc.d ptest setuptools3 @@ -23,6 +22,8 @@ S = "${WORKDIR}/git" do_compile_prepend () { cp ${WORKDIR}/fail2ban_setup.py ${S}/setup.py + cd ${S} + ./fail2ban-2to3 } do_install_append () { @@ -35,7 +36,7 @@ do_install_append () { do_install_ptest_append () { install -d ${D}${PTEST_PATH} sed -i -e 's/##PYTHON##/${PYTHON_PN}/g' ${D}${PTEST_PATH}/run-ptest - install -D ${S}/bin/fail2ban-testcases ${D}${PTEST_PATH} + install -D ${S}/fail2ban-testcases-all-python3 ${D}${PTEST_PATH} } FILES_${PN} += "/run" diff --git a/meta-security/recipes-security/fscryptctl/fscryptctl_0.1.0.bb b/meta-security/recipes-security/fscryptctl/fscryptctl_1.0.0.bb index 8847a0fc4..440b4e34c 100644 --- a/meta-security/recipes-security/fscryptctl/fscryptctl_0.1.0.bb +++ b/meta-security/recipes-security/fscryptctl/fscryptctl_1.0.0.bb @@ -9,7 +9,7 @@ SECTION = "base" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "142326810eb19d6794793db6d24d0775a15aa8e5" +SRCREV = "56b898c896240328adef7407090215abbe9ee03d" SRC_URI = "git://github.com/google/fscryptctl.git" S = "${WORKDIR}/git" diff --git a/meta-security/recipes-security/libdhash/ding-libs_0.5.0.bb b/meta-security/recipes-security/libdhash/ding-libs_0.6.1.bb index 9db66e86f..6046fa0b1 100644 --- a/meta-security/recipes-security/libdhash/ding-libs_0.5.0.bb +++ b/meta-security/recipes-security/libdhash/ding-libs_0.6.1.bb @@ -9,5 +9,4 @@ SRC_URI = "https://fedorahosted.org/released/${BPN}/${BP}.tar.gz" inherit autotools pkgconfig -SRC_URI[md5sum] = "786f2880d30136a61df02e5d740ddc6e" -SRC_URI[sha256sum] = "dab937537a05d7a7cbe605fdb9b3809080d67b124ac97eb321255b35f5b172fd" +SRC_URI[sha256sum] = "a319a327deb81f2dfab9ce4a4926e80e1dac5dcfc89f4c7e548cec2645af27c1" diff --git a/meta-security/recipes-security/libseccomp/files/fix-mips-build-failure.patch b/meta-security/recipes-security/libseccomp/files/fix-mips-build-failure.patch deleted file mode 100644 index 7d17a038a..000000000 --- a/meta-security/recipes-security/libseccomp/files/fix-mips-build-failure.patch +++ /dev/null @@ -1,49 +0,0 @@ -Backport patch to fix cross compile error for mips: - -| syscalls.h:44:6: error: expected identifier or '(' before numeric constant -| 44 | int mips; -| | ^~~~ - -Upstream-Status: Submitted [https://github.com/seccomp/libseccomp/pull/279/commits/04c519e5] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -From 04c519e5b1de53592e98307813e5c6db7418f91b Mon Sep 17 00:00:00 2001 -From: Paul Moore <paul@paul-moore.com> -Date: Sun, 2 Aug 2020 09:57:39 -0400 -Subject: [PATCH] build: undefine "mips" to prevent build problems for MIPS - targets - -It turns out that the MIPS GCC compiler defines a "mips" cpp macro -which was resulting in build failures on MIPS so we need to -undefine the "mips" macro during build. As this should be safe -to do in all architectures, just add it to the compiler flags by -default. - -This was reported in the following GH issue: -* https://github.com/seccomp/libseccomp/issues/274 - -Reported-by: Rongwei Zhang <pudh4418@gmail.com> -Suggested-by: Rongwei Zhang <pudh4418@gmail.com> -Signed-off-by: Paul Moore <paul@paul-moore.com> ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 40d9dcbb..3e877348 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -65,9 +65,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - dnl #### - dnl build flags -+dnl NOTE: the '-Umips' is here because MIPS GCC compilers "helpfully" define it -+dnl for us which wreaks havoc on the build - dnl #### - AM_CPPFLAGS="-I\${top_srcdir}/include -I\${top_builddir}/include" --AM_CFLAGS="-Wall" -+AM_CFLAGS="-Wall -Umips" - AM_LDFLAGS="-Wl,-z -Wl,relro" - AC_SUBST([AM_CPPFLAGS]) - AC_SUBST([AM_CFLAGS]) diff --git a/meta-security/recipes-security/libseccomp/libseccomp_2.5.0.bb b/meta-security/recipes-security/libseccomp/libseccomp_2.5.1.bb index 0cf2d70b8..40ac1a890 100644 --- a/meta-security/recipes-security/libseccomp/libseccomp_2.5.0.bb +++ b/meta-security/recipes-security/libseccomp/libseccomp_2.5.1.bb @@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357c DEPENDS += "gperf-native" -SRCREV = "f13f58efc690493fe7aa69f54cb52a118f3769c1" +SRCREV = "4bf70431a339a2886ab8c82e9a45378f30c6e6c7" SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \ file://run-ptest \ - file://fix-mips-build-failure.patch \ -" + " COMPATIBLE_HOST_riscv32 = "null" diff --git a/meta-security/recipes-security/mfa/python3-privacyidea_3.3.bb b/meta-security/recipes-security/mfa/python3-privacyidea_3.5.1.bb index eb6b7eb33..fb8441192 100644 --- a/meta-security/recipes-security/mfa/python3-privacyidea_3.3.bb +++ b/meta-security/recipes-security/mfa/python3-privacyidea_3.5.1.bb @@ -6,7 +6,7 @@ LICENSE = "AGPL-3.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=c0acfa7a8a03b718abee9135bc1a1c55" PYPI_PACKAGE = "privacyIDEA" -SRC_URI[sha256sum] = "55fbdd0fdc8957f7fc5b8900453fd9dc294860bae218e53e7fe394d93f982518" +SRC_URI[sha256sum] = "c10f8e9ec681af4cb42fde70864c2b9a4b47e2bcccfc1290f83c1283748772c6" inherit pypi setuptools3 diff --git a/meta-security/recipes-security/nikto/nikto_2.1.6.bb b/meta-security/recipes-security/nikto/nikto_2.1.6.bb index 2d2c46ca1..615cc30b9 100644 --- a/meta-security/recipes-security/nikto/nikto_2.1.6.bb +++ b/meta-security/recipes-security/nikto/nikto_2.1.6.bb @@ -4,7 +4,7 @@ SECTION = "security" HOMEPAGE = "https://cirt.net/Nikto2" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCREV = "f1bbd1a8756c076c8fd4f4dd0bc34a8ef215ae79" SRC_URI = "git://github.com/sullo/nikto.git \ diff --git a/meta-security/recipes-security/opendnssec/files/fix_fprint.patch b/meta-security/recipes-security/opendnssec/files/fix_fprint.patch deleted file mode 100644 index da0bcfe74..000000000 --- a/meta-security/recipes-security/opendnssec/files/fix_fprint.patch +++ /dev/null @@ -1,25 +0,0 @@ -format not a string literal and no format arguments - -missing module_str in call - -Upstream-Status: Pending -Signed-off-by: Armin Kuster <akuster808@gmail.com> - -../../../git/enforcer/src/keystate/keystate_ds.c:192:7: error: format not a string literal and no format arguments [-Werror=format-security] -| 192 | ods_log_error_and_printf(sockfd, "Failed to run %s", cp_ds); -| | ^~~~~~~~~~~~~~~~~~~~~~~~ - - -Index: git/enforcer/src/keystate/keystate_ds.c -=================================================================== ---- git.orig/enforcer/src/keystate/keystate_ds.c -+++ git/enforcer/src/keystate/keystate_ds.c -@@ -189,7 +189,7 @@ exec_dnskey_by_id(int sockfd, struct dbw - status = 0; - } - else { -- ods_log_error_and_printf(sockfd, "Failed to run %s", cp_ds); -+ ods_log_error_and_printf(sockfd, module_str, "Failed to run %s", cp_ds); - status = 7; - } - } diff --git a/meta-security/recipes-security/opendnssec/files/libdns_conf_fix.patch b/meta-security/recipes-security/opendnssec/files/libdns_conf_fix.patch index 126e197f3..31d7252dc 100644 --- a/meta-security/recipes-security/opendnssec/files/libdns_conf_fix.patch +++ b/meta-security/recipes-security/opendnssec/files/libdns_conf_fix.patch @@ -4,14 +4,29 @@ Upstream-Status: OE specific Signed-off-by: Armin Kuster <akuster808@gmail.com> -Index: opendnssec-2.1.6/m4/acx_ldns.m4 +Index: opendnssec-2.1.8/configure.ac =================================================================== ---- opendnssec-2.1.6.orig/m4/acx_ldns.m4 -+++ opendnssec-2.1.6/m4/acx_ldns.m4 -@@ -1,128 +1,65 @@ +--- opendnssec-2.1.8.orig/configure.ac ++++ opendnssec-2.1.8/configure.ac +@@ -133,9 +133,7 @@ AC_CHECK_MEMBER([struct sockaddr_un.sun_ + + # common dependencies + ACX_LIBXML2 +-ACX_LDNS(1,6,17) +-ACX_LDNS_NOT(1,6,14, [binary incompatibility, see http://open.nlnetlabs.nl/pipermail/ldns-users/2012-October/000564.html]) +-ACX_LDNS_NOT(1,6,15, [fail to create NSEC3 bitmap for empty non-terminals, see http://www.nlnetlabs.nl/pipermail/ldns-users/2012-November/000565.html]) ++ACX_LDNS(1.6.17) + ACX_PKCS11_MODULES + ACX_RT + ACX_LIBC +Index: opendnssec-2.1.8/m4/acx_ldns.m4 +=================================================================== +--- opendnssec-2.1.8.orig/m4/acx_ldns.m4 ++++ opendnssec-2.1.8/m4/acx_ldns.m4 +@@ -1,128 +1,63 @@ -AC_DEFUN([ACX_LDNS],[ - AC_ARG_WITH(ldns, -- [AC_HELP_STRING([--with-ldns=PATH],[specify prefix of path of ldns library to use])], +- [AS_HELP_STRING([--with-ldns=PATH],[specify prefix of path of ldns library to use])], - [ - LDNS_PATH="$withval" - AC_PATH_PROGS(LDNS_CONFIG, ldns-config, ldns-config, $LDNS_PATH/bin) @@ -70,8 +85,7 @@ Index: opendnssec-2.1.6/m4/acx_ldns.m4 - AC_MSG_ERROR([ldns library too old ($1.$2.$3 or later required)]) - ],[]) - AC_LANG_POP([C]) -+#serial 11 - +- - CPPFLAGS=$tmp_CPPFLAGS - - AC_SUBST(LDNS_INCLUDES) @@ -81,7 +95,7 @@ Index: opendnssec-2.1.6/m4/acx_ldns.m4 - -AC_DEFUN([ACX_LDNS_NOT],[ - AC_ARG_WITH(ldns, -- [AC_HELP_STRING([--with-ldns=PATH],[specify prefix of path of ldns library to use])], +- [AS_HELP_STRING([--with-ldns=PATH],[specify prefix of path of ldns library to use])], - [ - LDNS_PATH="$withval" - AC_PATH_PROGS(LDNS_CONFIG, ldns-config, ldns-config, $LDNS_PATH/bin) @@ -200,18 +214,3 @@ Index: opendnssec-2.1.6/m4/acx_ldns.m4 + AC_SUBST([LDNS_LIBS]) + AC_SUBST([LDNS_LDFLAGS]) ]) -Index: opendnssec-2.1.6/configure.ac -=================================================================== ---- opendnssec-2.1.6.orig/configure.ac -+++ opendnssec-2.1.6/configure.ac -@@ -138,9 +138,7 @@ AC_CHECK_MEMBER([struct sockaddr_un.sun_ - - # common dependencies - ACX_LIBXML2 --ACX_LDNS(1,6,17) --ACX_LDNS_NOT(1,6,14, [binary incompatibility, see http://open.nlnetlabs.nl/pipermail/ldns-users/2012-October/000564.html]) --ACX_LDNS_NOT(1,6,15, [fail to create NSEC3 bitmap for empty non-terminals, see http://www.nlnetlabs.nl/pipermail/ldns-users/2012-November/000565.html]) -+ACX_LDNS(1.6.17) - ACX_PKCS11_MODULES - ACX_RT - ACX_LIBC diff --git a/meta-security/recipes-security/opendnssec/opendnssec_2.1.6.bb b/meta-security/recipes-security/opendnssec/opendnssec_2.1.8.bb index 5e42ca8f7..cf6bdbdab 100644 --- a/meta-security/recipes-security/opendnssec/opendnssec_2.1.6.bb +++ b/meta-security/recipes-security/opendnssec/opendnssec_2.1.8.bb @@ -5,18 +5,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b041dbe2da80d4efd951393fbba90937" DEPENDS = "libxml2 openssl ldns libmicrohttpd jansson libyaml " -SRC_URI = "git://github.com/opendnssec/opendnssec;branch=develop \ +SRC_URI = "https://dist.opendnssec.org/source/opendnssec-${PV}.tar.gz \ file://libxml2_conf.patch \ file://libdns_conf_fix.patch \ - file://fix_fprint.patch \ " -SRCREV = "5876bccb38428790e2e9afc806ca68b029879874" +SRC_URI[sha256sum] = "900a213103ff19a405e446327fbfcea9ec13e405283d87b6ffc24a10d9a268f5" inherit autotools pkgconfig perlnative -S = "${WORKDIR}/git" - EXTRA_OECONF = " --with-libxml2=${STAGING_DIR_HOST}/usr --with-ldns=${STAGING_DIR_HOST}/usr \ --with-ssl=${STAGING_DIR_HOST}/usr " diff --git a/meta-security/recipes-security/redhat-security/redhat-security_1.0.bb b/meta-security/recipes-security/redhat-security/redhat-security_1.0.bb index 56f734cb3..0d70dc6ee 100644 --- a/meta-security/recipes-security/redhat-security/redhat-security_1.0.bb +++ b/meta-security/recipes-security/redhat-security/redhat-security_1.0.bb @@ -2,7 +2,7 @@ SUMMARY = "redhat security tools" DESCRIPTION = "Tools used by redhat linux distribution for security checks" SECTION = "security" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://find-chroot-py.sh \ file://find-chroot.sh \ diff --git a/meta-security/recipes-security/scapy/python3-scapy_2.4.3.bb b/meta-security/recipes-security/scapy/python3-scapy_2.4.4.bb index 925f188cd..8d81ed15d 100644 --- a/meta-security/recipes-security/scapy/python3-scapy_2.4.3.bb +++ b/meta-security/recipes-security/scapy/python3-scapy_2.4.4.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" -SRCREV = "3047580162a9407ef05fe981983cacfa698f1159" +SRCREV = "95ba5b8504152a1f820bbe679ccf03668cb5118f" SRC_URI = "git://github.com/secdev/scapy.git \ file://run-ptest" diff --git a/meta-xilinx/meta-microblaze/conf/layer.conf b/meta-xilinx/meta-microblaze/conf/layer.conf index e4e4d907c..794e107a1 100644 --- a/meta-xilinx/meta-microblaze/conf/layer.conf +++ b/meta-xilinx/meta-microblaze/conf/layer.conf @@ -12,3 +12,6 @@ BBFILE_PRIORITY_xilinx-microblaze = "5" LAYERDEPENDS_xilinx-microblaze = "core" LAYERSERIES_COMPAT_xilinx-microblaze = "dunfell gatesgarth" + +# Until we've moved to a newer version, we need to stick on 9.2 +GDBVERSION_microblaze = "9.2" diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/libgloss_3.3.%.bbappend b/meta-xilinx/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend index 3dee0f06c..3dee0f06c 100644 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/libgloss_3.3.%.bbappend +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend diff --git a/meta-xilinx/meta-microblaze/recipes-core/newlib/newlib_3.3.%.bbappend b/meta-xilinx/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend index d459bf19a..d459bf19a 100644 --- a/meta-xilinx/meta-microblaze/recipes-core/newlib/newlib_3.3.%.bbappend +++ b/meta-xilinx/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-9.2.inc b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-9.2.inc new file mode 100644 index 000000000..017b61ef6 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-9.2.inc @@ -0,0 +1,21 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[md5sum] = "db95524e554870209ab7d9f8fd8dc557" +SRC_URI[sha256sum] = "360cd7ae79b776988e89d8f9a01c985d0b1fa21c767a4295e5f88cb49175c555" diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-common.inc b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-common.inc new file mode 100644 index 000000000..08f615add --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-common.inc @@ -0,0 +1,62 @@ +SUMMARY = "GNU debugger" +HOMEPAGE = "http://www.gnu.org/software/gdb/" +SECTION = "devel" +DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native" + +LTTNGUST = "lttng-ust" +LTTNGUST_arc = "" +LTTNGUST_aarch64 = "" +LTTNGUST_mipsarch = "" +LTTNGUST_sh4 = "" + +inherit autotools texinfo + +UPSTREAM_CHECK_GITTAGREGEX = "gdb\-(?P<pver>.+)\-release" + +B = "${WORKDIR}/build-${TARGET_SYS}" + +EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" + +EXPAT = "--with-expat --with-libexpat-prefix=${STAGING_DIR_HOST}" + +EXTRA_OECONF = "--disable-gdbtk --disable-x --disable-werror \ + --with-curses --disable-multilib --disable-sim \ + --without-lzma --without-guile \ + ${GDBPROPREFIX} ${EXPAT} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \ + --disable-rpath \ + --disable-gas --disable-binutils \ + --disable-ld --disable-gold \ + --disable-gprof \ +" + +PACKAGECONFIG ??= "readline" +# Use --without-system-readline to compile with readline 5. +PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline" +PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3 python3-codecs" +PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" +# ncurses is already a hard DEPENDS, but would be added here if it weren't +PACKAGECONFIG[tui] = "--enable-tui,--disable-tui" + +GDBPROPREFIX = "--program-prefix=''" + +do_configure () { + # override this function to avoid the autoconf/automake/aclocal/autoheader + # calls for now + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + oe_runconf +} + +# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the +# right bits installed by binutils. Same for bfd.info -- also from binutils. +do_install_append() { + rm -rf ${D}${libdir} + rm -rf ${D}${includedir} + rm -rf ${D}${datadir}/locale + rm -f ${D}${infodir}/bfd.info +} + +RRECOMMENDS_gdb_append_linux = " glibc-thread-db " +RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " +RRECOMMENDS_gdbserver_append_linux = " glibc-thread-db " +RRECOMMENDS_gdbserver_append_linux-gnueabi = " glibc-thread-db " diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc new file mode 100644 index 000000000..c9daf25a4 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc @@ -0,0 +1,42 @@ +inherit cross-canadian +inherit python3-dir + +SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)" +PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" +BPN = "gdb" + +DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext \ + virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-libc" + +GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" + +# Overrides PACKAGECONFIG variables in gdb-common.inc +PACKAGECONFIG ??= "python readline" +PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \ + nativesdk-python3-core \ + nativesdk-python3-codecs nativesdk-python3-netclient \ + " +PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline" + +SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb" + +do_configure_prepend() { +cat > ${WORKDIR}/python << EOF +#! /bin/sh +case "\$2" in + --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;; + --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;; + --exec-prefix) echo "${exec_prefix}" ;; + *) exit 1 ;; +esac +exit 0 +EOF + chmod +x ${WORKDIR}/python +} + +# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the +# right bits installed by binutils. +do_install_append() { + rm -rf ${D}${exec_prefix}/lib + cross_canadian_bindirlinks +} diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_9.2.bb b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_9.2.bb new file mode 100644 index 000000000..301035940 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_9.2.bb @@ -0,0 +1,3 @@ +require gdb-common.inc +require gdb-cross-canadian.inc +require gdb-${PV}.inc diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc new file mode 100644 index 000000000..ebe329f6d --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc @@ -0,0 +1,30 @@ +require gdb-common.inc + +DEPENDS = "expat-native ncurses-native flex-native bison-native" + +inherit python3native + +# Overrides PACKAGECONFIG variables in gdb-common.inc +PACKAGECONFIG ??= "python readline" +PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-native" +PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native" + +do_compile_prepend() { + export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}" + export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}" +} + +#EXTRA_OEMAKE += "LDFLAGS='${BUILD_LDFLAGS}'" + +GDBPROPREFIX = "" + +PN = "gdb-cross-${TARGET_ARCH}" +BPN = "gdb" + +# Ignore how TARGET_ARCH is computed. +TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}" + +inherit cross +inherit gettext + +datadir .= "/gdb-${TARGET_SYS}${TARGET_VENDOR}-${TARGET_OS}" diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-cross_9.2.bb b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-cross_9.2.bb new file mode 100644 index 000000000..50cf159fd --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb-cross_9.2.bb @@ -0,0 +1,2 @@ +require gdb-cross.inc +require gdb-${PV}.inc diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb.inc b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb.inc new file mode 100644 index 000000000..249e24dc5 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb.inc @@ -0,0 +1,14 @@ +require gdb-common.inc + +inherit gettext + +#LDFLAGS_append = " -s" +#export CFLAGS_append=" -L${STAGING_LIBDIR}" + +# cross-canadian must not see this +PACKAGES =+ "gdbserver" +FILES_gdbserver = "${bindir}/gdbserver" + +ALLOW_EMPTY_gdbserver_riscv64 = "1" +ALLOW_EMPTY_gdbserver_riscv32 = "1" + diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch new file mode 100644 index 000000000..82287ea13 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch @@ -0,0 +1,25 @@ +From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 2 Mar 2015 02:27:55 +0000 +Subject: [PATCH] make man install relative to DESTDIR + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sim/common/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in +index c6de14122c..c4b1214946 100644 +--- a/sim/common/Makefile.in ++++ b/sim/common/Makefile.in +@@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) + datarootdir = @datarootdir@ + datadir = @datadir@ + mandir = @mandir@ +-man1dir = $(mandir)/man1 ++man1dir = $(DESTDIR)$(mandir)/man1 + infodir = @infodir@ + includedir = @includedir@ + diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch new file mode 100644 index 000000000..6067caf63 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -0,0 +1,32 @@ +From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 23 Mar 2016 06:30:09 +0000 +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined + +This helps building gdb on mips64 on musl, since +musl does not provide sgidefs.h this define is +only defined when GCC is using o32 ABI, in that +case gcc emits it as built-in define and hence +it works ok for mips32 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gdb/mips-linux-nat.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index 104c972f24..7f575b3363 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -41,6 +41,10 @@ + #ifndef PTRACE_GET_THREAD_AREA + #define PTRACE_GET_THREAD_AREA 25 + #endif ++/* musl does not define and relies on compiler built-in macros for it */ ++#ifndef _ABIO32 ++#define _ABIO32 1 ++#endif + + class mips_linux_nat_target final : public linux_nat_trad_target + { diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch new file mode 100644 index 000000000..c4bab7bb1 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -0,0 +1,49 @@ +From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Apr 2016 18:32:14 -0700 +Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gdb/gdbserver/linux-ppc-low.c | 6 ++++++ + gdb/nat/ppc-linux.h | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c +index 5d8d67bec2..ffcf65ab58 100644 +--- a/gdb/gdbserver/linux-ppc-low.c ++++ b/gdb/gdbserver/linux-ppc-low.c +@@ -23,7 +23,13 @@ + #include "elf/common.h" + #include <sys/uio.h> + #include <elf.h> ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include <asm/ptrace.h> ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + + #include "arch/ppc-linux-common.h" + #include "arch/ppc-linux-tdesc.h" +diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h +index d937a65b69..1fd54b4a0e 100644 +--- a/gdb/nat/ppc-linux.h ++++ b/gdb/nat/ppc-linux.h +@@ -18,7 +18,13 @@ + #ifndef NAT_PPC_LINUX_H + #define NAT_PPC_LINUX_H + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include <asm/ptrace.h> ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + #include <asm/cputable.h> + + /* This sometimes isn't defined. */ diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch new file mode 100644 index 000000000..fd165d4b8 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch @@ -0,0 +1,911 @@ +From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 2 Mar 2015 02:31:12 +0000 +Subject: [PATCH] Add support for Renesas SH (sh4) architecture. + +gdb (7.4-1~cvs20111117.2) experimental; urgency=low + . + * Add Renesas SH (sh4) support (Closes: #576242) + - Thanks Nobuhiro Iwamatsu, Takashi Yoshii. +Author: Hector Oron <zumbi@debian.org> +Bug-Debian: http://bugs.debian.org/576242 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gdb/Makefile.in | 2 + + gdb/configure.host | 1 + + gdb/sh-linux-tdep.c | 519 +++++++++++++++++++++++++++ + gdb/sh-tdep.c | 53 ++- + gdb/sh-tdep.h | 49 +++ + gdb/testsuite/gdb.asm/asm-source.exp | 5 + + gdb/testsuite/gdb.asm/sh.inc | 3 +- + gdb/testsuite/gdb.base/annota1.c | 3 + + gdb/testsuite/gdb.base/annota3.c | 4 + + gdb/testsuite/gdb.base/sigall.c | 3 + + gdb/testsuite/gdb.base/signals.c | 4 + + 11 files changed, 617 insertions(+), 29 deletions(-) + +diff --git a/gdb/Makefile.in b/gdb/Makefile.in +index c3e074b21f..42dd7af59c 100644 +--- a/gdb/Makefile.in ++++ b/gdb/Makefile.in +@@ -2317,6 +2317,8 @@ ALLDEPFILES = \ + sh-nbsd-nat.c \ + sh-nbsd-tdep.c \ + sh-tdep.c \ ++ sh-linux-tdep.c \ ++ sh-linux-nat.c \ + sol2-tdep.c \ + solib-aix.c \ + solib-svr4.c \ +diff --git a/gdb/configure.host b/gdb/configure.host +index ce52823729..5b5173a71a 100644 +--- a/gdb/configure.host ++++ b/gdb/configure.host +@@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; + + s390*-*-linux*) gdb_host=linux ;; + ++sh*-*-linux*) gdb_host=linux ;; + sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu) + gdb_host=nbsd ;; + sh*-*-openbsd*) gdb_host=nbsd ;; +diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c +index 13c10eeeda..1d0d583a64 100644 +--- a/gdb/sh-linux-tdep.c ++++ b/gdb/sh-linux-tdep.c +@@ -18,14 +18,37 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + + #include "defs.h" ++#include "gdbcore.h" ++#include "frame.h" ++#include "frame-base.h" ++#include "frame-unwind.h" ++#include "dwarf2-frame.h" ++#include "value.h" ++#include "regcache.h" ++#include "inferior.h" + #include "osabi.h" + ++#include "reggroups.h" ++#include "arch-utils.h" ++#include "floatformat.h" + #include "solib-svr4.h" + #include "symtab.h" ++#include "gdb_string.h" ++#include "command.h" ++#include "gdb_assert.h" + + #include "trad-frame.h" + #include "tramp-frame.h" + ++#include <sys/ptrace.h> ++#include <sys/types.h> ++#include <sys/param.h> ++#include <sys/user.h> ++#include <sys/syscall.h> ++ ++#include <asm/ptrace.h> ++ ++#include "regset.h" + #include "glibc-tdep.h" + #include "sh-tdep.h" + #include "linux-tdep.h" +@@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { + sh_linux_rt_sigreturn_init + }; + ++/* Recognizing signal handler frames. */ ++ ++/* GNU/Linux has two flavors of signals. Normal signal handlers, and ++ "realtime" (RT) signals. The RT signals can provide additional ++ information to the signal handler if the SA_SIGINFO flag is set ++ when establishing a signal handler using `sigaction'. It is not ++ unlikely that future versions of GNU/Linux will support SA_SIGINFO ++ for normal signals too. */ ++ ++/* When the SH Linux kernel calls a signal handler and the ++ SA_RESTORER flag isn't set, the return address points to a bit of ++ code on the stack. This function returns whether the PC appears to ++ be within this bit of code. ++ ++ The instruction sequence for normal signals is ++ mov.w 1f,r3 ++ trapa #16 ++ or r0, r0 ++ or r0, r0 ++ or r0, r0 ++ or r0, r0 ++ or r0, r0 ++ 1: .word __NR_sigreturn ++ or 0x9305 0xc310 0x200b 0x200b 0x200b 0x200b 0x200b 0x0077. ++ ++ Checking for the code sequence should be somewhat reliable, because ++ the effect is to call the system call sigreturn. This is unlikely ++ to occur anywhere other than a signal trampoline. ++ ++ It kind of sucks that we have to read memory from the process in ++ order to identify a signal trampoline, but there doesn't seem to be ++ any other way. The PC_IN_SIGTRAMP macro in tm-linux.h arranges to ++ only call us if no function name could be identified, which should ++ be the case since the code is on the stack. ++ ++ Detection of signal trampolines for handlers that set the ++ SA_RESTORER flag is in general not possible. Unfortunately this is ++ what the GNU C Library has been doing for quite some time now. ++ However, as of version 2.1.2, the GNU C Library uses signal ++ trampolines (named __restore and __restore_rt) that are identical ++ to the ones used by the kernel. Therefore, these trampolines are ++ supported too. */ ++ ++#define MOVW(n) (0x9300|((n)-2)) /* Move mem word at PC+n to R3 */ ++#define TRAP16 0xc310 /* Syscall w/no args (NR in R3) */ ++#define OR_R0_R0 0x200b /* or r0,r0 (insert to avoid hardware bug) */ ++ ++#define LINUX_SIGTRAMP_INSN0 MOVW(7) /* Move mem word at PC+7 to R3 */ ++#define LINUX_SIGTRAMP_INSN1 TRAP16 /* Syscall w/no args (NR in R3) */ ++#define LINUX_SIGTRAMP_INSN2 OR_R0_R0 /* or r0,r0 (insert to avoid hardware bug) */ ++ ++static const unsigned short linux_sigtramp_code[] = ++{ ++ LINUX_SIGTRAMP_INSN0, ++ LINUX_SIGTRAMP_INSN1, ++ LINUX_SIGTRAMP_INSN2, ++ LINUX_SIGTRAMP_INSN2, ++ LINUX_SIGTRAMP_INSN2, ++ LINUX_SIGTRAMP_INSN2, ++ LINUX_SIGTRAMP_INSN2, ++ __NR_sigreturn ++}; ++ ++#define LINUX_SIGTRAMP_LEN (sizeof linux_sigtramp_code) ++ ++/* If PC is in a sigtramp routine, return the address of the start of ++ the routine. Otherwise, return 0. */ ++ ++static CORE_ADDR ++sh_linux_sigtramp_start (struct frame_info *next_frame) ++{ ++ CORE_ADDR pc = get_frame_pc (next_frame); ++ gdb_byte buf[LINUX_SIGTRAMP_LEN]; ++ ++ /* We only recognize a signal trampoline if PC is at the start of ++ one of the three instructions. We optimize for finding the PC at ++ the start, as will be the case when the trampoline is not the ++ first frame on the stack. We assume that in the case where the ++ PC is not at the start of the instruction sequence, there will be ++ a few trailing readable bytes on the stack. */ ++ ++ if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_SIGTRAMP_LEN)) ++ return 0; ++ ++ if (buf[0] != LINUX_SIGTRAMP_INSN0) ++ { ++ if (buf[0] != LINUX_SIGTRAMP_INSN1) ++ return 0; ++ ++ pc -= 2; ++ ++ if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_SIGTRAMP_LEN)) ++ return 0; ++ } ++ ++ if (memcmp (buf, linux_sigtramp_code, LINUX_SIGTRAMP_LEN) != 0) ++ return 0; ++ ++ return pc; ++} ++ ++/* This function does the same for RT signals. Here the instruction ++ sequence is ++ mov.w 1f,r3 ++ trapa #16 ++ or r0, r0 ++ or r0, r0 ++ or r0, r0 ++ or r0, r0 ++ or r0, r0 ++ 1: .word __NR_rt_sigreturn ++ or 0x9305 0xc310 0x200b 0x200b 0x200b 0x200b 0x200b 0x00ad. ++ ++ The effect is to call the system call rt_sigreturn. */ ++ ++#define LINUX_RT_SIGTRAMP_INSN0 MOVW(7) /* Move mem word at PC+7 to R3 */ ++#define LINUX_RT_SIGTRAMP_INSN1 TRAP16 /* Syscall w/no args (NR in R3) */ ++#define LINUX_RT_SIGTRAMP_INSN2 OR_R0_R0 /* or r0,r0 (insert to avoid hardware bug) */ ++ ++static const unsigned short linux_rt_sigtramp_code[] = ++{ ++ LINUX_RT_SIGTRAMP_INSN0, ++ LINUX_RT_SIGTRAMP_INSN1, ++ LINUX_RT_SIGTRAMP_INSN2, ++ LINUX_RT_SIGTRAMP_INSN2, ++ LINUX_RT_SIGTRAMP_INSN2, ++ LINUX_RT_SIGTRAMP_INSN2, ++ LINUX_RT_SIGTRAMP_INSN2, ++ __NR_rt_sigreturn ++}; ++ ++#define LINUX_RT_SIGTRAMP_LEN (sizeof linux_rt_sigtramp_code) ++ ++/* If PC is in a RT sigtramp routine, return the address of the start ++ of the routine. Otherwise, return 0. */ ++ ++static CORE_ADDR ++sh_linux_rt_sigtramp_start (struct frame_info *next_frame) ++{ ++ CORE_ADDR pc = get_frame_pc (next_frame); ++ gdb_byte buf[LINUX_RT_SIGTRAMP_LEN]; ++ ++ /* We only recognize a signal trampoline if PC is at the start of ++ one of the two instructions. We optimize for finding the PC at ++ the start, as will be the case when the trampoline is not the ++ first frame on the stack. We assume that in the case where the ++ PC is not at the start of the instruction sequence, there will be ++ a few trailing readable bytes on the stack. */ ++ ++ if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_RT_SIGTRAMP_LEN)) ++ return 0; ++ ++ if (buf[0] != LINUX_RT_SIGTRAMP_INSN0) ++ { ++ if (buf[0] != LINUX_RT_SIGTRAMP_INSN1) ++ return 0; ++ ++ pc -= 2; ++ ++ if (!safe_frame_unwind_memory (next_frame, pc, buf, ++ LINUX_RT_SIGTRAMP_LEN)) ++ return 0; ++ } ++ ++ if (memcmp (buf, linux_rt_sigtramp_code, LINUX_RT_SIGTRAMP_LEN) != 0) ++ return 0; ++ ++ return pc; ++} ++ ++/* Return whether PC is in a GNU/Linux sigtramp routine. */ ++ ++static int ++sh_linux_sigtramp_p (struct frame_info *this_frame) ++{ ++ CORE_ADDR pc = get_frame_pc (this_frame); ++ char *name; ++ ++ find_pc_partial_function (pc, &name, NULL, NULL); ++ ++ /* If we have NAME, we can optimize the search. The trampolines are ++ named __restore and __restore_rt. However, they aren't dynamically ++ exported from the shared C library, so the trampoline may appear to ++ be part of the preceding function. This should always be sigaction, ++ __sigaction, or __libc_sigaction (all aliases to the same function). */ ++ if (name == NULL || strstr (name, "sigaction") != NULL) ++ return (sh_linux_sigtramp_start (this_frame) != 0 ++ || sh_linux_rt_sigtramp_start (this_frame) != 0); ++ ++ return (strcmp ("__restore", name) == 0 ++ || strcmp ("__restore_rt", name) == 0); ++} ++ ++/* Offset to struct sigcontext in ucontext, from <asm/ucontext.h>. */ ++#define SH_LINUX_UCONTEXT_SIGCONTEXT_OFFSET 12 ++ ++ ++/* Assuming NEXT_FRAME is a frame following a GNU/Linux sigtramp ++ routine, return the address of the associated sigcontext structure. */ ++ ++static CORE_ADDR ++sh_linux_sigcontext_addr (struct frame_info *this_frame) ++{ ++ CORE_ADDR pc; ++ CORE_ADDR sp; ++ ++ sp = get_frame_register_unsigned (this_frame, SP_REGNUM); ++ ++ pc = sh_linux_sigtramp_start (this_frame); ++ if (pc) ++ { ++ return sp; ++ } ++ ++ pc = sh_linux_rt_sigtramp_start (this_frame); ++ if (pc) ++ { ++ CORE_ADDR ucontext_addr; ++ ++ /* The sigcontext structure is part of the user context. A ++ pointer to the user context is passed as the third argument ++ to the signal handler. */ ++ ucontext_addr = get_frame_register_unsigned (this_frame, ARG0_REGNUM+2); ++ return ucontext_addr + SH_LINUX_UCONTEXT_SIGCONTEXT_OFFSET; ++ } ++ ++ error ("Couldn't recognize signal trampoline."); ++ return 0; ++} ++ ++/* Signal trampolines. */ ++extern struct sh_frame_cache *sh_alloc_frame_cache (void); ++ ++static struct sh_frame_cache * ++sh_linux_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) ++{ ++ struct sh_frame_cache *cache; ++ struct gdbarch_tdep *tdep = gdbarch_tdep (get_current_arch ()); ++ CORE_ADDR sigcontext_addr; ++ ++ if (*this_cache) ++ return *this_cache; ++ ++ cache = sh_alloc_frame_cache (); ++ ++ cache->base = get_frame_register_unsigned (this_frame, SP_REGNUM); ++ sigcontext_addr = tdep->sigcontext_addr (this_frame); ++ if (tdep->sc_reg_offset) ++ { ++ int i; ++ ++ gdb_assert (tdep->sc_num_regs <= SH_NUM_REGS); ++ ++ for (i = 0; i < tdep->sc_num_regs; i++) ++ if (tdep->sc_reg_offset[i] != -1) ++ cache->saved_regs[i] = sigcontext_addr + tdep->sc_reg_offset[i]; ++ } ++ ++ *this_cache = cache; ++ return cache; ++} ++ ++static void ++sh_linux_sigtramp_frame_this_id (struct frame_info *this_frame, void **this_cache, ++ struct frame_id *this_id) ++{ ++ struct sh_frame_cache *cache = ++ sh_linux_sigtramp_frame_cache (this_frame, this_cache); ++ ++ (*this_id) = frame_id_build (cache->base + 64, cache->pc); ++} ++ ++extern struct value * sh_frame_prev_register (); ++static struct value * ++sh_linux_sigtramp_frame_prev_register (struct frame_info *this_frame, ++ void **this_cache, int regnum) ++{ ++ sh_linux_sigtramp_frame_cache (this_frame, this_cache); ++ ++ return sh_frame_prev_register (this_frame, this_cache, regnum); ++} ++ ++static int ++sh_linux_sigtramp_frame_sniffer (const struct frame_unwind *self, ++ struct frame_info *this_frame, ++ void **this_prologue_cache) ++{ ++ struct gdbarch_tdep *tdep = gdbarch_tdep (get_frame_arch (this_frame)); ++ ++ /* We shouldn't even bother if we don't have a sigcontext_addr ++ handler. */ ++ if (tdep->sigcontext_addr == NULL) ++ return 0; ++ ++ if (tdep->sigtramp_p != NULL) ++ { ++ if (tdep->sigtramp_p (this_frame)) ++ return 1; ++ } ++ ++ return 0; ++} ++ ++static const struct frame_unwind sh_linux_sigtramp_frame_unwind = ++{ ++ SIGTRAMP_FRAME, ++ sh_linux_sigtramp_frame_this_id, ++ sh_linux_sigtramp_frame_prev_register, ++ NULL, ++ sh_linux_sigtramp_frame_sniffer ++}; ++ ++/* Supply register REGNUM from the buffer specified by GREGS and LEN ++ in the general-purpose register set REGSET to register cache ++ REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */ ++ ++void ++sh_supply_gregset (const struct regset *regset, struct regcache *regcache, ++ int regnum, const void *gregs, size_t len) ++{ ++ const struct gdbarch_tdep *tdep = gdbarch_tdep (regset->arch); ++ const char *regs = gregs; ++ int i; ++ ++ gdb_assert (len == tdep->sizeof_gregset); ++ ++ for (i = 0; i < tdep->gregset_num_regs; i++) ++ { ++ if ((regnum == i || regnum == -1) ++ && tdep->gregset_reg_offset[i] != -1) ++ regcache_raw_supply (regcache, i, regs + tdep->gregset_reg_offset[i]); ++ } ++} ++ ++/* Collect register REGNUM from the register cache REGCACHE and store ++ it in the buffer specified by GREGS and LEN as described by the ++ general-purpose register set REGSET. If REGNUM is -1, do this for ++ all registers in REGSET. */ ++ ++void ++sh_collect_gregset (const struct regset *regset, ++ const struct regcache *regcache, ++ int regnum, void *gregs, size_t len) ++{ ++ const struct gdbarch_tdep *tdep = gdbarch_tdep (regset->arch); ++ char *regs = gregs; ++ int i; ++ ++ gdb_assert (len == tdep->sizeof_gregset); ++ ++ for (i = 0; i < tdep->gregset_num_regs; i++) ++ { ++ if ((regnum == i || regnum == -1) ++ && tdep->gregset_reg_offset[i] != -1) ++ regcache_raw_collect (regcache, i, regs + tdep->gregset_reg_offset[i]); ++ } ++} ++ ++/* Supply register REGNUM from the buffer specified by FPREGS and LEN ++ in the floating-point register set REGSET to register cache ++ REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */ ++ ++static void ++sh_supply_fpregset (const struct regset *regset, struct regcache *regcache, ++ int regnum, const void *fpregs, size_t len) ++{ ++ const struct gdbarch_tdep *tdep = gdbarch_tdep (regset->arch); ++ const char *regs = fpregs; ++ int i; ++ ++ gdb_assert (len == tdep->sizeof_fpregset); ++ for (i = 0; i < 16; i++) ++ { ++ if (regnum == i+25 || regnum == -1) ++ regcache_raw_supply (regcache, i+25, regs + i*4); ++ } ++ if (regnum == FPSCR_REGNUM || regnum == -1) ++ regcache_raw_supply (regcache, FPSCR_REGNUM, regs + 32*4); ++ if (regnum == FPUL_REGNUM || regnum == -1) ++ regcache_raw_supply (regcache, FPUL_REGNUM, regs + 33*4); ++} ++ ++/* Collect register REGNUM from the register cache REGCACHE and store ++ it in the buffer specified by FPREGS and LEN as described by the ++ floating-point register set REGSET. If REGNUM is -1, do this for ++ all registers in REGSET. */ ++ ++static void ++sh_collect_fpregset (const struct regset *regset, ++ const struct regcache *regcache, ++ int regnum, void *fpregs, size_t len) ++{ ++ const struct gdbarch_tdep *tdep = gdbarch_tdep (regset->arch); ++ char *regs = fpregs; ++ int i; ++ ++ gdb_assert (len == tdep->sizeof_fpregset); ++ for (i = 0; i < 16; i++) ++ { ++ if (regnum == i+25 || regnum == -1) ++ regcache_raw_collect (regcache, i+25, regs + i*4); ++ } ++ if (regnum == FPSCR_REGNUM || regnum == -1) ++ regcache_raw_collect (regcache, FPSCR_REGNUM, regs + 32*4); ++ if (regnum == FPUL_REGNUM || regnum == -1) ++ regcache_raw_collect (regcache, FPUL_REGNUM, regs + 33*4); ++} ++ ++/* Return the appropriate register set for the core section identified ++ by SECT_NAME and SECT_SIZE. */ ++ ++const struct regset * ++sh_linux_regset_from_core_section (struct gdbarch *gdbarch, ++ const char *sect_name, size_t sect_size) ++{ ++ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); ++ ++ if (strcmp (sect_name, ".reg") == 0 && sect_size == tdep->sizeof_gregset) ++ { ++ if (tdep->gregset == NULL) ++ tdep->gregset = regset_alloc (gdbarch, sh_supply_gregset, ++ sh_collect_gregset); ++ return tdep->gregset; ++ } ++ ++ if ((strcmp (sect_name, ".reg2") == 0 && sect_size == tdep->sizeof_fpregset)) ++ { ++ if (tdep->fpregset == NULL) ++ tdep->fpregset = regset_alloc (gdbarch, sh_supply_fpregset, ++ sh_collect_fpregset); ++ return tdep->fpregset; ++ } ++ ++ return NULL; ++} ++ ++/* The register sets used in GNU/Linux ELF core-dumps are identical to ++ the register sets in `struct user' that are used for a.out ++ core-dumps. These are also used by ptrace(2). The corresponding ++ types are `elf_gregset_t' for the general-purpose registers (with ++ `elf_greg_t' the type of a single GP register) and `elf_fpregset_t' ++ for the floating-point registers. ++ ++ Those types used to be available under the names `gregset_t' and ++ `fpregset_t' too, and GDB used those names in the past. But those ++ names are now used for the register sets used in the `mcontext_t' ++ type, which have a different size and layout. */ ++ ++/* Mapping between the general-purpose registers in `struct user' ++ format and GDB's register cache layout. */ ++ ++/* From <sys/reg.h>. */ ++static int sh_linux_gregset_reg_offset[] = ++{ ++ 0, 4, 8, 12, 16, 20, 24, 28, ++ 32, 36, 40, 44, 48, 52, 56, 60, ++ ++ REG_PC*4, REG_PR*4, REG_GBR*4, -1, ++ REG_MACH*4, REG_MACL*4, REG_SR*4, ++}; ++ ++/* Mapping between the general-purpose registers in `struct ++ sigcontext' format and GDB's register cache layout. */ ++ ++/* From <asm/sigcontext.h>. */ ++static int sh_linux_sc_reg_offset[] = ++{ ++ 4, 8, 12, 16, 20, 24, 28, 32, ++ 36, 40, 44, 48, 52, 56, 60, 64, ++ 68, 72, 80, -1, ++ 84, 88, 76 ++}; ++ + static void + sh_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) + { ++ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); ++ bfd abfd; ++ ++ tdep->gregset_reg_offset = sh_linux_gregset_reg_offset; ++ tdep->gregset_num_regs = ARRAY_SIZE (sh_linux_gregset_reg_offset); ++ tdep->sizeof_gregset = 23 * 4; ++ ++ tdep->jb_pc_offset = 32; /* From <bits/setjmp.h>. */ ++ ++ tdep->sigtramp_p = sh_linux_sigtramp_p; ++ tdep->sigcontext_addr = sh_linux_sigcontext_addr; ++ tdep->sc_reg_offset = sh_linux_sc_reg_offset; ++ tdep->sc_num_regs = ARRAY_SIZE (sh_linux_sc_reg_offset); ++ ++ frame_unwind_append_unwinder(gdbarch, &sh_linux_sigtramp_frame_unwind); ++ ++ /* If we have a register mapping, enable the generic core file ++ support, unless it has already been enabled. */ ++ if (tdep->gregset_reg_offset ++ && !gdbarch_regset_from_core_section_p (gdbarch)) ++ set_gdbarch_regset_from_core_section (gdbarch, ++ sh_linux_regset_from_core_section); ++ + linux_init_abi (info, gdbarch); + + /* GNU/Linux uses SVR4-style shared libraries. */ +diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c +index e3aee0ac28..5958cf3688 100644 +--- a/gdb/sh-tdep.c ++++ b/gdb/sh-tdep.c +@@ -21,6 +21,9 @@ + sac@cygnus.com. */ + + #include "defs.h" ++#include "arch-utils.h" ++#include "command.h" ++#include "dummy-frame.h" + #include "frame.h" + #include "frame-base.h" + #include "frame-unwind.h" +@@ -66,23 +69,6 @@ static const char *const sh_cc_enum[] = { + + static const char *sh_active_calling_convention = sh_cc_gcc; + +-#define SH_NUM_REGS 67 +- +-struct sh_frame_cache +-{ +- /* Base address. */ +- CORE_ADDR base; +- LONGEST sp_offset; +- CORE_ADDR pc; +- +- /* Flag showing that a frame has been created in the prologue code. */ +- int uses_fp; +- +- /* Saved registers. */ +- CORE_ADDR saved_regs[SH_NUM_REGS]; +- CORE_ADDR saved_sp; +-}; +- + static int + sh_is_renesas_calling_convention (struct type *func_type) + { +@@ -1050,7 +1036,7 @@ sh_treat_as_flt_p (struct type *type) + return 0; + /* Otherwise if the type of that member is float, the whole type is + treated as float. */ +- if (TYPE_CODE (TYPE_FIELD_TYPE (type, 0)) == TYPE_CODE_FLT) ++ if (TYPE_CODE (check_typedef (TYPE_FIELD_TYPE (type, 0))) == TYPE_CODE_FLT) + return 1; + /* Otherwise it's not treated as float. */ + return 0; +@@ -1100,7 +1086,7 @@ sh_push_dummy_call_fpu (struct gdbarch *gdbarch, + in four registers available. Loop thru args from first to last. */ + for (argnum = 0; argnum < nargs; argnum++) + { +- type = value_type (args[argnum]); ++ type = check_typedef (value_type (args[argnum])); + len = TYPE_LENGTH (type); + val = sh_justify_value_in_reg (gdbarch, args[argnum], len); + +@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, + reg->how = DWARF2_FRAME_REG_UNDEFINED; + } + +-static struct sh_frame_cache * ++struct sh_frame_cache * + sh_alloc_frame_cache (void) + { + struct sh_frame_cache *cache; +@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) + return cache; + } + +-static struct sh_frame_cache * ++struct sh_frame_cache * + sh_frame_cache (struct frame_info *this_frame, void **this_cache) + { + struct gdbarch *gdbarch = get_frame_arch (this_frame); +@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) + return cache; + } + +-static struct value * +-sh_frame_prev_register (struct frame_info *this_frame, +- void **this_cache, int regnum) ++struct value * ++sh_frame_prev_register (struct frame_info *this_frame, void **this_cache, ++ int regnum) + { + struct gdbarch *gdbarch = get_frame_arch (this_frame); + struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); +@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, + the current frame. Frob regnum so that we pull the value from + the correct place. */ + if (regnum == gdbarch_pc_regnum (gdbarch)) +- regnum = PR_REGNUM; ++ regnum = PR_REGNUM; /* XXX: really? */ + + if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) + return frame_unwind_got_memory (this_frame, regnum, +@@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, + static struct gdbarch * + sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) + { +- struct gdbarch *gdbarch; + struct gdbarch_tdep *tdep; ++ struct gdbarch *gdbarch; + + /* If there is already a candidate, use it. */ + arches = gdbarch_list_lookup_by_info (arches, &info); +@@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) + tdep = XCNEW (struct gdbarch_tdep); + gdbarch = gdbarch_alloc (&info, tdep); + ++ /* General-purpose registers. */ ++ tdep->gregset = NULL; ++ tdep->gregset_reg_offset = NULL; ++ tdep->gregset_num_regs = 23; ++ tdep->sizeof_gregset = 0; ++ ++ /* Floating-point registers. */ ++ tdep->fpregset = NULL; ++ tdep->sizeof_fpregset = 34*4; ++ ++ tdep->jb_pc_offset = -1; ++ + set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); + set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); + set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); +@@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) + break; + } + ++ dwarf2_append_unwinders (gdbarch); ++ + /* Hook in ABI-specific overrides, if they have been registered. */ + gdbarch_init_osabi (info, gdbarch); + +- dwarf2_append_unwinders (gdbarch); + frame_unwind_append_unwinder (gdbarch, &sh_stub_unwind); + frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); + +diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h +index 76e2e76e39..2710f63010 100644 +--- a/gdb/sh-tdep.h ++++ b/gdb/sh-tdep.h +@@ -21,6 +21,12 @@ + + /* Contributed by Steve Chamberlain sac@cygnus.com. */ + ++struct frame_info; ++struct gdbarch; ++struct reggroup; ++struct regset; ++struct regcache; ++ + /* Registers for all SH variants. Used also by sh3-rom.c. */ + enum + { +@@ -29,6 +35,7 @@ enum + ARG0_REGNUM = 4, + ARGLAST_REGNUM = 7, + FP_REGNUM = 14, ++ SP_REGNUM = 15, + PC_REGNUM = 16, + PR_REGNUM = 17, + GBR_REGNUM = 18, +@@ -81,6 +88,24 @@ enum + FV0_REGNUM = 76, + FV_LAST_REGNUM = 79 + }; ++#define SH_NUM_REGS 67 ++ ++struct sh_frame_cache ++{ ++ /* Base address. */ ++ CORE_ADDR base; ++ LONGEST sp_offset; ++ CORE_ADDR pc; ++ ++ /* Flag showing that a frame has been created in the prologue code. */ ++ int uses_fp; ++ ++ /* Saved registers. */ ++ CORE_ADDR saved_regs[SH_NUM_REGS]; ++ CORE_ADDR saved_sp; ++}; ++ ++extern struct sh_frame_cache *sh_frame_cache (struct frame_info *next_frame, void **this_cache); + + /* This structure describes a register in a core-file. */ + struct sh_corefile_regmap +@@ -89,8 +114,32 @@ struct sh_corefile_regmap + unsigned int offset; + }; + ++/* sh architecture specific information. */ + struct gdbarch_tdep + { ++ /* General-purpose registers. */ ++ struct regset *gregset; ++ int *gregset_reg_offset; ++ int gregset_num_regs; ++ size_t sizeof_gregset; ++ ++ /* Floating-point registers. */ ++ struct regset *fpregset; ++ size_t sizeof_fpregset; ++ ++ /* Offset of saved PC in jmp_buf. */ ++ int jb_pc_offset; ++ ++ /* Detect sigtramp. */ ++ int (*sigtramp_p) (struct frame_info *); ++ ++ /* Get address of sigcontext for sigtramp. */ ++ CORE_ADDR (*sigcontext_addr) (struct frame_info *); ++ ++ /* Offset of registers in `struct sigcontext'. */ ++ int *sc_reg_offset; ++ int sc_num_regs; ++ + /* Non-NULL when debugging from a core file. Provides the offset + where each general-purpose register is stored inside the associated + core file section. */ +diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp +index 4914498f98..6e25cbed18 100644 +--- a/gdb/testsuite/gdb.asm/asm-source.exp ++++ b/gdb/testsuite/gdb.asm/asm-source.exp +@@ -116,6 +116,11 @@ switch -glob -- [istarget] { + append link-flags " -m elf32ppc" + } + } ++ "sh*-linux*" { ++ set asm-arch sh-linux ++ set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}" ++ set debug-flags "-gdwarf-2" ++ } + "sh*-*-*" { + set asm-arch sh + set debug-flags "-gdwarf-2" +diff --git a/gdb/testsuite/gdb.asm/sh.inc b/gdb/testsuite/gdb.asm/sh.inc +index a4a5fc545e..89efed7795 100644 +--- a/gdb/testsuite/gdb.asm/sh.inc ++++ b/gdb/testsuite/gdb.asm/sh.inc +@@ -40,9 +40,8 @@ + mov.l .Lconst\@,r1 + bra .Lafterconst\@ + nop +- nop +-.Lconst\@: + .align 2 ++.Lconst\@: + .long \subr + .align 1 + .Lafterconst\@: +diff --git a/gdb/testsuite/gdb.base/annota1.c b/gdb/testsuite/gdb.base/annota1.c +index 424e1b8327..0de2e7b633 100644 +--- a/gdb/testsuite/gdb.base/annota1.c ++++ b/gdb/testsuite/gdb.base/annota1.c +@@ -1,6 +1,9 @@ + #include <stdio.h> + #include <signal.h> + ++#ifdef __sh__ ++#define signal(a,b) /* Signals not supported on this target - make them go away */ ++#endif + + void + handle_USR1 (int sig) +diff --git a/gdb/testsuite/gdb.base/annota3.c b/gdb/testsuite/gdb.base/annota3.c +index 424e1b8327..952aaf218a 100644 +--- a/gdb/testsuite/gdb.base/annota3.c ++++ b/gdb/testsuite/gdb.base/annota3.c +@@ -1,6 +1,10 @@ + #include <stdio.h> + #include <signal.h> + ++#ifdef __sh__ ++#define signal(a,b) /* Signals not supported on this target - make them go away */ ++#endif ++ + + void + handle_USR1 (int sig) +diff --git a/gdb/testsuite/gdb.base/sigall.c b/gdb/testsuite/gdb.base/sigall.c +index 81f3b08d6b..1574b2d6cb 100644 +--- a/gdb/testsuite/gdb.base/sigall.c ++++ b/gdb/testsuite/gdb.base/sigall.c +@@ -1,6 +1,9 @@ + #include <signal.h> + #include <unistd.h> + ++#ifdef __sh__ ++#define signal(a,b) /* Signals not supported on this target - make them go away */ ++#endif + + /* Signal handlers, we set breakpoints in them to make sure that the + signals really get delivered. */ +diff --git a/gdb/testsuite/gdb.base/signals.c b/gdb/testsuite/gdb.base/signals.c +index 756606880f..1205a9bc9c 100644 +--- a/gdb/testsuite/gdb.base/signals.c ++++ b/gdb/testsuite/gdb.base/signals.c +@@ -3,6 +3,10 @@ + #include <signal.h> + #include <unistd.h> + ++#ifdef __sh__ ++#define signal(a,b) /* Signals not supported on this target - make them go away */ ++#define alarm(a) /* Ditto for alarm() */ ++#endif + + static int count = 0; + diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch new file mode 100644 index 000000000..d0360da43 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -0,0 +1,47 @@ +From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Apr 2016 15:25:03 -0700 +Subject: [PATCH] Dont disable libreadline.a when using --disable-static + +If gdb is configured with --disable-static then this is dutifully passed to +readline which then disables libreadline.a, which causes a problem when gdb +tries to link against that. + +To ensure that readline always builds static libraries, pass --enable-static to +the sub-configure. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.def | 3 ++- + Makefile.in | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.def b/Makefile.def +index 311feb9de3..24c0685d48 100644 +--- a/Makefile.def ++++ b/Makefile.def +@@ -105,7 +105,8 @@ host_modules= { module= libiconv; + missing= install-html; + missing= install-info; }; + host_modules= { module= m4; }; +-host_modules= { module= readline; }; ++host_modules= { module= readline; ++ extra_configure_flags='--enable-static';}; + host_modules= { module= sid; }; + host_modules= { module= sim; }; + host_modules= { module= texinfo; no_install= true; }; +diff --git a/Makefile.in b/Makefile.in +index 1aabf6ede4..d957efde81 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -25510,7 +25510,7 @@ configure-readline: + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ +- --target=${target_alias} \ ++ --target=${target_alias} --enable-static \ + || exit 1 + @endif readline + diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch new file mode 100644 index 000000000..d222d0108 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch @@ -0,0 +1,33 @@ +From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <amccurdy@gmail.com> +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use <asm/sgidefs.h> + +Build fix for MIPS with musl libc + +The MIPS specific header <sgidefs.h> is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide +<asm/sgidefs.h> which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index 7f575b3363..dc93a64a93 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -31,7 +31,7 @@ + #include "gdb_proc_service.h" + #include "gregset.h" + +-#include <sgidefs.h> ++#include <asm/sgidefs.h> + #include "nat/gdb_ptrace.h" + #include <asm/ptrace.h> + #include "inf-ptrace.h" diff --git a/poky/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 8cbc50b75..09896611f 100644 --- a/poky/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch @@ -1,7 +1,7 @@ -From 53f694ffa1ee9893b834758413c23947957f0fee Mon Sep 17 00:00:00 2001 +From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 30 Apr 2016 15:31:40 -0700 -Subject: [PATCH 07/11] Use exorted definitions of SIGRTMIN +Subject: [PATCH] Use exorted definitions of SIGRTMIN Define W_STOPCODE if not defined already @@ -20,10 +20,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index b81014024c7..e0513d47122 100644 +index 4484fa5c87..3bb0ee7a49 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c -@@ -4428,6 +4428,6 @@ lin_thread_get_thread_signals (sigset_t *set) +@@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) /* NPTL reserves the first two RT signals, but does not provide any way for the debugger to query the signal numbers - fortunately they don't change. */ @@ -33,7 +33,7 @@ index b81014024c7..e0513d47122 100644 + sigaddset (set, SIGRTMIN + 1); } diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 44dcbb7758d..975d7276f66 100644 +index 44dcbb7758..975d7276f6 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h @@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); @@ -45,6 +45,3 @@ index 44dcbb7758d..975d7276f66 100644 +#endif + #endif /* NAT_LINUX_NAT_H */ --- -2.29.2 - diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch new file mode 100644 index 000000000..18168c6ba --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch @@ -0,0 +1,27 @@ +From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Apr 2016 15:35:39 -0700 +Subject: [PATCH] Change order of CFLAGS + +Lets us override Werror if need be + +Upstream-Status: Inappropriate + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gdb/gdbserver/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in +index 16a9f2fd38..b9c8cd9c41 100644 +--- a/gdb/gdbserver/Makefile.in ++++ b/gdb/gdbserver/Makefile.in +@@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ + INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) + INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) +-INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER ++INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER + + # LDFLAGS is specifically reserved for setting from the command line + # when running make. diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch new file mode 100644 index 000000000..8f15c49d0 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch @@ -0,0 +1,45 @@ +From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 10 May 2016 08:47:05 -0700 +Subject: [PATCH] resolve restrict keyword conflict + +GCC detects that we call 'restrict' as param name in function +signatures and complains since both params are called 'restrict' +therefore we use __restrict to denote the C99 keywork + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gnulib/import/sys_time.in.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index d535a6a48b..7c34d5a1aa 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h +@@ -93,20 +93,20 @@ struct timeval + # define gettimeofday rpl_gettimeofday + # endif + _GL_FUNCDECL_RPL (gettimeofday, int, +- (struct timeval *restrict, void *restrict) ++ (struct timeval *__restrict, void *__restrict) + _GL_ARG_NONNULL ((1))); + _GL_CXXALIAS_RPL (gettimeofday, int, +- (struct timeval *restrict, void *restrict)); ++ (struct timeval *__restrict, void *__restrict)); + # else + # if !@HAVE_GETTIMEOFDAY@ + _GL_FUNCDECL_SYS (gettimeofday, int, +- (struct timeval *restrict, void *restrict) ++ (struct timeval *__restrict, void *__restrict) + _GL_ARG_NONNULL ((1))); + # endif + /* Need to cast, because on glibc systems, by default, the second argument is + struct timezone *. */ + _GL_CXXALIAS_SYS_CAST (gettimeofday, int, +- (struct timeval *restrict, void *restrict)); ++ (struct timeval *__restrict, void *__restrict)); + # endif + _GL_CXXALIASWARN (gettimeofday); + # if defined __cplusplus && defined GNULIB_NAMESPACE diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch new file mode 100644 index 000000000..5209c0027 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch @@ -0,0 +1,46 @@ +From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 +From: Yousong Zhou <yszhou4tech@gmail.com> +Date: Fri, 24 Mar 2017 10:36:03 +0800 +Subject: [PATCH] Fix invalid sigprocmask call +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The POSIX document says + + The pthread_sigmask() and sigprocmask() functions shall fail if: + + [EINVAL] + The value of the how argument is not equal to one of the defined values. + +and this is how musl-libc is currently doing. Fix the call to be safe +and correct + + [1] http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_sigmask.html + +gdb/ChangeLog: +2017-03-24 Yousong Zhou <yszhou4tech@gmail.com> + + * common/signals-state-save-restore.c (save_original_signals_state): + Fix invalid sigprocmask call. + +Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede-project.org/index.php?do=details&task_id=637&openedfrom=-1%2Bweek] +Signed-off-by: André Draszik <adraszik@tycoint.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gdb/gdbsupport/signals-state-save-restore.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c +index c292d498da..af9dcaeb08 100644 +--- a/gdb/gdbsupport/signals-state-save-restore.c ++++ b/gdb/gdbsupport/signals-state-save-restore.c +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) + int i; + int res; + +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); + if (res == -1) + perror_with_name (("sigprocmask")); + diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch new file mode 100644 index 000000000..eedd94c4d --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch @@ -0,0 +1,39 @@ +From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Nov 2018 18:00:23 -0800 +Subject: [PATCH] gdbserver ctrl-c handling + +This problem was created by the upstream commit 78708b7c8c +After applying the commit, it will send SIGINT to the process +group(-signal_pid). +But if we use gdbserver send SIGINT, and the attached process is not a +process +group leader, then the "kill (-signal_pid, SIGINT)" returns error and +fails to +interrupt the attached process. + +Upstream-Status: Submitted +[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] + +Author: Josh Gao +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gdb/gdbserver/linux-low.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c +index 4255795ea6..762f8bafb6 100644 +--- a/gdb/gdbserver/linux-low.c ++++ b/gdb/gdbserver/linux-low.c +@@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) + static void + linux_request_interrupt (void) + { +- /* Send a SIGINT to the process group. This acts just like the user +- typed a ^C on the controlling terminal. */ +- kill (-signal_pid, SIGINT); ++ kill (signal_pid, SIGINT); + } + + /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb_9.2.bb b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb_9.2.bb new file mode 100644 index 000000000..d70757a15 --- /dev/null +++ b/meta-xilinx/meta-microblaze/recipes-devtools/gdb/gdb_9.2.bb @@ -0,0 +1,28 @@ +require gdb.inc +require gdb-${PV}.inc + +inherit python3-dir + +EXTRA_OEMAKE_append_libc-musl = "\ + gt_cv_func_gnugettext1_libc=yes \ + gt_cv_func_gnugettext2_libc=yes \ + gl_cv_func_working_strerror=yes \ + gl_cv_func_strerror_0_works=yes \ + gl_cv_func_gettimeofday_clobber=no \ + " + +do_configure_prepend() { + if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then + cat > ${WORKDIR}/python << EOF +#!/bin/sh +case "\$2" in + --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;; + --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;; + --exec-prefix) echo "${exec_prefix}" ;; + *) exit 1 ;; +esac +exit 0 +EOF + chmod +x ${WORKDIR}/python + fi +} diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-native.inc b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-native.inc new file mode 100644 index 000000000..aa5c9b9a7 --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-native.inc @@ -0,0 +1,11 @@ +inherit native + +require qemu.inc + +EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" + +LDFLAGS_append = " -fuse-ld=bfd" + +do_install_append() { + ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} +} diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-targets.inc b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-targets.inc new file mode 100644 index 000000000..24f9a0394 --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-targets.inc @@ -0,0 +1,28 @@ +# possible arch values are: +# aarch64 arm armeb alpha cris i386 x86_64 m68k microblaze +# mips mipsel mips64 mips64el ppc ppc64 ppc64abi32 ppcemb +# riscv32 riscv64 sparc sparc32 sparc32plus + +def get_qemu_target_list(d): + import bb + archs = d.getVar('QEMU_TARGETS').split() + tos = d.getVar('HOST_OS') + softmmuonly = "" + for arch in ['ppcemb', 'lm32']: + if arch in archs: + softmmuonly += arch + "-softmmu," + archs.remove(arch) + linuxuseronly = "" + for arch in ['armeb', 'alpha', 'ppc64abi32', 'ppc64le', 'sparc32plus', 'aarch64_be']: + if arch in archs: + linuxuseronly += arch + "-linux-user," + archs.remove(arch) + if 'linux' not in tos: + return softmmuonly + ''.join([arch + "-softmmu" + "," for arch in archs]).rstrip(',') + return softmmuonly + linuxuseronly + ''.join([arch + "-linux-user" + "," + arch + "-softmmu" + "," for arch in archs]).rstrip(',') + +def get_qemu_usermode_target_list(d): + return ",".join(filter(lambda i: "-linux-user" in i, get_qemu_target_list(d).split(','))) + +def get_qemu_system_target_list(d): + return ",".join(filter(lambda i: "-linux-user" not in i, get_qemu_target_list(d).split(','))) diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc index a1dc5d662..d8f06c772 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc @@ -1,4 +1,4 @@ -require recipes-devtools/qemu/qemu-native.inc +require qemu-native.inc require qemu-xilinx.inc DEPENDS = "glib-2.0-native zlib-native" diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2020.2.bb b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2020.2.bb index 09f431eca..fd1904aba 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2020.2.bb +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2020.2.bb @@ -1,4 +1,4 @@ -require recipes-devtools/qemu/qemu.inc +require qemu.inc require qemu-xilinx.inc BBCLASSEXTEND = "nativesdk" diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu.inc b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu.inc new file mode 100644 index 000000000..4864d7e93 --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu.inc @@ -0,0 +1,197 @@ +SUMMARY = "Fast open source processor emulator" +DESCRIPTION = "QEMU is a hosted virtual machine monitor: it emulates the \ +machine's processor through dynamic binary translation and provides a set \ +of different hardware and device models for the machine, enabling it to run \ +a variety of guest operating systems" +HOMEPAGE = "http://qemu.org" +LICENSE = "GPLv2 & LGPLv2.1" + +RDEPENDS_${PN}-ptest = "bash make" + +require qemu-targets.inc +inherit pkgconfig ptest + +LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ + file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" + +SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ + file://powerpc_rom.bin \ + file://run-ptest \ + file://0001-qemu-Add-missing-wacom-HID-descriptor.patch \ + file://0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \ + file://0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ + file://0004-qemu-disable-Valgrind.patch \ + file://0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch \ + file://0006-chardev-connect-socket-to-a-spawned-command.patch \ + file://0007-apic-fixup-fallthrough-to-PIC.patch \ + file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ + file://0009-Fix-webkitgtk-builds.patch \ + file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ + file://0001-Add-enable-disable-udev.patch \ + file://0001-qemu-Do-not-include-file-if-not-exists.patch \ + file://find_datadir.patch \ + file://usb-fix-setup_len-init.patch \ + file://0001-target-mips-Increase-number-of-TLB-entries-on-the-34.patch \ + file://CVE-2020-24352.patch \ + file://CVE-2020-29129-CVE-2020-29130.patch \ + file://CVE-2020-25624.patch \ + file://CVE-2020-25723.patch \ + file://CVE-2020-28916.patch \ + " +UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" + +SRC_URI[sha256sum] = "c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5" + +COMPATIBLE_HOST_mipsarchn32 = "null" +COMPATIBLE_HOST_mipsarchn64 = "null" + +# Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html +# upstream states qemu doesn't work without optimization +DEBUG_BUILD = "0" + +do_install_append() { + # Prevent QA warnings about installed ${localstatedir}/run + if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi +} + +do_compile_ptest() { + make buildtest-TESTS +} + +do_install_ptest() { + cp -rL ${B}/tests ${D}${PTEST_PATH} + find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcod]" | xargs -i rm -rf {} + + cp ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests + # Don't check the file genreated by configure + sed -i -e '/wildcard config-host.mak/d' \ + -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include + sed -i -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ + ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env + sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash," ${D}${PTEST_PATH}/tests/data/acpi/disassemle-aml.sh +} + +# QEMU_TARGETS is overridable variable +QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc ppc64 ppc64le riscv32 riscv64 sh4 x86_64" + +EXTRA_OECONF = " \ + --prefix=${prefix} \ + --bindir=${bindir} \ + --includedir=${includedir} \ + --libdir=${libdir} \ + --mandir=${mandir} \ + --datadir=${datadir} \ + --docdir=${docdir}/${BPN} \ + --sysconfdir=${sysconfdir} \ + --libexecdir=${libexecdir} \ + --localstatedir=${localstatedir} \ + --with-confsuffix=/${BPN} \ + --disable-strip \ + --disable-werror \ + --extra-cflags='${CFLAGS}' \ + --extra-ldflags='${LDFLAGS}' \ + --with-git=/bin/false \ + --disable-git-update \ + ${PACKAGECONFIG_CONFARGS} \ + " + +export LIBTOOL="${HOST_SYS}-libtool" + +B = "${WORKDIR}/build" + +EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" + +do_configure_prepend_class-native() { + # Append build host pkg-config paths for native target since the host may provide sdl + BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") + if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then + export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH + fi +} + +do_configure() { + ${S}/configure ${EXTRA_OECONF} +} +do_configure[cleandirs] += "${B}" + +do_install () { + export STRIP="" + oe_runmake 'DESTDIR=${D}' install +} + +# The following fragment will create a wrapper for qemu-mips user emulation +# binary in order to work around a segmentation fault issue. Basically, by +# default, the reserved virtual address space for 32-on-64 bit is set to 4GB. +# This will trigger a MMU access fault in the virtual CPU. With this change, +# the qemu-mips works fine. +# IMPORTANT: This piece needs to be removed once the root cause is fixed! +do_install_append() { + if [ -e "${D}/${bindir}/qemu-mips" ]; then + create_wrapper ${D}/${bindir}/qemu-mips \ + QEMU_RESERVED_VA=0x0 + fi +} +# END of qemu-mips workaround + +make_qemu_wrapper() { + gdk_pixbuf_module_file=`pkg-config --variable=gdk_pixbuf_cache_file gdk-pixbuf-2.0` + + for tool in `ls ${D}${bindir}/qemu-system-*`; do + create_wrapper $tool \ + GDK_PIXBUF_MODULE_FILE=$gdk_pixbuf_module_file \ + FONTCONFIG_PATH=/etc/fonts \ + GTK_THEME=Adwaita + done +} + +# Disable kvm/virgl/mesa on targets that do not support it +PACKAGECONFIG_remove_darwin = "kvm virglrenderer glx gtk+" +PACKAGECONFIG_remove_mingw32 = "kvm virglrenderer glx gtk+" + +PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" +PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," +PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," +PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," +PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen-tools,xen-tools-libxenstore xen-tools-libxenctrl xen-tools-libxenguest" +PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl," +PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg," +PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng," +PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,curl," +PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss," +PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses," +PACKAGECONFIG[gtk+] = "--enable-gtk,--disable-gtk,gtk+3 gettext-native" +PACKAGECONFIG[vte] = "--enable-vte,--disable-vte,vte gettext-native" +PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng," +PACKAGECONFIG[ssh] = "--enable-libssh,--disable-libssh,libssh," +PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt," +PACKAGECONFIG[nettle] = "--enable-nettle,--disable-nettle,nettle" +PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" +PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc" +PACKAGECONFIG[alsa] = "--audio-drv-list='oss alsa',,alsa-lib" +PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/libgl" +PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo" +PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" +PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls" +PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" +PACKAGECONFIG[libiscsi] = "--enable-libiscsi,--disable-libiscsi" +PACKAGECONFIG[kvm] = "--enable-kvm,--disable-kvm" +PACKAGECONFIG[virglrenderer] = "--enable-virglrenderer,--disable-virglrenderer,virglrenderer" +# spice will be in meta-networking layer +PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice" +# usbredir will be in meta-networking layer +PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir" +PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy" +PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs,glusterfs" +PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" +PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,eudev" +PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2" +PACKAGECONFIG[attr] = "--enable-attr,--disable-attr,attr," +PACKAGECONFIG[rbd] = "--enable-rbd,--disable-rbd,ceph,ceph" +PACKAGECONFIG[vhost] = "--enable-vhost-net,--disable-vhost-net,," +PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust," +PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,," +PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" + +INSANE_SKIP_${PN} = "arch" + +FILES_${PN} += "${datadir}/icons" diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch new file mode 100644 index 000000000..1304ee3bf --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch @@ -0,0 +1,29 @@ +From b921e5204030845dc7c9d16d5f66d965e8d05367 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman <jpuhlman@mvista.com> +Date: Thu, 19 Mar 2020 11:54:26 -0700 +Subject: [PATCH] Add enable/disable libudev + +Upstream-Status: Pending +Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> + +[update patch context] +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + configure | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: qemu-5.1.0/configure +=================================================================== +--- qemu-5.1.0.orig/configure ++++ qemu-5.1.0/configure +@@ -1640,6 +1640,10 @@ for opt do + ;; + --disable-libdaxctl) libdaxctl=no + ;; ++ --enable-libudev) libudev="yes" ++ ;; ++ --disable-libudev) libudev="no" ++ ;; + *) + echo "ERROR: unknown option $opt" + echo "Try '$0 --help' for more information" diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch new file mode 100644 index 000000000..46c9da08a --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch @@ -0,0 +1,141 @@ +From 883feb43129dc39b491e492c7ccfe89aefe53c44 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Thu, 27 Nov 2014 14:04:29 +0000 +Subject: [PATCH] qemu: Add missing wacom HID descriptor + +The USB wacom device is missing a HID descriptor which causes it +to fail to operate with recent kernels (e.g. 3.17). + +This patch adds a HID desriptor to the device, based upon one from +real wcom device. + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Upstream-Status: Submitted +2014/11/27 + +[update patch context] +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + hw/usb/dev-wacom.c | 94 +++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 93 insertions(+), 1 deletion(-) + +Index: qemu-5.1.0/hw/usb/dev-wacom.c +=================================================================== +--- qemu-5.1.0.orig/hw/usb/dev-wacom.c ++++ qemu-5.1.0/hw/usb/dev-wacom.c +@@ -74,6 +74,89 @@ static const USBDescStrings desc_strings + [STR_SERIALNUMBER] = "1", + }; + ++static const uint8_t qemu_tablet_hid_report_descriptor[] = { ++ 0x05, 0x01, /* Usage Page (Generic Desktop) */ ++ 0x09, 0x02, /* Usage (Mouse) */ ++ 0xa1, 0x01, /* Collection (Application) */ ++ 0x85, 0x01, /* Report ID (1) */ ++ 0x09, 0x01, /* Usage (Pointer) */ ++ 0xa1, 0x00, /* Collection (Physical) */ ++ 0x05, 0x09, /* Usage Page (Button) */ ++ 0x19, 0x01, /* Usage Minimum (1) */ ++ 0x29, 0x05, /* Usage Maximum (5) */ ++ 0x15, 0x00, /* Logical Minimum (0) */ ++ 0x25, 0x01, /* Logical Maximum (1) */ ++ 0x95, 0x05, /* Report Count (5) */ ++ 0x75, 0x01, /* Report Size (1) */ ++ 0x81, 0x02, /* Input (Data, Variable, Absolute) */ ++ 0x95, 0x01, /* Report Count (1) */ ++ 0x75, 0x03, /* Report Size (3) */ ++ 0x81, 0x01, /* Input (Constant) */ ++ 0x05, 0x01, /* Usage Page (Generic Desktop) */ ++ 0x09, 0x30, /* Usage (X) */ ++ 0x09, 0x31, /* Usage (Y) */ ++ 0x15, 0x81, /* Logical Minimum (-127) */ ++ 0x25, 0x7f, /* Logical Maximum (127) */ ++ 0x75, 0x08, /* Report Size (8) */ ++ 0x95, 0x02, /* Report Count (2) */ ++ 0x81, 0x06, /* Input (Data, Variable, Relative) */ ++ 0xc0, /* End Collection */ ++ 0xc0, /* End Collection */ ++ 0x05, 0x0d, /* Usage Page (Digitizer) */ ++ 0x09, 0x01, /* Usage (Digitizer) */ ++ 0xa1, 0x01, /* Collection (Application) */ ++ 0x85, 0x02, /* Report ID (2) */ ++ 0xa1, 0x00, /* Collection (Physical) */ ++ 0x06, 0x00, 0xff, /* Usage Page (Vendor 0xff00) */ ++ 0x09, 0x01, /* Usage (Digitizer) */ ++ 0x15, 0x00, /* Logical Minimum (0) */ ++ 0x26, 0xff, 0x00, /* Logical Maximum (255) */ ++ 0x75, 0x08, /* Report Size (8) */ ++ 0x95, 0x08, /* Report Count (8) */ ++ 0x81, 0x02, /* Input (Data, Variable, Absolute) */ ++ 0xc0, /* End Collection */ ++ 0x09, 0x01, /* Usage (Digitizer) */ ++ 0x85, 0x02, /* Report ID (2) */ ++ 0x95, 0x01, /* Report Count (1) */ ++ 0xb1, 0x02, /* FEATURE (2) */ ++ 0xc0, /* End Collection */ ++ 0x06, 0x00, 0xff, /* Usage Page (Vendor 0xff00) */ ++ 0x09, 0x01, /* Usage (Digitizer) */ ++ 0xa1, 0x01, /* Collection (Application) */ ++ 0x85, 0x02, /* Report ID (2) */ ++ 0x05, 0x0d, /* Usage Page (Digitizer) */ ++ 0x09, 0x22, /* Usage (Finger) */ ++ 0xa1, 0x00, /* Collection (Physical) */ ++ 0x06, 0x00, 0xff, /* Usage Page (Vendor 0xff00) */ ++ 0x09, 0x01, /* Usage (Digitizer) */ ++ 0x15, 0x00, /* Logical Minimum (0) */ ++ 0x26, 0xff, 0x00, /* Logical Maximum */ ++ 0x75, 0x08, /* Report Size (8) */ ++ 0x95, 0x02, /* Report Count (2) */ ++ 0x81, 0x02, /* Input (Data, Variable, Absolute) */ ++ 0x05, 0x01, /* Usage Page (Generic Desktop) */ ++ 0x09, 0x30, /* Usage (X) */ ++ 0x35, 0x00, /* Physical Minimum */ ++ 0x46, 0xe0, 0x2e, /* Physical Maximum */ ++ 0x26, 0xe0, 0x01, /* Logical Maximum */ ++ 0x75, 0x10, /* Report Size (16) */ ++ 0x95, 0x01, /* Report Count (1) */ ++ 0x81, 0x02, /* Input (Data, Variable, Absolute) */ ++ 0x09, 0x31, /* Usage (Y) */ ++ 0x46, 0x40, 0x1f, /* Physical Maximum */ ++ 0x26, 0x40, 0x01, /* Logical Maximum */ ++ 0x81, 0x02, /* Input (Data, Variable, Absolute) */ ++ 0x06, 0x00, 0xff, /* Usage Page (Vendor 0xff00) */ ++ 0x09, 0x01, /* Usage (Digitizer) */ ++ 0x26, 0xff, 0x00, /* Logical Maximum */ ++ 0x75, 0x08, /* Report Size (8) */ ++ 0x95, 0x0d, /* Report Count (13) */ ++ 0x81, 0x02, /* Input (Data, Variable, Absolute) */ ++ 0xc0, /* End Collection */ ++ 0xc0, /* End Collection */ ++}; ++ ++ + static const USBDescIface desc_iface_wacom = { + .bInterfaceNumber = 0, + .bNumEndpoints = 1, +@@ -91,7 +174,7 @@ static const USBDescIface desc_iface_wac + 0x00, /* u8 country_code */ + 0x01, /* u8 num_descriptors */ + 0x22, /* u8 type: Report */ +- 0x6e, 0, /* u16 len */ ++ sizeof(qemu_tablet_hid_report_descriptor), 0, /* u16 len */ + }, + }, + }, +@@ -271,6 +354,15 @@ static void usb_wacom_handle_control(USB + } + + switch (request) { ++ case InterfaceRequest | USB_REQ_GET_DESCRIPTOR: ++ switch (value >> 8) { ++ case 0x22: ++ memcpy(data, qemu_tablet_hid_report_descriptor, ++ sizeof(qemu_tablet_hid_report_descriptor)); ++ p->actual_length = sizeof(qemu_tablet_hid_report_descriptor); ++ break; ++ } ++ break; + case WACOM_SET_REPORT: + if (s->mouse_grabbed) { + qemu_remove_mouse_event_handler(s->eh_entry); diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch new file mode 100644 index 000000000..d6c0f9ebe --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch @@ -0,0 +1,31 @@ +From 34247f83095f8cdcdc1f9d7f0c6ffbd46b25d979 Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Wed, 25 Mar 2020 21:21:35 +0200 +Subject: [PATCH] qemu: Do not include file if not exists + +Script configure checks for if_alg.h and check failed but +if_alg.h still included. + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2020-03/msg07188.html] +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> + +[update patch context] +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + linux-user/syscall.c | 2 ++ + 1 file changed, 2 insertions(+) + +Index: qemu-5.1.0/linux-user/syscall.c +=================================================================== +--- qemu-5.1.0.orig/linux-user/syscall.c ++++ qemu-5.1.0/linux-user/syscall.c +@@ -109,7 +109,9 @@ + #include <linux/blkpg.h> + #include <netpacket/packet.h> + #include <linux/netlink.h> ++#if defined(CONFIG_AF_ALG) + #include <linux/if_alg.h> ++#endif + #include <linux/rtc.h> + #include <sound/asound.h> + #ifdef HAVE_DRM_H diff --git a/poky/meta/recipes-devtools/qemu/qemu/0001-target-mips-Increase-number-of-TLB-entries-on-the-34.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0001-target-mips-Increase-number-of-TLB-entries-on-the-34.patch index 5227b7cbd..5227b7cbd 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0001-target-mips-Increase-number-of-TLB-entries-on-the-34.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0001-target-mips-Increase-number-of-TLB-entries-on-the-34.patch diff --git a/poky/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch index f379948f1..f379948f1 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch new file mode 100644 index 000000000..33cef4221 --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -0,0 +1,33 @@ +From ce1eceab2350d27960ec254650717085f6a11c9a Mon Sep 17 00:00:00 2001 +From: Jason Wessel <jason.wessel@windriver.com> +Date: Fri, 28 Mar 2014 17:42:43 +0800 +Subject: [PATCH] qemu: Add addition environment space to boot loader + qemu-system-mips + +Upstream-Status: Inappropriate - OE uses deep paths + +If you create a project with very long directory names like 128 characters +deep and use NFS, the kernel arguments will be truncated. The kernel will +accept longer strings such as 1024 bytes, but the qemu boot loader defaulted +to only 256 bytes. This patch expands the limit. + +Signed-off-by: Jason Wessel <jason.wessel@windriver.com> +Signed-off-by: Roy Li <rongqing.li@windriver.com> + +--- + hw/mips/malta.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: qemu-5.1.0/hw/mips/malta.c +=================================================================== +--- qemu-5.1.0.orig/hw/mips/malta.c ++++ qemu-5.1.0/hw/mips/malta.c +@@ -59,7 +59,7 @@ + + #define ENVP_ADDR 0x80002000l + #define ENVP_NB_ENTRIES 16 +-#define ENVP_ENTRY_SIZE 256 ++#define ENVP_ENTRY_SIZE 1024 + + /* Hardware addresses */ + #define FLASH_ADDRESS 0x1e000000ULL diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch new file mode 100644 index 000000000..71f537f9b --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch @@ -0,0 +1,34 @@ +From 4127296bb1046cdf73994ba69dc913d8c02fd74f Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Tue, 20 Oct 2015 22:19:08 +0100 +Subject: [PATCH] qemu: disable Valgrind + +There isn't an option to enable or disable valgrind support, so disable it to avoid non-deterministic builds. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@intel.com> + +--- + configure | 9 --------- + 1 file changed, 9 deletions(-) + +Index: qemu-5.1.0/configure +=================================================================== +--- qemu-5.1.0.orig/configure ++++ qemu-5.1.0/configure +@@ -5751,15 +5751,6 @@ fi + # check if we have valgrind/valgrind.h + + valgrind_h=no +-cat > $TMPC << EOF +-#include <valgrind/valgrind.h> +-int main(void) { +- return 0; +-} +-EOF +-if compile_prog "" "" ; then +- valgrind_h=yes +-fi + + ######################################## + # check if environ is declared diff --git a/poky/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch index 02ebbee1a..02ebbee1a 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch new file mode 100644 index 000000000..98fd5e913 --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch @@ -0,0 +1,241 @@ +From bcc63f775e265df69963a4ad7805b8678ace68f0 Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@xilinx.com> +Date: Thu, 21 Dec 2017 11:35:16 -0800 +Subject: [PATCH] chardev: connect socket to a spawned command + +The command is started in a shell (sh -c) with stdin connect to QEMU +via a Unix domain stream socket. QEMU then exchanges data via its own +end of the socket, just like it normally does. + +"-chardev socket" supports some ways of connecting via protocols like +telnet, but that is only a subset of the functionality supported by +tools socat. To use socat instead, for example to connect via a socks +proxy, use: + + -chardev 'socket,id=socat,cmd=exec socat FD:0 SOCKS4A:socks-proxy.localdomain:example.com:9999,,socksuser=nobody' \ + -device usb-serial,chardev=socat + +Beware that commas in the command must be escaped as double commas. + +Or interactively in the console: + (qemu) chardev-add socket,id=cat,cmd=cat + (qemu) device_add usb-serial,chardev=cat + ^ac + # cat >/dev/ttyUSB0 + hello + hello + +Another usage is starting swtpm from inside QEMU. swtpm will +automatically shut down once it looses the connection to the parent +QEMU, so there is no risk of lingering processes: + + -chardev 'socket,id=chrtpm0,cmd=exec swtpm socket --terminate --ctrl type=unixio,,clientfd=0 --tpmstate dir=... --log file=swtpm.log' \ + -tpmdev emulator,id=tpm0,chardev=chrtpm0 \ + -device tpm-tis,tpmdev=tpm0 + +The patch was discussed upstream, but QEMU developers believe that the +code calling QEMU should be responsible for managing additional +processes. In OE-core, that would imply enhancing runqemu and +oeqa. This patch is a simpler solution. + +Because it is not going upstream, the patch was written so that it is +as simple as possible. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> + +--- + chardev/char-socket.c | 101 ++++++++++++++++++++++++++++++++++++++++++ + chardev/char.c | 3 ++ + qapi/char.json | 5 +++ + 3 files changed, 109 insertions(+) + +Index: qemu-5.1.0/chardev/char-socket.c +=================================================================== +--- qemu-5.1.0.orig/chardev/char-socket.c ++++ qemu-5.1.0/chardev/char-socket.c +@@ -1292,6 +1292,67 @@ static bool qmp_chardev_validate_socket( + return true; + } + ++#ifndef _WIN32 ++static void chardev_open_socket_cmd(Chardev *chr, ++ const char *cmd, ++ Error **errp) ++{ ++ int fds[2] = { -1, -1 }; ++ QIOChannelSocket *sioc = NULL; ++ pid_t pid = -1; ++ const char *argv[] = { "/bin/sh", "-c", cmd, NULL }; ++ ++ /* ++ * We need a Unix domain socket for commands like swtpm and a single ++ * connection, therefore we cannot use qio_channel_command_new_spawn() ++ * without patching it first. Duplicating the functionality is easier. ++ */ ++ if (socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0, fds)) { ++ error_setg_errno(errp, errno, "Error creating socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC)"); ++ goto error; ++ } ++ ++ pid = qemu_fork(errp); ++ if (pid < 0) { ++ goto error; ++ } ++ ++ if (!pid) { ++ /* child */ ++ dup2(fds[1], STDIN_FILENO); ++ execv(argv[0], (char * const *)argv); ++ _exit(1); ++ } ++ ++ /* ++ * Hand over our end of the socket pair to the qio channel. ++ * ++ * We don't reap the child because it is expected to keep ++ * running. We also don't support the "reconnect" option for the ++ * same reason. ++ */ ++ sioc = qio_channel_socket_new_fd(fds[0], errp); ++ if (!sioc) { ++ goto error; ++ } ++ fds[0] = -1; ++ ++ g_free(chr->filename); ++ chr->filename = g_strdup_printf("cmd:%s", cmd); ++ tcp_chr_new_client(chr, sioc); ++ ++ error: ++ if (fds[0] >= 0) { ++ close(fds[0]); ++ } ++ if (fds[1] >= 0) { ++ close(fds[1]); ++ } ++ if (sioc) { ++ object_unref(OBJECT(sioc)); ++ } ++} ++#endif + + static void qmp_chardev_open_socket(Chardev *chr, + ChardevBackend *backend, +@@ -1300,6 +1361,9 @@ static void qmp_chardev_open_socket(Char + { + SocketChardev *s = SOCKET_CHARDEV(chr); + ChardevSocket *sock = backend->u.socket.data; ++#ifndef _WIN32 ++ const char *cmd = sock->cmd; ++#endif + bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; + bool is_listen = sock->has_server ? sock->server : true; + bool is_telnet = sock->has_telnet ? sock->telnet : false; +@@ -1365,6 +1429,14 @@ static void qmp_chardev_open_socket(Char + + update_disconnected_filename(s); + ++#ifndef _WIN32 ++ if (cmd) { ++ chardev_open_socket_cmd(chr, cmd, errp); ++ ++ /* everything ready (or failed permanently) before we return */ ++ *be_opened = true; ++ } else ++#endif + if (s->is_listen) { + if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, + is_waitconnect, errp) < 0) { +@@ -1384,11 +1456,27 @@ static void qemu_chr_parse_socket(QemuOp + const char *host = qemu_opt_get(opts, "host"); + const char *port = qemu_opt_get(opts, "port"); + const char *fd = qemu_opt_get(opts, "fd"); ++#ifndef _WIN32 ++ const char *cmd = qemu_opt_get(opts, "cmd"); ++#endif + bool tight = qemu_opt_get_bool(opts, "tight", true); + bool abstract = qemu_opt_get_bool(opts, "abstract", false); + SocketAddressLegacy *addr; + ChardevSocket *sock; + ++#ifndef _WIN32 ++ if (cmd) { ++ /* ++ * Here we have to ensure that no options are set which are incompatible with ++ * spawning a command, otherwise unmodified code that doesn't know about ++ * command spawning (like socket_reconnect_timeout()) might get called. ++ */ ++ if (path || sock->server || sock->has_telnet || sock->has_tn3270 || sock->reconnect || host || port || sock->tls_creds) { ++ error_setg(errp, "chardev: socket: cmd does not support any additional options"); ++ return; ++ } ++ } else ++#endif + if ((!!path + !!fd + !!host) != 1) { + error_setg(errp, + "Exactly one of 'path', 'fd' or 'host' required"); +@@ -1431,12 +1519,24 @@ static void qemu_chr_parse_socket(QemuOp + sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); + sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); + +- addr = g_new0(SocketAddressLegacy, 1); ++#ifndef _WIN32 ++ sock->cmd = g_strdup(cmd); ++#endif ++ ++ addr = g_new0(SocketAddressLegacy, 1); ++#ifndef _WIN32 ++ if (path || cmd) { ++#else + if (path) { ++#endif + UnixSocketAddress *q_unix; + addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX; + q_unix = addr->u.q_unix.data = g_new0(UnixSocketAddress, 1); ++#ifndef _WIN32 ++ q_unix->path = cmd ? g_strdup_printf("cmd:%s", cmd) : g_strdup(path); ++#else + q_unix->path = g_strdup(path); ++#endif + q_unix->tight = tight; + q_unix->abstract = abstract; + } else if (host) { +Index: qemu-5.1.0/chardev/char.c +=================================================================== +--- qemu-5.1.0.orig/chardev/char.c ++++ qemu-5.1.0/chardev/char.c +@@ -826,6 +826,9 @@ QemuOptsList qemu_chardev_opts = { + .name = "path", + .type = QEMU_OPT_STRING, + },{ ++ .name = "cmd", ++ .type = QEMU_OPT_STRING, ++ },{ + .name = "host", + .type = QEMU_OPT_STRING, + },{ +Index: qemu-5.1.0/qapi/char.json +=================================================================== +--- qemu-5.1.0.orig/qapi/char.json ++++ qemu-5.1.0/qapi/char.json +@@ -250,6 +250,10 @@ + # + # @addr: socket address to listen on (server=true) + # or connect to (server=false) ++# @cmd: command to run via "sh -c" with stdin as one end of ++# a AF_UNIX SOCK_DSTREAM socket pair. The other end ++# is used by the chardev. Either an addr or a cmd can ++# be specified, but not both. + # @tls-creds: the ID of the TLS credentials object (since 2.6) + # @tls-authz: the ID of the QAuthZ authorization object against which + # the client's x509 distinguished name will be validated. This +@@ -276,6 +280,7 @@ + ## + { 'struct': 'ChardevSocket', + 'data': { 'addr': 'SocketAddressLegacy', ++ '*cmd': 'str', + '*tls-creds': 'str', + '*tls-authz' : 'str', + '*server': 'bool', diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch new file mode 100644 index 000000000..034ac5782 --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch @@ -0,0 +1,44 @@ +From a59a98d100123030a4145e7efe3b8a001920a9f1 Mon Sep 17 00:00:00 2001 +From: Mark Asselstine <mark.asselstine@windriver.com> +Date: Tue, 26 Feb 2013 11:43:28 -0500 +Subject: [PATCH] apic: fixup fallthrough to PIC + +Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC +interrupts through the local APIC if the local APIC config says so.] +missed a check to ensure the local APIC is enabled. Since if the local +APIC is disabled it doesn't matter what the local APIC config says. + +If this check isn't done and the guest has disabled the local APIC the +guest will receive a general protection fault, similar to what is seen +here: + +https://lists.gnu.org/archive/html/qemu-devel/2012-12/msg02304.html + +The GPF is caused by an attempt to service interrupt 0xffffffff. This +comes about since cpu_get_pic_interrupt() calls apic_accept_pic_intr() +(with the local APIC disabled apic_get_interrupt() returns -1). +apic_accept_pic_intr() returns 0 and thus the interrupt number which +is returned from cpu_get_pic_interrupt(), and which is attempted to be +serviced, is -1. + +Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg00878.html] +Signed-off-by: He Zhe <zhe.he@windriver.com> + +--- + hw/intc/apic.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: qemu-5.1.0/hw/intc/apic.c +=================================================================== +--- qemu-5.1.0.orig/hw/intc/apic.c ++++ qemu-5.1.0/hw/intc/apic.c +@@ -603,7 +603,7 @@ int apic_accept_pic_intr(DeviceState *de + APICCommonState *s = APIC(dev); + uint32_t lvt0; + +- if (!s) ++ if (!s || !(s->spurious_vec & APIC_SV_ENABLE)) + return -1; + + lvt0 = s->lvt[APIC_LVT_LINT0]; diff --git a/poky/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch index d20f04ee5..d20f04ee5 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch diff --git a/poky/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch index f2a44986b..f2a44986b 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch new file mode 100644 index 000000000..d7e3fffdd --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -0,0 +1,91 @@ +From c207607cdf3996ad9783c3bffbcd3d65e74c0158 Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Wed, 28 Aug 2019 19:56:28 +0800 +Subject: [PATCH] configure: Add pkg-config handling for libgcrypt + +libgcrypt may also be controlled by pkg-config, this patch adds pkg-config +handling for libgcrypt. + +Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] + +Signed-off-by: He Zhe <zhe.he@windriver.com> + +--- + configure | 48 ++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 40 insertions(+), 8 deletions(-) + +Index: qemu-5.1.0/configure +=================================================================== +--- qemu-5.1.0.orig/configure ++++ qemu-5.1.0/configure +@@ -3084,6 +3084,30 @@ has_libgcrypt() { + return 0 + } + ++has_libgcrypt_pkgconfig() { ++ if ! has $pkg_config ; then ++ return 1 ++ fi ++ ++ if ! $pkg_config --list-all | grep libgcrypt > /dev/null 2>&1 ; then ++ return 1 ++ fi ++ ++ if test -n "$cross_prefix" ; then ++ host=$($pkg_config --variable=host libgcrypt) ++ if test "${host%-gnu}-" != "${cross_prefix%-gnu}" ; then ++ print_error "host($host) does not match cross_prefix($cross_prefix)" ++ return 1 ++ fi ++ fi ++ ++ if ! $pkg_config --atleast-version=1.5.0 libgcrypt ; then ++ print_error "libgcrypt version is $($pkg_config --modversion libgcrypt)" ++ return 1 ++ fi ++ ++ return 0 ++} + + if test "$nettle" != "no"; then + pass="no" +@@ -3124,7 +3148,14 @@ fi + + if test "$gcrypt" != "no"; then + pass="no" +- if has_libgcrypt; then ++ if has_libgcrypt_pkgconfig; then ++ gcrypt_cflags=$($pkg_config --cflags libgcrypt) ++ if test "$static" = "yes" ; then ++ gcrypt_libs=$($pkg_config --libs --static libgcrypt) ++ else ++ gcrypt_libs=$($pkg_config --libs libgcrypt) ++ fi ++ elif has_libgcrypt; then + gcrypt_cflags=$(libgcrypt-config --cflags) + gcrypt_libs=$(libgcrypt-config --libs) + # Debian has removed -lgpg-error from libgcrypt-config +@@ -3134,15 +3165,16 @@ if test "$gcrypt" != "no"; then + then + gcrypt_libs="$gcrypt_libs -lgpg-error" + fi ++ fi + +- # Link test to make sure the given libraries work (e.g for static). +- write_c_skeleton +- if compile_prog "" "$gcrypt_libs" ; then +- LIBS="$gcrypt_libs $LIBS" +- QEMU_CFLAGS="$QEMU_CFLAGS $gcrypt_cflags" +- pass="yes" +- fi ++ # Link test to make sure the given libraries work (e.g for static). ++ write_c_skeleton ++ if compile_prog "" "$gcrypt_libs" ; then ++ LIBS="$gcrypt_libs $LIBS" ++ QEMU_CFLAGS="$QEMU_CFLAGS $gcrypt_cflags" ++ pass="yes" + fi ++ + if test "$pass" = "yes"; then + gcrypt="yes" + cat > $TMPC << EOF diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-24352.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/CVE-2020-24352.patch index 861ff6c3b..861ff6c3b 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-24352.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/CVE-2020-24352.patch diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-25624.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/CVE-2020-25624.patch index 7631bab39..7631bab39 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-25624.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/CVE-2020-25624.patch diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-25723.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/CVE-2020-25723.patch index 90b3a2f41..90b3a2f41 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-25723.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/CVE-2020-25723.patch diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/CVE-2020-28916.patch index 521219683..521219683 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/CVE-2020-28916.patch diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-29129-CVE-2020-29130.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/CVE-2020-29129-CVE-2020-29130.patch index e5829f6da..e5829f6da 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-29129-CVE-2020-29130.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/CVE-2020-29129-CVE-2020-29130.patch diff --git a/poky/meta/recipes-devtools/qemu/qemu/find_datadir.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/find_datadir.patch index 9a4c11267..9a4c11267 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/find_datadir.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/find_datadir.patch diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/powerpc_rom.bin b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/powerpc_rom.bin Binary files differnew file mode 100644 index 000000000..c4044296c --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/powerpc_rom.bin diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/run-ptest b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/run-ptest new file mode 100644 index 000000000..b25a792d4 --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh +# +#This script is used to run qemu test suites +# + +ptestdir=$(dirname "$(readlink -f "$0")") +export SRC_PATH=$ptestdir + +cd $ptestdir/tests +make -f Makefile.include -k runtest-TESTS | sed '/^ok /s/ok /PASS: /g' diff --git a/poky/meta/recipes-devtools/qemu/qemu/usb-fix-setup_len-init.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/usb-fix-setup_len-init.patch index 92801da46..92801da46 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/usb-fix-setup_len-init.patch +++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/qemu/usb-fix-setup_len-init.patch diff --git a/meta-xilinx/meta-xilinx-standalone/conf/layer.conf b/meta-xilinx/meta-xilinx-standalone/conf/layer.conf index cef1039ef..de1acee80 100644 --- a/meta-xilinx/meta-xilinx-standalone/conf/layer.conf +++ b/meta-xilinx/meta-xilinx-standalone/conf/layer.conf @@ -13,6 +13,7 @@ BBFILE_PATTERN_xilinx-standalone = "^${LAYERDIR}/" BBFILE_PRIORITY_xilinx-standalone = "7" LAYERDEPENDS_xilinx-standalone = "core xilinx" +LAYERRECOMMENDS_xilinx-standalone = "xilinx-microblaze" LAYERSERIES_COMPAT_xilinx-standalone = "dunfell gatesgarth" XILINX_RELEASE_VERSION = "v2020.2" diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend index 646d0e9a9..646d0e9a9 100644 --- a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend +++ b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend index 90522cfbc..90522cfbc 100644 --- a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend +++ b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend index e1876700f..d3abc611b 100644 --- a/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend +++ b/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend @@ -5,3 +5,11 @@ FILESEXTRAPATHS_append_microblaze_xilinx-standalone := ":${THISDIR}/gcc-10" SRC_URI_append_microblaze_xilinx-standalone = " \ file://additional-microblaze-multilibs.patch \ " + +CHECK_FOR_MICROBLAZE_microblaze = "1" + +python() { + if d.getVar('CHECK_FOR_MICROBLAZE') == '1': + if 'xilinx-microblaze' not in d.getVar('BBFILE_COLLECTIONS').split(): + bb.fatal('You must include the meta-microblaze layer to build for this configuration.') +} diff --git a/poky/bitbake/bin/bitbake b/poky/bitbake/bin/bitbake index 22e826e15..bc762bfc1 100755 --- a/poky/bitbake/bin/bitbake +++ b/poky/bitbake/bin/bitbake @@ -26,7 +26,7 @@ from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException if sys.getfilesystemencoding() != "utf-8": sys.exit("Please use a locale setting which supports UTF-8 (such as LANG=en_US.UTF-8).\nPython can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.") -__version__ = "1.49.0" +__version__ = "1.49.2" if __name__ == "__main__": if __version__ != bb.__version__: diff --git a/poky/bitbake/bin/bitbake-hashclient b/poky/bitbake/bin/bitbake-hashclient index 29ab65f17..a89290217 100755 --- a/poky/bitbake/bin/bitbake-hashclient +++ b/poky/bitbake/bin/bitbake-hashclient @@ -151,9 +151,6 @@ def main(): func = getattr(args, 'func', None) if func: client = hashserv.create_client(args.address) - # Try to establish a connection to the server now to detect failures - # early - client.connect() return func(args, client) diff --git a/poky/bitbake/bin/bitbake-hashserv b/poky/bitbake/bin/bitbake-hashserv index 1bc1f91f3..153f65a37 100755 --- a/poky/bitbake/bin/bitbake-hashserv +++ b/poky/bitbake/bin/bitbake-hashserv @@ -30,9 +30,11 @@ def main(): "--bind [::1]:8686"''' ) - parser.add_argument('--bind', default=DEFAULT_BIND, help='Bind address (default "%(default)s")') - parser.add_argument('--database', default='./hashserv.db', help='Database file (default "%(default)s")') - parser.add_argument('--log', default='WARNING', help='Set logging level') + parser.add_argument('-b', '--bind', default=DEFAULT_BIND, help='Bind address (default "%(default)s")') + parser.add_argument('-d', '--database', default='./hashserv.db', help='Database file (default "%(default)s")') + parser.add_argument('-l', '--log', default='WARNING', help='Set logging level') + parser.add_argument('-u', '--upstream', help='Upstream hashserv to pull hashes from') + parser.add_argument('-r', '--read-only', action='store_true', help='Disallow write operations from clients') args = parser.parse_args() @@ -47,7 +49,7 @@ def main(): console.setLevel(level) logger.addHandler(console) - server = hashserv.create_server(args.bind, args.database) + server = hashserv.create_server(args.bind, args.database, upstream=args.upstream, read_only=args.read_only) server.serve_forever() return 0 diff --git a/poky/bitbake/bin/bitbake-worker b/poky/bitbake/bin/bitbake-worker index 9334f11fb..7765b9368 100755 --- a/poky/bitbake/bin/bitbake-worker +++ b/poky/bitbake/bin/bitbake-worker @@ -118,7 +118,9 @@ def worker_child_fire(event, d): data = b"<event>" + pickle.dumps(event) + b"</event>" try: worker_pipe_lock.acquire() - worker_pipe.write(data) + while(len(data)): + written = worker_pipe.write(data) + data = data[written:] worker_pipe_lock.release() except IOError: sigterm_handler(None, None) @@ -148,11 +150,15 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, taskha taskdep = workerdata["taskdeps"][fn] if 'umask' in taskdep and taskname in taskdep['umask']: + umask = taskdep['umask'][taskname] + elif workerdata["umask"]: + umask = workerdata["umask"] + if umask: # umask might come in as a number or text string.. try: - umask = int(taskdep['umask'][taskname],8) + umask = int(umask, 8) except TypeError: - umask = taskdep['umask'][taskname] + pass dry_run = cfg.dry_run or dry_run_exec @@ -167,7 +173,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, taskha fakedirs = (workerdata["fakerootdirs"][fn] or "").split() for p in fakedirs: bb.utils.mkdirhier(p) - logger.debug(2, 'Running %s:%s under fakeroot, fakedirs: %s' % + logger.debug2('Running %s:%s under fakeroot, fakedirs: %s' % (fn, taskname, ', '.join(fakedirs))) else: envvars = (workerdata["fakerootnoenv"][fn] or "").split() @@ -321,7 +327,9 @@ class runQueueWorkerPipe(): end = len(self.queue) index = self.queue.find(b"</event>") while index != -1: - worker_fire_prepickled(self.queue[:index+8]) + msg = self.queue[:index+8] + assert msg.startswith(b"<event>") and msg.count(b"<event>") == 1 + worker_fire_prepickled(msg) self.queue = self.queue[index+8:] index = self.queue.find(b"</event>") return (end > start) diff --git a/poky/bitbake/contrib/hashserv/Dockerfile b/poky/bitbake/contrib/hashserv/Dockerfile new file mode 100644 index 000000000..d6fc728f3 --- /dev/null +++ b/poky/bitbake/contrib/hashserv/Dockerfile @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2021 Joshua Watt <JPEWhacker@gmail.com> +# +# Dockerfile to build a bitbake hash equivalence server container +# +# From the root of the bitbake repository, run: +# +# docker build -f contrib/hashserv/Dockerfile . +# + +FROM alpine:3.13.1 + +RUN apk add --no-cache python3 + +COPY bin/bitbake-hashserv /opt/bbhashserv/bin/ +COPY lib/hashserv /opt/bbhashserv/lib/hashserv/ + +ENTRYPOINT ["/opt/bbhashserv/bin/bitbake-hashserv"] diff --git a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst index 74a3eb809..6469f9d1a 100644 --- a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst +++ b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst @@ -108,6 +108,10 @@ overview of their function and contents. command line option). The task name specified should not include the ``do_`` prefix. + :term:`BB_DEFAULT_UMASK` + The default umask to apply to tasks if specified and no task specific + umask flag is set. + :term:`BB_DISKMON_DIRS` Monitors disk space and available inodes during the build and allows you to control the build based on these parameters. diff --git a/poky/bitbake/lib/bb/__init__.py b/poky/bitbake/lib/bb/__init__.py index b21773734..84a9051c1 100644 --- a/poky/bitbake/lib/bb/__init__.py +++ b/poky/bitbake/lib/bb/__init__.py @@ -9,7 +9,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -__version__ = "1.49.0" +__version__ = "1.49.2" import sys if sys.version_info < (3, 5, 0): @@ -21,8 +21,8 @@ class BBHandledException(Exception): The big dilemma for generic bitbake code is what information to give the user when an exception occurs. Any exception inheriting this base exception class has already provided information to the user via some 'fired' message type such as - an explicitly fired event using bb.fire, or a bb.error message. If bitbake - encounters an exception derived from this class, no backtrace or other information + an explicitly fired event using bb.fire, or a bb.error message. If bitbake + encounters an exception derived from this class, no backtrace or other information will be given to the user, its assumed the earlier event provided the relevant information. """ pass @@ -42,7 +42,16 @@ class BBLoggerMixin(object): def setup_bblogger(self, name): if name.split(".")[0] == "BitBake": - self.debug = self.bbdebug + self.debug = self._debug_helper + + def _debug_helper(self, *args, **kwargs): + return self.bbdebug(1, *args, **kwargs) + + def debug2(self, *args, **kwargs): + return self.bbdebug(2, *args, **kwargs) + + def debug3(self, *args, **kwargs): + return self.bbdebug(3, *args, **kwargs) def bbdebug(self, level, msg, *args, **kwargs): loglevel = logging.DEBUG - level + 1 @@ -128,7 +137,7 @@ def debug(lvl, *args): mainlogger.warning("Passed invalid debug level '%s' to bb.debug", lvl) args = (lvl,) + args lvl = 1 - mainlogger.debug(lvl, ''.join(args)) + mainlogger.bbdebug(lvl, ''.join(args)) def note(*args): mainlogger.info(''.join(args)) diff --git a/poky/bitbake/lib/bb/build.py b/poky/bitbake/lib/bb/build.py index 974d2ff06..f4f897e41 100644 --- a/poky/bitbake/lib/bb/build.py +++ b/poky/bitbake/lib/bb/build.py @@ -583,7 +583,7 @@ def _exec_task(fn, task, d, quieterr): logger.error("No such task: %s" % task) return 1 - logger.debug(1, "Executing task %s", task) + logger.debug("Executing task %s", task) localdata = _task_data(fn, task, d) tempdir = localdata.getVar('T') @@ -596,7 +596,7 @@ def _exec_task(fn, task, d, quieterr): curnice = os.nice(0) nice = int(nice) - curnice newnice = os.nice(nice) - logger.debug(1, "Renice to %s " % newnice) + logger.debug("Renice to %s " % newnice) ionice = localdata.getVar("BB_TASK_IONICE_LEVEL") if ionice: try: @@ -720,7 +720,7 @@ def _exec_task(fn, task, d, quieterr): logfile.close() if os.path.exists(logfn) and os.path.getsize(logfn) == 0: - logger.debug(2, "Zero size logfn %s, removing", logfn) + logger.debug2("Zero size logfn %s, removing", logfn) bb.utils.remove(logfn) bb.utils.remove(loglink) event.fire(TaskSucceeded(task, fn, logfn, localdata), localdata) diff --git a/poky/bitbake/lib/bb/cache.py b/poky/bitbake/lib/bb/cache.py index 36270d009..aea2b8bc1 100644 --- a/poky/bitbake/lib/bb/cache.py +++ b/poky/bitbake/lib/bb/cache.py @@ -215,7 +215,7 @@ class CoreRecipeInfo(RecipeInfoCommon): if not self.not_world: cachedata.possible_world.append(fn) #else: - # logger.debug(2, "EXCLUDE FROM WORLD: %s", fn) + # logger.debug2("EXCLUDE FROM WORLD: %s", fn) # create a collection of all targets for sanity checking # tasks, such as upstream versions, license, and tools for @@ -238,7 +238,7 @@ def virtualfn2realfn(virtualfn): Convert a virtual file name to a real one + the associated subclass keyword """ mc = "" - if virtualfn.startswith('mc:'): + if virtualfn.startswith('mc:') and virtualfn.count(':') >= 2: elems = virtualfn.split(':') mc = elems[1] virtualfn = ":".join(elems[2:]) @@ -268,7 +268,7 @@ def variant2virtual(realfn, variant): """ if variant == "": return realfn - if variant.startswith("mc:"): + if variant.startswith("mc:") and variant.count(':') >= 2: elems = variant.split(":") if elems[2]: return "mc:" + elems[1] + ":virtual:" + ":".join(elems[2:]) + ":" + realfn @@ -323,7 +323,7 @@ class NoCache(object): Return a complete set of data for fn. To do this, we need to parse the file. """ - logger.debug(1, "Parsing %s (full)" % virtualfn) + logger.debug("Parsing %s (full)" % virtualfn) (fn, virtual, mc) = virtualfn2realfn(virtualfn) bb_data = self.load_bbfile(virtualfn, appends, virtonly=True) return bb_data[virtual] @@ -400,7 +400,7 @@ class Cache(NoCache): self.cachefile = self.getCacheFile("bb_cache.dat") - self.logger.debug(1, "Cache dir: %s", self.cachedir) + self.logger.debug("Cache dir: %s", self.cachedir) bb.utils.mkdirhier(self.cachedir) cache_ok = True @@ -408,7 +408,7 @@ class Cache(NoCache): for cache_class in self.caches_array: cachefile = self.getCacheFile(cache_class.cachefile) cache_exists = os.path.exists(cachefile) - self.logger.debug(2, "Checking if %s exists: %r", cachefile, cache_exists) + self.logger.debug2("Checking if %s exists: %r", cachefile, cache_exists) cache_ok = cache_ok and cache_exists cache_class.init_cacheData(self) if cache_ok: @@ -416,7 +416,7 @@ class Cache(NoCache): elif os.path.isfile(self.cachefile): self.logger.info("Out of date cache found, rebuilding...") else: - self.logger.debug(1, "Cache file %s not found, building..." % self.cachefile) + self.logger.debug("Cache file %s not found, building..." % self.cachefile) # We don't use the symlink, its just for debugging convinience if self.mc: @@ -453,7 +453,7 @@ class Cache(NoCache): for cache_class in self.caches_array: cachefile = self.getCacheFile(cache_class.cachefile) - self.logger.debug(1, 'Loading cache file: %s' % cachefile) + self.logger.debug('Loading cache file: %s' % cachefile) with open(cachefile, "rb") as cachefile: pickled = pickle.Unpickler(cachefile) # Check cache version information @@ -500,7 +500,7 @@ class Cache(NoCache): def parse(self, filename, appends): """Parse the specified filename, returning the recipe information""" - self.logger.debug(1, "Parsing %s", filename) + self.logger.debug("Parsing %s", filename) infos = [] datastores = self.load_bbfile(filename, appends, mc=self.mc) depends = [] @@ -554,7 +554,7 @@ class Cache(NoCache): cached, infos = self.load(fn, appends) for virtualfn, info_array in infos: if info_array[0].skipped: - self.logger.debug(1, "Skipping %s: %s", virtualfn, info_array[0].skipreason) + self.logger.debug("Skipping %s: %s", virtualfn, info_array[0].skipreason) skipped += 1 else: self.add_info(virtualfn, info_array, cacheData, not cached) @@ -590,21 +590,21 @@ class Cache(NoCache): # File isn't in depends_cache if not fn in self.depends_cache: - self.logger.debug(2, "%s is not cached", fn) + self.logger.debug2("%s is not cached", fn) return False mtime = bb.parse.cached_mtime_noerror(fn) # Check file still exists if mtime == 0: - self.logger.debug(2, "%s no longer exists", fn) + self.logger.debug2("%s no longer exists", fn) self.remove(fn) return False info_array = self.depends_cache[fn] # Check the file's timestamp if mtime != info_array[0].timestamp: - self.logger.debug(2, "%s changed", fn) + self.logger.debug2("%s changed", fn) self.remove(fn) return False @@ -615,13 +615,13 @@ class Cache(NoCache): fmtime = bb.parse.cached_mtime_noerror(f) # Check if file still exists if old_mtime != 0 and fmtime == 0: - self.logger.debug(2, "%s's dependency %s was removed", + self.logger.debug2("%s's dependency %s was removed", fn, f) self.remove(fn) return False if (fmtime != old_mtime): - self.logger.debug(2, "%s's dependency %s changed", + self.logger.debug2("%s's dependency %s changed", fn, f) self.remove(fn) return False @@ -638,14 +638,14 @@ class Cache(NoCache): continue f, exist = f.split(":") if (exist == "True" and not os.path.exists(f)) or (exist == "False" and os.path.exists(f)): - self.logger.debug(2, "%s's file checksum list file %s changed", + self.logger.debug2("%s's file checksum list file %s changed", fn, f) self.remove(fn) return False if tuple(appends) != tuple(info_array[0].appends): - self.logger.debug(2, "appends for %s changed", fn) - self.logger.debug(2, "%s to %s" % (str(appends), str(info_array[0].appends))) + self.logger.debug2("appends for %s changed", fn) + self.logger.debug2("%s to %s" % (str(appends), str(info_array[0].appends))) self.remove(fn) return False @@ -654,10 +654,10 @@ class Cache(NoCache): virtualfn = variant2virtual(fn, cls) self.clean.add(virtualfn) if virtualfn not in self.depends_cache: - self.logger.debug(2, "%s is not cached", virtualfn) + self.logger.debug2("%s is not cached", virtualfn) invalid = True elif len(self.depends_cache[virtualfn]) != len(self.caches_array): - self.logger.debug(2, "Extra caches missing for %s?" % virtualfn) + self.logger.debug2("Extra caches missing for %s?" % virtualfn) invalid = True # If any one of the variants is not present, mark as invalid for all @@ -665,10 +665,10 @@ class Cache(NoCache): for cls in info_array[0].variants: virtualfn = variant2virtual(fn, cls) if virtualfn in self.clean: - self.logger.debug(2, "Removing %s from cache", virtualfn) + self.logger.debug2("Removing %s from cache", virtualfn) self.clean.remove(virtualfn) if fn in self.clean: - self.logger.debug(2, "Marking %s as not clean", fn) + self.logger.debug2("Marking %s as not clean", fn) self.clean.remove(fn) return False @@ -681,10 +681,10 @@ class Cache(NoCache): Called from the parser in error cases """ if fn in self.depends_cache: - self.logger.debug(1, "Removing %s from cache", fn) + self.logger.debug("Removing %s from cache", fn) del self.depends_cache[fn] if fn in self.clean: - self.logger.debug(1, "Marking %s as unclean", fn) + self.logger.debug("Marking %s as unclean", fn) self.clean.remove(fn) def sync(self): @@ -697,13 +697,13 @@ class Cache(NoCache): return if self.cacheclean: - self.logger.debug(2, "Cache is clean, not saving.") + self.logger.debug2("Cache is clean, not saving.") return for cache_class in self.caches_array: cache_class_name = cache_class.__name__ cachefile = self.getCacheFile(cache_class.cachefile) - self.logger.debug(2, "Writing %s", cachefile) + self.logger.debug2("Writing %s", cachefile) with open(cachefile, "wb") as f: p = pickle.Pickler(f, pickle.HIGHEST_PROTOCOL) p.dump(__cache_version__) @@ -879,7 +879,7 @@ class MultiProcessCache(object): bb.utils.mkdirhier(cachedir) self.cachefile = os.path.join(cachedir, cache_file_name or self.__class__.cache_file_name) - logger.debug(1, "Using cache in '%s'", self.cachefile) + logger.debug("Using cache in '%s'", self.cachefile) glf = bb.utils.lockfile(self.cachefile + ".lock") @@ -985,7 +985,7 @@ class SimpleCache(object): bb.utils.mkdirhier(cachedir) self.cachefile = os.path.join(cachedir, cache_file_name or self.__class__.cache_file_name) - logger.debug(1, "Using cache in '%s'", self.cachefile) + logger.debug("Using cache in '%s'", self.cachefile) glf = bb.utils.lockfile(self.cachefile + ".lock") diff --git a/poky/bitbake/lib/bb/cooker.py b/poky/bitbake/lib/bb/cooker.py index 83cfee7fb..f4ab797ed 100644 --- a/poky/bitbake/lib/bb/cooker.py +++ b/poky/bitbake/lib/bb/cooker.py @@ -411,6 +411,8 @@ class BBCooker: self.data.disableTracking() def parseConfiguration(self): + self.updateCacheSync() + # Change nice level if we're asked to nice = self.data.getVar("BB_NICE_LEVEL") if nice: @@ -441,7 +443,7 @@ class BBCooker: continue except AttributeError: pass - logger.debug(1, "Marking as dirty due to '%s' option change to '%s'" % (o, options[o])) + logger.debug("Marking as dirty due to '%s' option change to '%s'" % (o, options[o])) print("Marking as dirty due to '%s' option change to '%s'" % (o, options[o])) clean = False if hasattr(self.configuration, o): @@ -468,17 +470,17 @@ class BBCooker: for k in bb.utils.approved_variables(): if k in environment and k not in self.configuration.env: - logger.debug(1, "Updating new environment variable %s to %s" % (k, environment[k])) + logger.debug("Updating new environment variable %s to %s" % (k, environment[k])) self.configuration.env[k] = environment[k] clean = False if k in self.configuration.env and k not in environment: - logger.debug(1, "Updating environment variable %s (deleted)" % (k)) + logger.debug("Updating environment variable %s (deleted)" % (k)) del self.configuration.env[k] clean = False if k not in self.configuration.env and k not in environment: continue if environment[k] != self.configuration.env[k]: - logger.debug(1, "Updating environment variable %s from %s to %s" % (k, self.configuration.env[k], environment[k])) + logger.debug("Updating environment variable %s from %s to %s" % (k, self.configuration.env[k], environment[k])) self.configuration.env[k] = environment[k] clean = False @@ -486,7 +488,7 @@ class BBCooker: self.configuration.env = environment if not clean: - logger.debug(1, "Base environment change, triggering reparse") + logger.debug("Base environment change, triggering reparse") self.reset() def runCommands(self, server, data, abort): @@ -614,7 +616,7 @@ class BBCooker: # Replace string such as "mc:*:bash" # into "mc:A:bash mc:B:bash bash" for k in targetlist: - if k.startswith("mc:"): + if k.startswith("mc:") and k.count(':') >= 2: if wildcard: bb.fatal('multiconfig conflict') if k.split(":")[1] == "*": @@ -648,7 +650,7 @@ class BBCooker: for k in fulltargetlist: origk = k mc = "" - if k.startswith("mc:"): + if k.startswith("mc:") and k.count(':') >= 2: mc = k.split(":")[1] k = ":".join(k.split(":")[2:]) ktask = task @@ -697,7 +699,7 @@ class BBCooker: if depmc not in self.multiconfigs: bb.fatal("Multiconfig dependency %s depends on nonexistent multiconfig configuration named configuration %s" % (k,depmc)) else: - logger.debug(1, "Adding providers for multiconfig dependency %s" % l[3]) + logger.debug("Adding providers for multiconfig dependency %s" % l[3]) taskdata[depmc].add_provider(localdata[depmc], self.recipecaches[depmc], l[3]) seen.add(k) new = True @@ -1553,7 +1555,7 @@ class BBCooker: self.inotify_modified_files = [] if not self.baseconfig_valid: - logger.debug(1, "Reloading base configuration data") + logger.debug("Reloading base configuration data") self.initConfigurationData() self.handlePRServ() @@ -2209,18 +2211,18 @@ class CookerParser(object): except bb.BBHandledException as exc: self.error += 1 logger.error('Failed to parse recipe: %s' % exc.recipe) - self.shutdown(clean=False) + self.shutdown(clean=False, force=True) return False except ParsingFailure as exc: self.error += 1 logger.error('Unable to parse %s: %s' % (exc.recipe, bb.exceptions.to_string(exc.realexception))) - self.shutdown(clean=False) + self.shutdown(clean=False, force=True) return False except bb.parse.ParseError as exc: self.error += 1 logger.error(str(exc)) - self.shutdown(clean=False) + self.shutdown(clean=False, force=True) return False except bb.data_smart.ExpansionError as exc: self.error += 1 @@ -2229,7 +2231,7 @@ class CookerParser(object): tb = list(itertools.dropwhile(lambda e: e.filename.startswith(bbdir), exc.traceback)) logger.error('ExpansionError during parsing %s', value.recipe, exc_info=(etype, value, tb)) - self.shutdown(clean=False) + self.shutdown(clean=False, force=True) return False except Exception as exc: self.error += 1 @@ -2241,7 +2243,7 @@ class CookerParser(object): # Most likely, an exception occurred during raising an exception import traceback logger.error('Exception during parse: %s' % traceback.format_exc()) - self.shutdown(clean=False) + self.shutdown(clean=False, force=True) return False self.current += 1 diff --git a/poky/bitbake/lib/bb/cookerdata.py b/poky/bitbake/lib/bb/cookerdata.py index c39b56813..1c1e008c6 100644 --- a/poky/bitbake/lib/bb/cookerdata.py +++ b/poky/bitbake/lib/bb/cookerdata.py @@ -429,7 +429,7 @@ class CookerDataBuilder(object): parselog.critical("Undefined event handler function '%s'" % var) raise bb.BBHandledException() handlerln = int(data.getVarFlag(var, "lineno", False)) - bb.event.register(var, data.getVar(var, False), (data.getVarFlag(var, "eventmask") or "").split(), handlerfn, handlerln) + bb.event.register(var, data.getVar(var, False), (data.getVarFlag(var, "eventmask") or "").split(), handlerfn, handlerln, data) data.setVar('BBINCLUDED',bb.parse.get_file_depends(data)) diff --git a/poky/bitbake/lib/bb/event.py b/poky/bitbake/lib/bb/event.py index 694b47052..23e1f3187 100644 --- a/poky/bitbake/lib/bb/event.py +++ b/poky/bitbake/lib/bb/event.py @@ -118,6 +118,8 @@ def fire_class_handlers(event, d): if _eventfilter: if not _eventfilter(name, handler, event, d): continue + if d and not name in (d.getVar("__BBHANDLERS_MC") or []): + continue execute_handler(name, handler, event, d) ui_queue = [] @@ -227,9 +229,13 @@ def fire_from_worker(event, d): fire_ui_handlers(event, d) noop = lambda _: None -def register(name, handler, mask=None, filename=None, lineno=None): +def register(name, handler, mask=None, filename=None, lineno=None, data=None): """Register an Event handler""" + if data and data.getVar("BB_CURRENT_MC"): + mc = data.getVar("BB_CURRENT_MC") + name = '%s%s' % (mc.replace('-', '_'), name) + # already registered if name in _handlers: return AlreadyRegistered @@ -268,10 +274,20 @@ def register(name, handler, mask=None, filename=None, lineno=None): _event_handler_map[m] = {} _event_handler_map[m][name] = True + if data: + bbhands_mc = (data.getVar("__BBHANDLERS_MC") or []) + bbhands_mc.append(name) + data.setVar("__BBHANDLERS_MC", bbhands_mc) + return Registered -def remove(name, handler): +def remove(name, handler, data=None): """Remove an Event handler""" + if data: + if data.getVar("BB_CURRENT_MC"): + mc = data.getVar("BB_CURRENT_MC") + name = '%s%s' % (mc.replace('-', '_'), name) + _handlers.pop(name) if name in _catchall_handlers: _catchall_handlers.pop(name) @@ -279,6 +295,12 @@ def remove(name, handler): if name in _event_handler_map[event]: _event_handler_map[event].pop(name) + if data: + bbhands_mc = (data.getVar("__BBHANDLERS_MC") or []) + if name in bbhands_mc: + bbhands_mc.remove(name) + data.setVar("__BBHANDLERS_MC", bbhands_mc) + def get_handlers(): return _handlers diff --git a/poky/bitbake/lib/bb/fetch2/__init__.py b/poky/bitbake/lib/bb/fetch2/__init__.py index 07b7ae41b..19169d780 100644 --- a/poky/bitbake/lib/bb/fetch2/__init__.py +++ b/poky/bitbake/lib/bb/fetch2/__init__.py @@ -290,7 +290,7 @@ class URI(object): def _param_str_split(self, string, elmdelim, kvdelim="="): ret = collections.OrderedDict() - for k, v in [x.split(kvdelim, 1) for x in string.split(elmdelim)]: + for k, v in [x.split(kvdelim, 1) for x in string.split(elmdelim) if x]: ret[k] = v return ret @@ -428,7 +428,7 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): uri_decoded = list(decodeurl(ud.url)) uri_find_decoded = list(decodeurl(uri_find)) uri_replace_decoded = list(decodeurl(uri_replace)) - logger.debug(2, "For url %s comparing %s to %s" % (uri_decoded, uri_find_decoded, uri_replace_decoded)) + logger.debug2("For url %s comparing %s to %s" % (uri_decoded, uri_find_decoded, uri_replace_decoded)) result_decoded = ['', '', '', '', '', {}] for loc, i in enumerate(uri_find_decoded): result_decoded[loc] = uri_decoded[loc] @@ -474,7 +474,7 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): result = encodeurl(result_decoded) if result == ud.url: return None - logger.debug(2, "For url %s returning %s" % (ud.url, result)) + logger.debug2("For url %s returning %s" % (ud.url, result)) return result methods = [] @@ -499,9 +499,9 @@ def fetcher_init(d): # When to drop SCM head revisions controlled by user policy srcrev_policy = d.getVar('BB_SRCREV_POLICY') or "clear" if srcrev_policy == "cache": - logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) + logger.debug("Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) elif srcrev_policy == "clear": - logger.debug(1, "Clearing SRCREV cache due to cache policy of: %s", srcrev_policy) + logger.debug("Clearing SRCREV cache due to cache policy of: %s", srcrev_policy) revs.clear() else: raise FetchError("Invalid SRCREV cache policy of: %s" % srcrev_policy) @@ -857,9 +857,9 @@ def runfetchcmd(cmd, d, quiet=False, cleanup=None, log=None, workdir=None): cmd = 'export PSEUDO_DISABLED=1; ' + cmd if workdir: - logger.debug(1, "Running '%s' in %s" % (cmd, workdir)) + logger.debug("Running '%s' in %s" % (cmd, workdir)) else: - logger.debug(1, "Running %s", cmd) + logger.debug("Running %s", cmd) success = False error_message = "" @@ -900,7 +900,7 @@ def check_network_access(d, info, url): elif not trusted_network(d, url): raise UntrustedUrl(url, info) else: - logger.debug(1, "Fetcher accessed the network with the command %s" % info) + logger.debug("Fetcher accessed the network with the command %s" % info) def build_mirroruris(origud, mirrors, ld): uris = [] @@ -926,7 +926,7 @@ def build_mirroruris(origud, mirrors, ld): continue if not trusted_network(ld, newuri): - logger.debug(1, "Mirror %s not in the list of trusted networks, skipping" % (newuri)) + logger.debug("Mirror %s not in the list of trusted networks, skipping" % (newuri)) continue # Create a local copy of the mirrors minus the current line @@ -939,8 +939,8 @@ def build_mirroruris(origud, mirrors, ld): newud = FetchData(newuri, ld) newud.setup_localpath(ld) except bb.fetch2.BBFetchException as e: - logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url)) - logger.debug(1, str(e)) + logger.debug("Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url)) + logger.debug(str(e)) try: # setup_localpath of file:// urls may fail, we should still see # if mirrors of the url exist @@ -1043,8 +1043,8 @@ def try_mirror_url(fetch, origud, ud, ld, check = False): elif isinstance(e, NoChecksumError): raise else: - logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (ud.url, origud.url)) - logger.debug(1, str(e)) + logger.debug("Mirror fetch failure for url %s (original url: %s)" % (ud.url, origud.url)) + logger.debug(str(e)) try: ud.method.clean(ud, ld) except UnboundLocalError: @@ -1688,7 +1688,7 @@ class Fetch(object): if m.verify_donestamp(ud, self.d) and not m.need_update(ud, self.d): done = True elif m.try_premirror(ud, self.d): - logger.debug(1, "Trying PREMIRRORS") + logger.debug("Trying PREMIRRORS") mirrors = mirror_from_string(self.d.getVar('PREMIRRORS')) done = m.try_mirrors(self, ud, self.d, mirrors) if done: @@ -1698,7 +1698,7 @@ class Fetch(object): m.update_donestamp(ud, self.d) except ChecksumError as e: logger.warning("Checksum failure encountered with premirror download of %s - will attempt other sources." % u) - logger.debug(1, str(e)) + logger.debug(str(e)) done = False if premirroronly: @@ -1710,7 +1710,7 @@ class Fetch(object): try: if not trusted_network(self.d, ud.url): raise UntrustedUrl(ud.url) - logger.debug(1, "Trying Upstream") + logger.debug("Trying Upstream") m.download(ud, self.d) if hasattr(m, "build_mirror_data"): m.build_mirror_data(ud, self.d) @@ -1725,19 +1725,19 @@ class Fetch(object): except BBFetchException as e: if isinstance(e, ChecksumError): logger.warning("Checksum failure encountered with download of %s - will attempt other sources if available" % u) - logger.debug(1, str(e)) + logger.debug(str(e)) if os.path.exists(ud.localpath): rename_bad_checksum(ud, e.checksum) elif isinstance(e, NoChecksumError): raise else: logger.warning('Failed to fetch URL %s, attempting MIRRORS if available' % u) - logger.debug(1, str(e)) + logger.debug(str(e)) firsterr = e # Remove any incomplete fetch if not verified_stamp: m.clean(ud, self.d) - logger.debug(1, "Trying MIRRORS") + logger.debug("Trying MIRRORS") mirrors = mirror_from_string(self.d.getVar('MIRRORS')) done = m.try_mirrors(self, ud, self.d, mirrors) @@ -1774,7 +1774,7 @@ class Fetch(object): ud = self.ud[u] ud.setup_localpath(self.d) m = ud.method - logger.debug(1, "Testing URL %s", u) + logger.debug("Testing URL %s", u) # First try checking uri, u, from PREMIRRORS mirrors = mirror_from_string(self.d.getVar('PREMIRRORS')) ret = m.try_mirrors(self, ud, self.d, mirrors, True) diff --git a/poky/bitbake/lib/bb/fetch2/bzr.py b/poky/bitbake/lib/bb/fetch2/bzr.py index 566ace9f0..fc558f50b 100644 --- a/poky/bitbake/lib/bb/fetch2/bzr.py +++ b/poky/bitbake/lib/bb/fetch2/bzr.py @@ -74,16 +74,16 @@ class Bzr(FetchMethod): if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK): bzrcmd = self._buildbzrcommand(ud, d, "update") - logger.debug(1, "BZR Update %s", ud.url) + logger.debug("BZR Update %s", ud.url) bb.fetch2.check_network_access(d, bzrcmd, ud.url) runfetchcmd(bzrcmd, d, workdir=os.path.join(ud.pkgdir, os.path.basename(ud.path))) else: bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True) bzrcmd = self._buildbzrcommand(ud, d, "fetch") bb.fetch2.check_network_access(d, bzrcmd, ud.url) - logger.debug(1, "BZR Checkout %s", ud.url) + logger.debug("BZR Checkout %s", ud.url) bb.utils.mkdirhier(ud.pkgdir) - logger.debug(1, "Running %s", bzrcmd) + logger.debug("Running %s", bzrcmd) runfetchcmd(bzrcmd, d, workdir=ud.pkgdir) scmdata = ud.parm.get("scmdata", "") @@ -109,7 +109,7 @@ class Bzr(FetchMethod): """ Return the latest upstream revision number """ - logger.debug(2, "BZR fetcher hitting network for %s", ud.url) + logger.debug2("BZR fetcher hitting network for %s", ud.url) bb.fetch2.check_network_access(d, self._buildbzrcommand(ud, d, "revno"), ud.url) diff --git a/poky/bitbake/lib/bb/fetch2/clearcase.py b/poky/bitbake/lib/bb/fetch2/clearcase.py index 49d7ae1b0..1a9c86376 100644 --- a/poky/bitbake/lib/bb/fetch2/clearcase.py +++ b/poky/bitbake/lib/bb/fetch2/clearcase.py @@ -70,7 +70,7 @@ class ClearCase(FetchMethod): return ud.type in ['ccrc'] def debug(self, msg): - logger.debug(1, "ClearCase: %s", msg) + logger.debug("ClearCase: %s", msg) def urldata_init(self, ud, d): """ diff --git a/poky/bitbake/lib/bb/fetch2/cvs.py b/poky/bitbake/lib/bb/fetch2/cvs.py index 22abdef79..01de5ff4c 100644 --- a/poky/bitbake/lib/bb/fetch2/cvs.py +++ b/poky/bitbake/lib/bb/fetch2/cvs.py @@ -109,7 +109,7 @@ class Cvs(FetchMethod): cvsupdatecmd = "CVS_RSH=\"%s\" %s" % (cvs_rsh, cvsupdatecmd) # create module directory - logger.debug(2, "Fetch: checking for module directory") + logger.debug2("Fetch: checking for module directory") moddir = os.path.join(ud.pkgdir, localdir) workdir = None if os.access(os.path.join(moddir, 'CVS'), os.R_OK): @@ -123,7 +123,7 @@ class Cvs(FetchMethod): # check out sources there bb.utils.mkdirhier(ud.pkgdir) workdir = ud.pkgdir - logger.debug(1, "Running %s", cvscmd) + logger.debug("Running %s", cvscmd) bb.fetch2.check_network_access(d, cvscmd, ud.url) cmd = cvscmd diff --git a/poky/bitbake/lib/bb/fetch2/git.py b/poky/bitbake/lib/bb/fetch2/git.py index df9538a60..e3ba80a3f 100644 --- a/poky/bitbake/lib/bb/fetch2/git.py +++ b/poky/bitbake/lib/bb/fetch2/git.py @@ -384,6 +384,35 @@ class Git(FetchMethod): if missing_rev: raise bb.fetch2.FetchError("Unable to find revision %s even from upstream" % missing_rev) + if self._contains_lfs(ud, d, ud.clonedir) and self._need_lfs(ud): + # Unpack temporary working copy, use it to run 'git checkout' to force pre-fetching + # of all LFS blobs needed at the the srcrev. + # + # It would be nice to just do this inline here by running 'git-lfs fetch' + # on the bare clonedir, but that operation requires a working copy on some + # releases of Git LFS. + tmpdir = tempfile.mkdtemp(dir=d.getVar('DL_DIR')) + try: + # Do the checkout. This implicitly involves a Git LFS fetch. + self.unpack(ud, tmpdir, d) + + # Scoop up a copy of any stuff that Git LFS downloaded. Merge them into + # the bare clonedir. + # + # As this procedure is invoked repeatedly on incremental fetches as + # a recipe's SRCREV is bumped throughout its lifetime, this will + # result in a gradual accumulation of LFS blobs in <ud.clonedir>/lfs + # corresponding to all the blobs reachable from the different revs + # fetched across time. + # + # Only do this if the unpack resulted in a .git/lfs directory being + # created; this only happens if at least one blob needed to be + # downloaded. + if os.path.exists(os.path.join(tmpdir, "git", ".git", "lfs")): + runfetchcmd("tar -cf - lfs | tar -xf - -C %s" % ud.clonedir, d, workdir="%s/git/.git" % tmpdir) + finally: + bb.utils.remove(tmpdir, recurse=True) + def build_mirror_data(self, ud, d): if ud.shallow and ud.write_shallow_tarballs: if not os.path.exists(ud.fullshallow): @@ -479,7 +508,7 @@ class Git(FetchMethod): if os.path.exists(destdir): bb.utils.prunedir(destdir) - need_lfs = ud.parm.get("lfs", "1") == "1" + need_lfs = self._need_lfs(ud) if not need_lfs: ud.basecmd = "GIT_LFS_SKIP_SMUDGE=1 " + ud.basecmd @@ -568,6 +597,9 @@ class Git(FetchMethod): raise bb.fetch2.FetchError("The command '%s' gave output with more then 1 line unexpectedly, output: '%s'" % (cmd, output)) return output.split()[0] != "0" + def _need_lfs(self, ud): + return ud.parm.get("lfs", "1") == "1" + def _contains_lfs(self, ud, d, wd): """ Check if the repository has 'lfs' (large file) content @@ -578,8 +610,14 @@ class Git(FetchMethod): else: branchname = "master" - cmd = "%s grep lfs origin/%s:.gitattributes | wc -l" % ( - ud.basecmd, ud.branches[ud.names[0]]) + # The bare clonedir doesn't use the remote names; it has the branch immediately. + if wd == ud.clonedir: + refname = ud.branches[ud.names[0]] + else: + refname = "origin/%s" % ud.branches[ud.names[0]] + + cmd = "%s grep lfs %s:.gitattributes | wc -l" % ( + ud.basecmd, refname) try: output = runfetchcmd(cmd, d, quiet=True, workdir=wd) diff --git a/poky/bitbake/lib/bb/fetch2/gitsm.py b/poky/bitbake/lib/bb/fetch2/gitsm.py index d6e5c5c05..a4527bf36 100644 --- a/poky/bitbake/lib/bb/fetch2/gitsm.py +++ b/poky/bitbake/lib/bb/fetch2/gitsm.py @@ -78,7 +78,7 @@ class GitSM(Git): module_hash = "" if not module_hash: - logger.debug(1, "submodule %s is defined, but is not initialized in the repository. Skipping", m) + logger.debug("submodule %s is defined, but is not initialized in the repository. Skipping", m) continue submodules.append(m) @@ -179,7 +179,7 @@ class GitSM(Git): (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=ud.clonedir) if len(need_update_list) > 0: - logger.debug(1, 'gitsm: Submodules requiring update: %s' % (' '.join(need_update_list))) + logger.debug('gitsm: Submodules requiring update: %s' % (' '.join(need_update_list))) return True return False diff --git a/poky/bitbake/lib/bb/fetch2/hg.py b/poky/bitbake/lib/bb/fetch2/hg.py index 8f503701e..063e13008 100644 --- a/poky/bitbake/lib/bb/fetch2/hg.py +++ b/poky/bitbake/lib/bb/fetch2/hg.py @@ -150,7 +150,7 @@ class Hg(FetchMethod): def download(self, ud, d): """Fetch url""" - logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'") + logger.debug2("Fetch: checking for module directory '" + ud.moddir + "'") # If the checkout doesn't exist and the mirror tarball does, extract it if not os.path.exists(ud.pkgdir) and os.path.exists(ud.fullmirror): @@ -160,7 +160,7 @@ class Hg(FetchMethod): if os.access(os.path.join(ud.moddir, '.hg'), os.R_OK): # Found the source, check whether need pull updatecmd = self._buildhgcommand(ud, d, "update") - logger.debug(1, "Running %s", updatecmd) + logger.debug("Running %s", updatecmd) try: runfetchcmd(updatecmd, d, workdir=ud.moddir) except bb.fetch2.FetchError: @@ -168,7 +168,7 @@ class Hg(FetchMethod): pullcmd = self._buildhgcommand(ud, d, "pull") logger.info("Pulling " + ud.url) # update sources there - logger.debug(1, "Running %s", pullcmd) + logger.debug("Running %s", pullcmd) bb.fetch2.check_network_access(d, pullcmd, ud.url) runfetchcmd(pullcmd, d, workdir=ud.moddir) try: @@ -183,14 +183,14 @@ class Hg(FetchMethod): logger.info("Fetch " + ud.url) # check out sources there bb.utils.mkdirhier(ud.pkgdir) - logger.debug(1, "Running %s", fetchcmd) + logger.debug("Running %s", fetchcmd) bb.fetch2.check_network_access(d, fetchcmd, ud.url) runfetchcmd(fetchcmd, d, workdir=ud.pkgdir) # Even when we clone (fetch), we still need to update as hg's clone # won't checkout the specified revision if its on a branch updatecmd = self._buildhgcommand(ud, d, "update") - logger.debug(1, "Running %s", updatecmd) + logger.debug("Running %s", updatecmd) runfetchcmd(updatecmd, d, workdir=ud.moddir) def clean(self, ud, d): @@ -247,9 +247,9 @@ class Hg(FetchMethod): if scmdata != "nokeep": proto = ud.parm.get('protocol', 'http') if not os.access(os.path.join(codir, '.hg'), os.R_OK): - logger.debug(2, "Unpack: creating new hg repository in '" + codir + "'") + logger.debug2("Unpack: creating new hg repository in '" + codir + "'") runfetchcmd("%s init %s" % (ud.basecmd, codir), d) - logger.debug(2, "Unpack: updating source in '" + codir + "'") + logger.debug2("Unpack: updating source in '" + codir + "'") if ud.user and ud.pswd: runfetchcmd("%s --config auth.default.prefix=* --config auth.default.username=%s --config auth.default.password=%s --config \"auth.default.schemes=%s\" pull %s" % (ud.basecmd, ud.user, ud.pswd, proto, ud.moddir), d, workdir=codir) else: @@ -259,5 +259,5 @@ class Hg(FetchMethod): else: runfetchcmd("%s up -C %s" % (ud.basecmd, revflag), d, workdir=codir) else: - logger.debug(2, "Unpack: extracting source to '" + codir + "'") + logger.debug2("Unpack: extracting source to '" + codir + "'") runfetchcmd("%s archive -t files %s %s" % (ud.basecmd, revflag, codir), d, workdir=ud.moddir) diff --git a/poky/bitbake/lib/bb/fetch2/local.py b/poky/bitbake/lib/bb/fetch2/local.py index 25d4557db..e7d1c8c58 100644 --- a/poky/bitbake/lib/bb/fetch2/local.py +++ b/poky/bitbake/lib/bb/fetch2/local.py @@ -54,12 +54,12 @@ class Local(FetchMethod): return [path] filespath = d.getVar('FILESPATH') if filespath: - logger.debug(2, "Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":")))) + logger.debug2("Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":")))) newpath, hist = bb.utils.which(filespath, path, history=True) searched.extend(hist) if not os.path.exists(newpath): dldirfile = os.path.join(d.getVar("DL_DIR"), path) - logger.debug(2, "Defaulting to %s for %s" % (dldirfile, path)) + logger.debug2("Defaulting to %s for %s" % (dldirfile, path)) bb.utils.mkdirhier(os.path.dirname(dldirfile)) searched.append(dldirfile) return searched diff --git a/poky/bitbake/lib/bb/fetch2/osc.py b/poky/bitbake/lib/bb/fetch2/osc.py index 3a6cd2951..d9ce44390 100644 --- a/poky/bitbake/lib/bb/fetch2/osc.py +++ b/poky/bitbake/lib/bb/fetch2/osc.py @@ -84,13 +84,13 @@ class Osc(FetchMethod): Fetch url """ - logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'") + logger.debug2("Fetch: checking for module directory '" + ud.moddir + "'") if os.access(os.path.join(d.getVar('OSCDIR'), ud.path, ud.module), os.R_OK): oscupdatecmd = self._buildosccommand(ud, d, "update") logger.info("Update "+ ud.url) # update sources there - logger.debug(1, "Running %s", oscupdatecmd) + logger.debug("Running %s", oscupdatecmd) bb.fetch2.check_network_access(d, oscupdatecmd, ud.url) runfetchcmd(oscupdatecmd, d, workdir=ud.moddir) else: @@ -98,7 +98,7 @@ class Osc(FetchMethod): logger.info("Fetch " + ud.url) # check out sources there bb.utils.mkdirhier(ud.pkgdir) - logger.debug(1, "Running %s", oscfetchcmd) + logger.debug("Running %s", oscfetchcmd) bb.fetch2.check_network_access(d, oscfetchcmd, ud.url) runfetchcmd(oscfetchcmd, d, workdir=ud.pkgdir) diff --git a/poky/bitbake/lib/bb/fetch2/perforce.py b/poky/bitbake/lib/bb/fetch2/perforce.py index 6f3c95b6c..e2a41a4a1 100644 --- a/poky/bitbake/lib/bb/fetch2/perforce.py +++ b/poky/bitbake/lib/bb/fetch2/perforce.py @@ -90,16 +90,16 @@ class Perforce(FetchMethod): p4port = d.getVar('P4PORT') if p4port: - logger.debug(1, 'Using recipe provided P4PORT: %s' % p4port) + logger.debug('Using recipe provided P4PORT: %s' % p4port) ud.host = p4port else: - logger.debug(1, 'Trying to use P4CONFIG to automatically set P4PORT...') + logger.debug('Trying to use P4CONFIG to automatically set P4PORT...') ud.usingp4config = True p4cmd = '%s info | grep "Server address"' % ud.basecmd bb.fetch2.check_network_access(d, p4cmd, ud.url) ud.host = runfetchcmd(p4cmd, d, True) ud.host = ud.host.split(': ')[1].strip() - logger.debug(1, 'Determined P4PORT to be: %s' % ud.host) + logger.debug('Determined P4PORT to be: %s' % ud.host) if not ud.host: raise FetchError('Could not determine P4PORT from P4CONFIG') @@ -119,6 +119,7 @@ class Perforce(FetchMethod): cleanedpath = ud.path.replace('/...', '').replace('/', '.') cleanedhost = ud.host.replace(':', '.') + cleanedmodule = "" # Merge the path and module into the final depot location if ud.module: if ud.module.find('/') == 0: @@ -133,7 +134,7 @@ class Perforce(FetchMethod): ud.setup_revisions(d) - ud.localfile = d.expand('%s_%s_%s.tar.gz' % (cleanedhost, cleanedpath, ud.revision)) + ud.localfile = d.expand('%s_%s_%s_%s.tar.gz' % (cleanedhost, cleanedpath, cleandedmodule, ud.revision)) def _buildp4command(self, ud, d, command, depot_filename=None): """ @@ -207,7 +208,7 @@ class Perforce(FetchMethod): for filename in p4fileslist: item = filename.split(' - ') lastaction = item[1].split() - logger.debug(1, 'File: %s Last Action: %s' % (item[0], lastaction[0])) + logger.debug('File: %s Last Action: %s' % (item[0], lastaction[0])) if lastaction[0] == 'delete': continue filelist.append(item[0]) @@ -254,7 +255,7 @@ class Perforce(FetchMethod): raise FetchError('Could not determine the latest perforce changelist') tipcset = tip.split(' ')[1] - logger.debug(1, 'p4 tip found to be changelist %s' % tipcset) + logger.debug('p4 tip found to be changelist %s' % tipcset) return tipcset def sortable_revision(self, ud, d, name): diff --git a/poky/bitbake/lib/bb/fetch2/repo.py b/poky/bitbake/lib/bb/fetch2/repo.py index 2bdbbd409..fa4cb8149 100644 --- a/poky/bitbake/lib/bb/fetch2/repo.py +++ b/poky/bitbake/lib/bb/fetch2/repo.py @@ -47,7 +47,7 @@ class Repo(FetchMethod): """Fetch url""" if os.access(os.path.join(d.getVar("DL_DIR"), ud.localfile), os.R_OK): - logger.debug(1, "%s already exists (or was stashed). Skipping repo init / sync.", ud.localpath) + logger.debug("%s already exists (or was stashed). Skipping repo init / sync.", ud.localpath) return repodir = d.getVar("REPODIR") or (d.getVar("DL_DIR") + "/repo") diff --git a/poky/bitbake/lib/bb/fetch2/svn.py b/poky/bitbake/lib/bb/fetch2/svn.py index 971a5add4..8856ef1c6 100644 --- a/poky/bitbake/lib/bb/fetch2/svn.py +++ b/poky/bitbake/lib/bb/fetch2/svn.py @@ -116,7 +116,7 @@ class Svn(FetchMethod): def download(self, ud, d): """Fetch url""" - logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'") + logger.debug2("Fetch: checking for module directory '" + ud.moddir + "'") lf = bb.utils.lockfile(ud.svnlock) @@ -129,7 +129,7 @@ class Svn(FetchMethod): runfetchcmd(ud.basecmd + " upgrade", d, workdir=ud.moddir) except FetchError: pass - logger.debug(1, "Running %s", svncmd) + logger.debug("Running %s", svncmd) bb.fetch2.check_network_access(d, svncmd, ud.url) runfetchcmd(svncmd, d, workdir=ud.moddir) else: @@ -137,7 +137,7 @@ class Svn(FetchMethod): logger.info("Fetch " + ud.url) # check out sources there bb.utils.mkdirhier(ud.pkgdir) - logger.debug(1, "Running %s", svncmd) + logger.debug("Running %s", svncmd) bb.fetch2.check_network_access(d, svncmd, ud.url) runfetchcmd(svncmd, d, workdir=ud.pkgdir) diff --git a/poky/bitbake/lib/bb/fetch2/wget.py b/poky/bitbake/lib/bb/fetch2/wget.py index e6d9f528d..6d82f3af0 100644 --- a/poky/bitbake/lib/bb/fetch2/wget.py +++ b/poky/bitbake/lib/bb/fetch2/wget.py @@ -52,6 +52,12 @@ class WgetProgressHandler(bb.progress.LineFilterProgressHandler): class Wget(FetchMethod): + + # CDNs like CloudFlare may do a 'browser integrity test' which can fail + # with the standard wget/urllib User-Agent, so pretend to be a modern + # browser. + user_agent = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:84.0) Gecko/20100101 Firefox/84.0" + """Class to fetch urls via 'wget'""" def supports(self, ud, d): """ @@ -82,7 +88,7 @@ class Wget(FetchMethod): progresshandler = WgetProgressHandler(d) - logger.debug(2, "Fetching %s using command '%s'" % (ud.url, command)) + logger.debug2("Fetching %s using command '%s'" % (ud.url, command)) bb.fetch2.check_network_access(d, command, ud.url) runfetchcmd(command + ' --progress=dot -v', d, quiet, log=progresshandler, workdir=workdir) @@ -297,7 +303,7 @@ class Wget(FetchMethod): # Some servers (FusionForge, as used on Alioth) require that the # optional Accept header is set. r.add_header("Accept", "*/*") - r.add_header("User-Agent", "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Ubuntu/9.10 (karmic) Firefox/3.6.12") + r.add_header("User-Agent", self.user_agent) def add_basic_auth(login_str, request): '''Adds Basic auth to http request, pass in login:password as string''' import base64 @@ -320,11 +326,19 @@ class Wget(FetchMethod): pass except urllib.error.URLError as e: if try_again: - logger.debug(2, "checkstatus: trying again") + logger.debug2("checkstatus: trying again") + return self.checkstatus(fetch, ud, d, False) + else: + # debug for now to avoid spamming the logs in e.g. remote sstate searches + logger.debug2("checkstatus() urlopen failed: %s" % e) + return False + except ConnectionResetError as e: + if try_again: + logger.debug2("checkstatus: trying again") return self.checkstatus(fetch, ud, d, False) else: # debug for now to avoid spamming the logs in e.g. remote sstate searches - logger.debug(2, "checkstatus() urlopen failed: %s" % e) + logger.debug2("checkstatus() urlopen failed: %s" % e) return False return True @@ -401,9 +415,8 @@ class Wget(FetchMethod): """ f = tempfile.NamedTemporaryFile() with tempfile.TemporaryDirectory(prefix="wget-index-") as workdir, tempfile.NamedTemporaryFile(dir=workdir, prefix="wget-listing-") as f: - agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Ubuntu/9.10 (karmic) Firefox/3.6.12" fetchcmd = self.basecmd - fetchcmd += " -O " + f.name + " --user-agent='" + agent + "' '" + uri + "'" + fetchcmd += " -O " + f.name + " --user-agent='" + self.user_agent + "' '" + uri + "'" try: self._runwget(ud, d, fetchcmd, True, workdir=workdir) fetchresult = f.read() diff --git a/poky/bitbake/lib/bb/parse/__init__.py b/poky/bitbake/lib/bb/parse/__init__.py index 76e180b41..c01807ba8 100644 --- a/poky/bitbake/lib/bb/parse/__init__.py +++ b/poky/bitbake/lib/bb/parse/__init__.py @@ -71,7 +71,7 @@ def update_mtime(f): def update_cache(f): if f in __mtime_cache: - logger.debug(1, "Updating mtime cache for %s" % f) + logger.debug("Updating mtime cache for %s" % f) update_mtime(f) def clear_cache(): diff --git a/poky/bitbake/lib/bb/parse/ast.py b/poky/bitbake/lib/bb/parse/ast.py index 0714296af..50a88f7da 100644 --- a/poky/bitbake/lib/bb/parse/ast.py +++ b/poky/bitbake/lib/bb/parse/ast.py @@ -34,7 +34,7 @@ class IncludeNode(AstNode): Include the file and evaluate the statements """ s = data.expand(self.what_file) - logger.debug(2, "CONF %s:%s: including %s", self.filename, self.lineno, s) + logger.debug2("CONF %s:%s: including %s", self.filename, self.lineno, s) # TODO: Cache those includes... maybe not here though if self.force: @@ -335,7 +335,7 @@ def finalize(fn, d, variant = None): if not handlerfn: bb.fatal("Undefined event handler function '%s'" % var) handlerln = int(d.getVarFlag(var, "lineno", False)) - bb.event.register(var, d.getVar(var, False), (d.getVarFlag(var, "eventmask") or "").split(), handlerfn, handlerln) + bb.event.register(var, d.getVar(var, False), (d.getVarFlag(var, "eventmask") or "").split(), handlerfn, handlerln, data=d) bb.event.fire(bb.event.RecipePreFinalise(fn), d) @@ -376,7 +376,7 @@ def _create_variants(datastores, names, function, onlyfinalise): def multi_finalize(fn, d): appends = (d.getVar("__BBAPPEND") or "").split() for append in appends: - logger.debug(1, "Appending .bbappend file %s to %s", append, fn) + logger.debug("Appending .bbappend file %s to %s", append, fn) bb.parse.BBHandler.handle(append, d, True) onlyfinalise = d.getVar("__ONLYFINALISE", False) diff --git a/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py b/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py index 8a520e307..f8988b863 100644 --- a/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -22,7 +22,7 @@ from .ConfHandler import include, init # For compatibility bb.deprecate_import(__name__, "bb.parse", ["vars_from_file"]) -__func_start_regexp__ = re.compile(r"(((?P<py>python)|(?P<fr>fakeroot))\s*)*(?P<func>[\w\.\-\+\{\}\$]+)?\s*\(\s*\)\s*{$" ) +__func_start_regexp__ = re.compile(r"(((?P<py>python(?=(\s|\()))|(?P<fr>fakeroot(?=\s)))\s*)*(?P<func>[\w\.\-\+\{\}\$]+)?\s*\(\s*\)\s*{$" ) __inherit_regexp__ = re.compile(r"inherit\s+(.+)" ) __export_func_regexp__ = re.compile(r"EXPORT_FUNCTIONS\s+(.+)" ) __addtask_regexp__ = re.compile(r"addtask\s+(?P<func>\w+)\s*((before\s*(?P<before>((.*(?=after))|(.*))))|(after\s*(?P<after>((.*(?=before))|(.*)))))*") @@ -60,7 +60,7 @@ def inherit(files, fn, lineno, d): file = abs_fn if not file in __inherit_cache: - logger.debug(1, "Inheriting %s (from %s:%d)" % (file, fn, lineno)) + logger.debug("Inheriting %s (from %s:%d)" % (file, fn, lineno)) __inherit_cache.append( file ) d.setVar('__inherit_cache', __inherit_cache) include(fn, file, lineno, d, "inherit") diff --git a/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py index af64d3446..f171c5c93 100644 --- a/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py @@ -95,7 +95,7 @@ def include_single_file(parentfn, fn, lineno, data, error_out): if exc.errno == errno.ENOENT: if error_out: raise ParseError("Could not %s file %s" % (error_out, fn), parentfn, lineno) - logger.debug(2, "CONF file '%s' not found", fn) + logger.debug2("CONF file '%s' not found", fn) else: if error_out: raise ParseError("Could not %s file %s: %s" % (error_out, fn, exc.strerror), parentfn, lineno) diff --git a/poky/bitbake/lib/bb/persist_data.py b/poky/bitbake/lib/bb/persist_data.py index 5f4fbe350..c6a209fb3 100644 --- a/poky/bitbake/lib/bb/persist_data.py +++ b/poky/bitbake/lib/bb/persist_data.py @@ -248,7 +248,7 @@ class PersistData(object): stacklevel=2) self.data = persist(d) - logger.debug(1, "Using '%s' as the persistent data cache", + logger.debug("Using '%s' as the persistent data cache", self.data.filename) def addDomain(self, domain): diff --git a/poky/bitbake/lib/bb/providers.py b/poky/bitbake/lib/bb/providers.py index 3f66a3d99..b5a6cd009 100644 --- a/poky/bitbake/lib/bb/providers.py +++ b/poky/bitbake/lib/bb/providers.py @@ -165,7 +165,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): available_vers.sort() logger.warn("versions of %s available: %s", pn, ' '.join(available_vers)) else: - logger.debug(1, "selecting %s as PREFERRED_VERSION %s of package %s%s", preferred_file, pv_str, pn, itemstr) + logger.debug("selecting %s as PREFERRED_VERSION %s of package %s%s", preferred_file, pv_str, pn, itemstr) return (preferred_ver, preferred_file) @@ -232,7 +232,7 @@ def _filterProviders(providers, item, cfgData, dataCache): pkg_pn[pn] = [] pkg_pn[pn].append(p) - logger.debug(1, "providers for %s are: %s", item, list(sorted(pkg_pn.keys()))) + logger.debug("providers for %s are: %s", item, list(sorted(pkg_pn.keys()))) # First add PREFERRED_VERSIONS for pn in sorted(pkg_pn): @@ -248,9 +248,9 @@ def _filterProviders(providers, item, cfgData, dataCache): preferred_versions[pn] = findLatestProvider(pn, cfgData, dataCache, sortpkg_pn[pn][0]) eligible.append(preferred_versions[pn][1]) - if len(eligible) == 0: + if not eligible: logger.error("no eligible providers for %s", item) - return 0 + return eligible # If pn == item, give it a slight default preference # This means PREFERRED_PROVIDER_foobar defaults to foobar if available @@ -291,7 +291,7 @@ def filterProviders(providers, item, cfgData, dataCache): foundUnique = True break - logger.debug(1, "sorted providers for %s are: %s", item, eligible) + logger.debug("sorted providers for %s are: %s", item, eligible) return eligible, foundUnique @@ -333,7 +333,7 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache): provides = dataCache.pn_provides[pn] for provide in provides: prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % provide) - #logger.debug(1, "checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys()) + #logger.debug("checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys()) if prefervar in pns and pns[prefervar] not in preferred: var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar) logger.verbose("selecting %s to satisfy runtime %s due to %s", prefervar, item, var) @@ -349,7 +349,7 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache): if numberPreferred > 1: logger.error("Trying to resolve runtime dependency %s resulted in conflicting PREFERRED_PROVIDER entries being found.\nThe providers found were: %s\nThe PREFERRED_PROVIDER entries resulting in this conflict were: %s. You could set PREFERRED_RPROVIDER_%s" % (item, preferred, preferred_vars, item)) - logger.debug(1, "sorted runtime providers for %s are: %s", item, eligible) + logger.debug("sorted runtime providers for %s are: %s", item, eligible) return eligible, numberPreferred @@ -384,7 +384,7 @@ def getRuntimeProviders(dataCache, rdepend): regexp_cache[pattern] = regexp if regexp.match(rdepend): rproviders += dataCache.packages_dynamic[pattern] - logger.debug(1, "Assuming %s is a dynamic package, but it may not exist" % rdepend) + logger.debug("Assuming %s is a dynamic package, but it may not exist" % rdepend) return rproviders @@ -396,22 +396,22 @@ def buildWorldTargetList(dataCache, task=None): if dataCache.world_target: return - logger.debug(1, "collating packages for \"world\"") + logger.debug("collating packages for \"world\"") for f in dataCache.possible_world: terminal = True pn = dataCache.pkg_fn[f] if task and task not in dataCache.task_deps[f]['tasks']: - logger.debug(2, "World build skipping %s as task %s doesn't exist", f, task) + logger.debug2("World build skipping %s as task %s doesn't exist", f, task) terminal = False for p in dataCache.pn_provides[pn]: if p.startswith('virtual/'): - logger.debug(2, "World build skipping %s due to %s provider starting with virtual/", f, p) + logger.debug2("World build skipping %s due to %s provider starting with virtual/", f, p) terminal = False break for pf in dataCache.providers[p]: if dataCache.pkg_fn[pf] != pn: - logger.debug(2, "World build skipping %s due to both us and %s providing %s", f, pf, p) + logger.debug2("World build skipping %s due to both us and %s providing %s", f, pf, p) terminal = False break if terminal: diff --git a/poky/bitbake/lib/bb/runqueue.py b/poky/bitbake/lib/bb/runqueue.py index 28bdadb45..54ef245a6 100644 --- a/poky/bitbake/lib/bb/runqueue.py +++ b/poky/bitbake/lib/bb/runqueue.py @@ -38,7 +38,7 @@ def taskname_from_tid(tid): return tid.rsplit(":", 1)[1] def mc_from_tid(tid): - if tid.startswith('mc:'): + if tid.startswith('mc:') and tid.count(':') >= 2: return tid.split(':')[1] return "" @@ -47,13 +47,13 @@ def split_tid(tid): return (mc, fn, taskname) def split_mc(n): - if n.startswith("mc:"): + if n.startswith("mc:") and n.count(':') >= 2: _, mc, n = n.split(":", 2) return (mc, n) return ('', n) def split_tid_mcfn(tid): - if tid.startswith('mc:'): + if tid.startswith('mc:') and tid.count(':') >= 2: elems = tid.split(':') mc = elems[1] fn = ":".join(elems[2:-1]) @@ -544,8 +544,8 @@ class RunQueueData: for tid in self.runtaskentries: if task_done[tid] is False or deps_left[tid] != 0: problem_tasks.append(tid) - logger.debug(2, "Task %s is not buildable", tid) - logger.debug(2, "(Complete marker was %s and the remaining dependency count was %s)\n", task_done[tid], deps_left[tid]) + logger.debug2("Task %s is not buildable", tid) + logger.debug2("(Complete marker was %s and the remaining dependency count was %s)\n", task_done[tid], deps_left[tid]) self.runtaskentries[tid].weight = weight[tid] if problem_tasks: @@ -643,7 +643,7 @@ class RunQueueData: (mc, fn, taskname, taskfn) = split_tid_mcfn(tid) #runtid = build_tid(mc, fn, taskname) - #logger.debug(2, "Processing %s,%s:%s", mc, fn, taskname) + #logger.debug2("Processing %s,%s:%s", mc, fn, taskname) depends = set() task_deps = self.dataCaches[mc].task_deps[taskfn] @@ -1199,9 +1199,9 @@ class RunQueueData: """ Dump some debug information on the internal data structures """ - logger.debug(3, "run_tasks:") + logger.debug3("run_tasks:") for tid in self.runtaskentries: - logger.debug(3, " %s: %s Deps %s RevDeps %s", tid, + logger.debug3(" %s: %s Deps %s RevDeps %s", tid, self.runtaskentries[tid].weight, self.runtaskentries[tid].depends, self.runtaskentries[tid].revdeps) @@ -1238,7 +1238,7 @@ class RunQueue: self.fakeworker = {} def _start_worker(self, mc, fakeroot = False, rqexec = None): - logger.debug(1, "Starting bitbake-worker") + logger.debug("Starting bitbake-worker") magic = "decafbad" if self.cooker.configuration.profile: magic = "decafbadbad" @@ -1271,6 +1271,7 @@ class RunQueue: "date" : self.cfgData.getVar("DATE"), "time" : self.cfgData.getVar("TIME"), "hashservaddr" : self.cooker.hashservaddr, + "umask" : self.cfgData.getVar("BB_DEFAULT_UMASK"), } worker.stdin.write(b"<cookerconfig>" + pickle.dumps(self.cooker.configuration) + b"</cookerconfig>") @@ -1283,7 +1284,7 @@ class RunQueue: def _teardown_worker(self, worker): if not worker: return - logger.debug(1, "Teardown for bitbake-worker") + logger.debug("Teardown for bitbake-worker") try: worker.process.stdin.write(b"<quit></quit>") worker.process.stdin.flush() @@ -1356,12 +1357,12 @@ class RunQueue: # If the stamp is missing, it's not current if not os.access(stampfile, os.F_OK): - logger.debug(2, "Stampfile %s not available", stampfile) + logger.debug2("Stampfile %s not available", stampfile) return False # If it's a 'nostamp' task, it's not current taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn] if 'nostamp' in taskdep and taskname in taskdep['nostamp']: - logger.debug(2, "%s.%s is nostamp\n", fn, taskname) + logger.debug2("%s.%s is nostamp\n", fn, taskname) return False if taskname != "do_setscene" and taskname.endswith("_setscene"): @@ -1385,18 +1386,18 @@ class RunQueue: continue if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist): if not t2: - logger.debug(2, 'Stampfile %s does not exist', stampfile2) + logger.debug2('Stampfile %s does not exist', stampfile2) iscurrent = False break if t1 < t2: - logger.debug(2, 'Stampfile %s < %s', stampfile, stampfile2) + logger.debug2('Stampfile %s < %s', stampfile, stampfile2) iscurrent = False break if recurse and iscurrent: if dep in cache: iscurrent = cache[dep] if not iscurrent: - logger.debug(2, 'Stampfile for dependency %s:%s invalid (cached)' % (fn2, taskname2)) + logger.debug2('Stampfile for dependency %s:%s invalid (cached)' % (fn2, taskname2)) else: iscurrent = self.check_stamp_task(dep, recurse=True, cache=cache) cache[dep] = iscurrent @@ -1466,7 +1467,7 @@ class RunQueue: if not self.dm_event_handler_registered: res = bb.event.register(self.dm_event_handler_name, lambda x: self.dm.check(self) if self.state in [runQueueRunning, runQueueCleanUp] else False, - ('bb.event.HeartbeatEvent',)) + ('bb.event.HeartbeatEvent',), data=self.cfgData) self.dm_event_handler_registered = True dump = self.cooker.configuration.dump_signatures @@ -1505,7 +1506,7 @@ class RunQueue: build_done = self.state is runQueueComplete or self.state is runQueueFailed if build_done and self.dm_event_handler_registered: - bb.event.remove(self.dm_event_handler_name, None) + bb.event.remove(self.dm_event_handler_name, None, data=self.cfgData) self.dm_event_handler_registered = False if build_done and self.rqexe: @@ -1761,7 +1762,7 @@ class RunQueueExecute: for scheduler in schedulers: if self.scheduler == scheduler.name: self.sched = scheduler(self, self.rqdata) - logger.debug(1, "Using runqueue scheduler '%s'", scheduler.name) + logger.debug("Using runqueue scheduler '%s'", scheduler.name) break else: bb.fatal("Invalid scheduler '%s'. Available schedulers: %s" % @@ -1899,7 +1900,7 @@ class RunQueueExecute: break if alldeps: self.setbuildable(revdep) - logger.debug(1, "Marking task %s as buildable", revdep) + logger.debug("Marking task %s as buildable", revdep) def task_complete(self, task): self.stats.taskCompleted() @@ -1929,7 +1930,7 @@ class RunQueueExecute: def summarise_scenequeue_errors(self): err = False if not self.sqdone: - logger.debug(1, 'We could skip tasks %s', "\n".join(sorted(self.scenequeue_covered))) + logger.debug('We could skip tasks %s', "\n".join(sorted(self.scenequeue_covered))) completeevent = sceneQueueComplete(self.sq_stats, self.rq) bb.event.fire(completeevent, self.cfgData) if self.sq_deferred: @@ -1986,7 +1987,7 @@ class RunQueueExecute: if nexttask in self.sq_buildable and nexttask not in self.sq_running and self.sqdata.stamps[nexttask] not in self.build_stamps.values(): if nexttask not in self.sqdata.unskippable and len(self.sqdata.sq_revdeps[nexttask]) > 0 and self.sqdata.sq_revdeps[nexttask].issubset(self.scenequeue_covered) and self.check_dependencies(nexttask, self.sqdata.sq_revdeps[nexttask]): if nexttask not in self.rqdata.target_tids: - logger.debug(2, "Skipping setscene for task %s" % nexttask) + logger.debug2("Skipping setscene for task %s" % nexttask) self.sq_task_skip(nexttask) self.scenequeue_notneeded.add(nexttask) if nexttask in self.sq_deferred: @@ -1999,28 +2000,28 @@ class RunQueueExecute: if nexttask in self.sq_deferred: if self.sq_deferred[nexttask] not in self.runq_complete: continue - logger.debug(1, "Task %s no longer deferred" % nexttask) + logger.debug("Task %s no longer deferred" % nexttask) del self.sq_deferred[nexttask] valid = self.rq.validate_hashes(set([nexttask]), self.cooker.data, 0, False, summary=False) if not valid: - logger.debug(1, "%s didn't become valid, skipping setscene" % nexttask) + logger.debug("%s didn't become valid, skipping setscene" % nexttask) self.sq_task_failoutright(nexttask) return True else: self.sqdata.outrightfail.remove(nexttask) if nexttask in self.sqdata.outrightfail: - logger.debug(2, 'No package found, so skipping setscene task %s', nexttask) + logger.debug2('No package found, so skipping setscene task %s', nexttask) self.sq_task_failoutright(nexttask) return True if nexttask in self.sqdata.unskippable: - logger.debug(2, "Setscene task %s is unskippable" % nexttask) + logger.debug2("Setscene task %s is unskippable" % nexttask) task = nexttask break if task is not None: (mc, fn, taskname, taskfn) = split_tid_mcfn(task) taskname = taskname + "_setscene" if self.rq.check_stamp_task(task, taskname_from_tid(task), recurse = True, cache=self.stampcache): - logger.debug(2, 'Stamp for underlying task %s is current, so skipping setscene variant', task) + logger.debug2('Stamp for underlying task %s is current, so skipping setscene variant', task) self.sq_task_failoutright(task) return True @@ -2030,12 +2031,12 @@ class RunQueueExecute: return True if self.rq.check_stamp_task(task, taskname, cache=self.stampcache): - logger.debug(2, 'Setscene stamp current task %s, so skip it and its dependencies', task) + logger.debug2('Setscene stamp current task %s, so skip it and its dependencies', task) self.sq_task_skip(task) return True if self.cooker.configuration.skipsetscene: - logger.debug(2, 'No setscene tasks should be executed. Skipping %s', task) + logger.debug2('No setscene tasks should be executed. Skipping %s', task) self.sq_task_failoutright(task) return True @@ -2097,12 +2098,12 @@ class RunQueueExecute: return True if task in self.tasks_covered: - logger.debug(2, "Setscene covered task %s", task) + logger.debug2("Setscene covered task %s", task) self.task_skip(task, "covered") return True if self.rq.check_stamp_task(task, taskname, cache=self.stampcache): - logger.debug(2, "Stamp current task %s", task) + logger.debug2("Stamp current task %s", task) self.task_skip(task, "existing") self.runq_tasksrun.add(task) @@ -2322,7 +2323,7 @@ class RunQueueExecute: remapped = True if not remapped: - #logger.debug(1, "Task %s hash changes: %s->%s %s->%s" % (tid, orighash, newhash, origuni, newuni)) + #logger.debug("Task %s hash changes: %s->%s %s->%s" % (tid, orighash, newhash, origuni, newuni)) self.rqdata.runtaskentries[tid].hash = newhash self.rqdata.runtaskentries[tid].unihash = newuni changed.add(tid) @@ -2337,7 +2338,7 @@ class RunQueueExecute: for mc in self.rq.fakeworker: self.rq.fakeworker[mc].process.stdin.write(b"<newtaskhashes>" + pickle.dumps(bb.parse.siggen.get_taskhashes()) + b"</newtaskhashes>") - hashequiv_logger.debug(1, pprint.pformat("Tasks changed:\n%s" % (changed))) + hashequiv_logger.debug(pprint.pformat("Tasks changed:\n%s" % (changed))) for tid in changed: if tid not in self.rqdata.runq_setscene_tids: @@ -2356,7 +2357,7 @@ class RunQueueExecute: # Check no tasks this covers are running for dep in self.sqdata.sq_covered_tasks[tid]: if dep in self.runq_running and dep not in self.runq_complete: - hashequiv_logger.debug(2, "Task %s is running which blocks setscene for %s from running" % (dep, tid)) + hashequiv_logger.debug2("Task %s is running which blocks setscene for %s from running" % (dep, tid)) valid = False break if not valid: @@ -2430,7 +2431,7 @@ class RunQueueExecute: for dep in sorted(self.sqdata.sq_deps[task]): if fail and task in self.sqdata.sq_harddeps and dep in self.sqdata.sq_harddeps[task]: - logger.debug(2, "%s was unavailable and is a hard dependency of %s so skipping" % (task, dep)) + logger.debug2("%s was unavailable and is a hard dependency of %s so skipping" % (task, dep)) self.sq_task_failoutright(dep) continue if self.sqdata.sq_revdeps[dep].issubset(self.scenequeue_covered | self.scenequeue_notcovered): @@ -2460,7 +2461,7 @@ class RunQueueExecute: completed dependencies as buildable """ - logger.debug(1, 'Found task %s which could be accelerated', task) + logger.debug('Found task %s which could be accelerated', task) self.scenequeue_covered.add(task) self.scenequeue_updatecounters(task) @@ -2775,13 +2776,13 @@ def update_scenequeue_data(tids, sqdata, rqdata, rq, cooker, stampcache, sqrq, s continue if rq.check_stamp_task(tid, taskname + "_setscene", cache=stampcache): - logger.debug(2, 'Setscene stamp current for task %s', tid) + logger.debug2('Setscene stamp current for task %s', tid) sqdata.stamppresent.add(tid) sqrq.sq_task_skip(tid) continue if rq.check_stamp_task(tid, taskname, recurse = True, cache=stampcache): - logger.debug(2, 'Normal stamp current for task %s', tid) + logger.debug2('Normal stamp current for task %s', tid) sqdata.stamppresent.add(tid) sqrq.sq_task_skip(tid) continue diff --git a/poky/bitbake/lib/bb/siggen.py b/poky/bitbake/lib/bb/siggen.py index 0ac395246..0d88c6ec6 100644 --- a/poky/bitbake/lib/bb/siggen.py +++ b/poky/bitbake/lib/bb/siggen.py @@ -541,7 +541,7 @@ class SignatureGeneratorUniHashMixIn(object): # is much more interesting, so it is reported at debug level 1 hashequiv_logger.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server)) else: - hashequiv_logger.debug(2, 'No reported unihash for %s:%s from %s' % (tid, taskhash, self.server)) + hashequiv_logger.debug2('No reported unihash for %s:%s from %s' % (tid, taskhash, self.server)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) @@ -615,12 +615,12 @@ class SignatureGeneratorUniHashMixIn(object): new_unihash = data['unihash'] if new_unihash != unihash: - hashequiv_logger.debug(1, 'Task %s unihash changed %s -> %s by server %s' % (taskhash, unihash, new_unihash, self.server)) + hashequiv_logger.debug('Task %s unihash changed %s -> %s by server %s' % (taskhash, unihash, new_unihash, self.server)) bb.event.fire(bb.runqueue.taskUniHashUpdate(fn + ':do_' + task, new_unihash), d) self.set_unihash(tid, new_unihash) d.setVar('BB_UNIHASH', new_unihash) else: - hashequiv_logger.debug(1, 'Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server)) + hashequiv_logger.debug('Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) finally: @@ -748,7 +748,7 @@ def clean_basepath(basepath): if basepath[0] == '/': return cleaned - if basepath.startswith("mc:"): + if basepath.startswith("mc:") and basepath.count(':') >= 2: mc, mc_name, basepath = basepath.split(":", 2) mc_suffix = ':mc:' + mc_name else: diff --git a/poky/bitbake/lib/bb/taskdata.py b/poky/bitbake/lib/bb/taskdata.py index ffbaf362e..47bad6d1f 100644 --- a/poky/bitbake/lib/bb/taskdata.py +++ b/poky/bitbake/lib/bb/taskdata.py @@ -131,7 +131,7 @@ class TaskData: for depend in dataCache.deps[fn]: dependids.add(depend) self.depids[fn] = list(dependids) - logger.debug(2, "Added dependencies %s for %s", str(dataCache.deps[fn]), fn) + logger.debug2("Added dependencies %s for %s", str(dataCache.deps[fn]), fn) # Work out runtime dependencies if not fn in self.rdepids: @@ -149,9 +149,9 @@ class TaskData: rreclist.append(rdepend) rdependids.add(rdepend) if rdependlist: - logger.debug(2, "Added runtime dependencies %s for %s", str(rdependlist), fn) + logger.debug2("Added runtime dependencies %s for %s", str(rdependlist), fn) if rreclist: - logger.debug(2, "Added runtime recommendations %s for %s", str(rreclist), fn) + logger.debug2("Added runtime recommendations %s for %s", str(rreclist), fn) self.rdepids[fn] = list(rdependids) for dep in self.depids[fn]: @@ -378,7 +378,7 @@ class TaskData: for fn in eligible: if fn in self.failed_fns: continue - logger.debug(2, "adding %s to satisfy %s", fn, item) + logger.debug2("adding %s to satisfy %s", fn, item) self.add_build_target(fn, item) self.add_tasks(fn, dataCache) @@ -431,7 +431,7 @@ class TaskData: for fn in eligible: if fn in self.failed_fns: continue - logger.debug(2, "adding '%s' to satisfy runtime '%s'", fn, item) + logger.debug2("adding '%s' to satisfy runtime '%s'", fn, item) self.add_runtime_target(fn, item) self.add_tasks(fn, dataCache) @@ -446,7 +446,7 @@ class TaskData: return if not missing_list: missing_list = [] - logger.debug(1, "File '%s' is unbuildable, removing...", fn) + logger.debug("File '%s' is unbuildable, removing...", fn) self.failed_fns.append(fn) for target in self.build_targets: if fn in self.build_targets[target]: @@ -526,7 +526,7 @@ class TaskData: added = added + 1 except (bb.providers.NoRProvider, bb.providers.MultipleRProvider): self.remove_runtarget(target) - logger.debug(1, "Resolved " + str(added) + " extra dependencies") + logger.debug("Resolved " + str(added) + " extra dependencies") if added == 0: break # self.dump_data() @@ -549,38 +549,38 @@ class TaskData: """ Dump some debug information on the internal data structures """ - logger.debug(3, "build_names:") - logger.debug(3, ", ".join(self.build_targets)) + logger.debug3("build_names:") + logger.debug3(", ".join(self.build_targets)) - logger.debug(3, "run_names:") - logger.debug(3, ", ".join(self.run_targets)) + logger.debug3("run_names:") + logger.debug3(", ".join(self.run_targets)) - logger.debug(3, "build_targets:") + logger.debug3("build_targets:") for target in self.build_targets: targets = "None" if target in self.build_targets: targets = self.build_targets[target] - logger.debug(3, " %s: %s", target, targets) + logger.debug3(" %s: %s", target, targets) - logger.debug(3, "run_targets:") + logger.debug3("run_targets:") for target in self.run_targets: targets = "None" if target in self.run_targets: targets = self.run_targets[target] - logger.debug(3, " %s: %s", target, targets) + logger.debug3(" %s: %s", target, targets) - logger.debug(3, "tasks:") + logger.debug3("tasks:") for tid in self.taskentries: - logger.debug(3, " %s: %s %s %s", + logger.debug3(" %s: %s %s %s", tid, self.taskentries[tid].idepends, self.taskentries[tid].irdepends, self.taskentries[tid].tdepends) - logger.debug(3, "dependency ids (per fn):") + logger.debug3("dependency ids (per fn):") for fn in self.depids: - logger.debug(3, " %s: %s", fn, self.depids[fn]) + logger.debug3(" %s: %s", fn, self.depids[fn]) - logger.debug(3, "runtime dependency ids (per fn):") + logger.debug3("runtime dependency ids (per fn):") for fn in self.rdepids: - logger.debug(3, " %s: %s", fn, self.rdepids[fn]) + logger.debug3(" %s: %s", fn, self.rdepids[fn]) diff --git a/poky/bitbake/lib/bb/tests/fetch.py b/poky/bitbake/lib/bb/tests/fetch.py index 1452d7615..7b2dac7b8 100644 --- a/poky/bitbake/lib/bb/tests/fetch.py +++ b/poky/bitbake/lib/bb/tests/fetch.py @@ -87,6 +87,25 @@ class URITest(unittest.TestCase): }, 'relative': False }, + # Check that trailing semicolons are handled correctly + "http://www.example.org/index.html?qparam1=qvalue1;param2=value2;" : { + 'uri': 'http://www.example.org/index.html?qparam1=qvalue1;param2=value2', + 'scheme': 'http', + 'hostname': 'www.example.org', + 'port': None, + 'hostport': 'www.example.org', + 'path': '/index.html', + 'userinfo': '', + 'username': '', + 'password': '', + 'params': { + 'param2': 'value2' + }, + 'query': { + 'qparam1': 'qvalue1' + }, + 'relative': False + }, "http://www.example.com:8080/index.html" : { 'uri': 'http://www.example.com:8080/index.html', 'scheme': 'http', @@ -2089,13 +2108,14 @@ class GitLfsTest(FetcherTest): cwd = self.gitdir return bb.process.run(cmd, cwd=cwd)[0] - def fetch(self, uri=None): + def fetch(self, uri=None, download=True): uris = self.d.getVar('SRC_URI').split() uri = uris[0] d = self.d fetcher = bb.fetch2.Fetch(uris, d) - fetcher.download() + if download: + fetcher.download() ud = fetcher.ud[uri] return fetcher, ud @@ -2105,16 +2125,21 @@ class GitLfsTest(FetcherTest): uri = 'git://%s;protocol=file;subdir=${S};lfs=1' % self.srcdir self.d.setVar('SRC_URI', uri) - fetcher, ud = self.fetch() + # Careful: suppress initial attempt at downloading until + # we know whether git-lfs is installed. + fetcher, ud = self.fetch(uri=None, download=False) self.assertIsNotNone(ud.method._find_git_lfs) - # If git-lfs can be found, the unpack should be successful - ud.method._find_git_lfs = lambda d: True - shutil.rmtree(self.gitdir, ignore_errors=True) - fetcher.unpack(self.d.getVar('WORKDIR')) + # If git-lfs can be found, the unpack should be successful. Only + # attempt this with the real live copy of git-lfs installed. + if ud.method._find_git_lfs(self.d): + fetcher.download() + shutil.rmtree(self.gitdir, ignore_errors=True) + fetcher.unpack(self.d.getVar('WORKDIR')) # If git-lfs cannot be found, the unpack should throw an error with self.assertRaises(bb.fetch2.FetchError): + fetcher.download() ud.method._find_git_lfs = lambda d: False shutil.rmtree(self.gitdir, ignore_errors=True) fetcher.unpack(self.d.getVar('WORKDIR')) @@ -2125,10 +2150,16 @@ class GitLfsTest(FetcherTest): uri = 'git://%s;protocol=file;subdir=${S};lfs=0' % self.srcdir self.d.setVar('SRC_URI', uri) + # In contrast to test_lfs_enabled(), allow the implicit download + # done by self.fetch() to occur here. The point of this test case + # is to verify that the fetcher can survive even if the source + # repository has Git LFS usage configured. fetcher, ud = self.fetch() self.assertIsNotNone(ud.method._find_git_lfs) - # If git-lfs can be found, the unpack should be successful + # If git-lfs can be found, the unpack should be successful. A + # live copy of git-lfs is not required for this case, so + # unconditionally forge its presence. ud.method._find_git_lfs = lambda d: True shutil.rmtree(self.gitdir, ignore_errors=True) fetcher.unpack(self.d.getVar('WORKDIR')) diff --git a/poky/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc1.conf b/poky/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc-1.conf index f34b8dccc..f34b8dccc 100644 --- a/poky/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc1.conf +++ b/poky/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc-1.conf diff --git a/poky/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc2.conf b/poky/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc_2.conf index c3360fc5c..c3360fc5c 100644 --- a/poky/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc2.conf +++ b/poky/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc_2.conf diff --git a/poky/bitbake/lib/bb/tests/runqueue-tests/recipes/f1.bb b/poky/bitbake/lib/bb/tests/runqueue-tests/recipes/f1.bb index d45a4cff5..7b8fc592a 100644 --- a/poky/bitbake/lib/bb/tests/runqueue-tests/recipes/f1.bb +++ b/poky/bitbake/lib/bb/tests/runqueue-tests/recipes/f1.bb @@ -1 +1 @@ -do_install[mcdepends] = "mc:mc1:mc2:a1:do_build" +do_install[mcdepends] = "mc:mc-1:mc_2:a1:do_build" diff --git a/poky/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc1.bb b/poky/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc1.bb index 17a181fff..eed69c805 100644 --- a/poky/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc1.bb +++ b/poky/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc1.bb @@ -1,5 +1,5 @@ python () { - if d.getVar("BB_CURRENT_MC") == "mc1": - bb.fatal("Multiconfig is mc1") + if d.getVar("BB_CURRENT_MC") == "mc-1": + bb.fatal("Multiconfig is mc-1") } diff --git a/poky/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc2.bb b/poky/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc2.bb index cc69e7b82..3c172ef97 100644 --- a/poky/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc2.bb +++ b/poky/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc2.bb @@ -1,4 +1,4 @@ python () { - if d.getVar("BB_CURRENT_MC") == "mc2": - bb.fatal("Multiconfig is mc2") + if d.getVar("BB_CURRENT_MC") == "mc_2": + bb.fatal("Multiconfig is mc_2") } diff --git a/poky/bitbake/lib/bb/tests/runqueue.py b/poky/bitbake/lib/bb/tests/runqueue.py index d3d62b98f..3d51779d6 100644 --- a/poky/bitbake/lib/bb/tests/runqueue.py +++ b/poky/bitbake/lib/bb/tests/runqueue.py @@ -216,66 +216,66 @@ class RunQueueTests(unittest.TestCase): def test_multiconfig_setscene_optimise(self): with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir: extraenv = { - "BBMULTICONFIG" : "mc1 mc2", + "BBMULTICONFIG" : "mc-1 mc_2", "BB_SIGNATURE_HANDLER" : "basic" } - cmd = ["bitbake", "b1", "mc:mc1:b1", "mc:mc2:b1"] + cmd = ["bitbake", "b1", "mc:mc-1:b1", "mc:mc_2:b1"] setscenetasks = ['package_write_ipk_setscene', 'package_write_rpm_setscene', 'packagedata_setscene', 'populate_sysroot_setscene', 'package_qa_setscene'] sstatevalid = "" tasks = self.run_bitbakecmd(cmd, tempdir, sstatevalid, extraenv=extraenv) expected = ['a1:' + x for x in self.alltasks] + ['b1:' + x for x in self.alltasks] + \ - ['mc1:b1:' + x for x in setscenetasks] + ['mc1:a1:' + x for x in setscenetasks] + \ - ['mc2:b1:' + x for x in setscenetasks] + ['mc2:a1:' + x for x in setscenetasks] + \ - ['mc1:b1:build', 'mc2:b1:build'] - for x in ['mc1:a1:package_qa_setscene', 'mc2:a1:package_qa_setscene', 'a1:build', 'a1:package_qa']: + ['mc-1:b1:' + x for x in setscenetasks] + ['mc-1:a1:' + x for x in setscenetasks] + \ + ['mc_2:b1:' + x for x in setscenetasks] + ['mc_2:a1:' + x for x in setscenetasks] + \ + ['mc-1:b1:build', 'mc_2:b1:build'] + for x in ['mc-1:a1:package_qa_setscene', 'mc_2:a1:package_qa_setscene', 'a1:build', 'a1:package_qa']: expected.remove(x) self.assertEqual(set(tasks), set(expected)) def test_multiconfig_bbmask(self): # This test validates that multiconfigs can independently mask off # recipes they do not want with BBMASK. It works by having recipes - # that will fail to parse for mc1 and mc2, then making each multiconfig + # that will fail to parse for mc-1 and mc_2, then making each multiconfig # build the one that does parse. This ensures that the recipes are in # each multiconfigs BBFILES, but each is masking only the one that # doesn't parse with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir: extraenv = { - "BBMULTICONFIG" : "mc1 mc2", + "BBMULTICONFIG" : "mc-1 mc_2", "BB_SIGNATURE_HANDLER" : "basic", "EXTRA_BBFILES": "${COREBASE}/recipes/fails-mc/*.bb", } - cmd = ["bitbake", "mc:mc1:fails-mc2", "mc:mc2:fails-mc1"] + cmd = ["bitbake", "mc:mc-1:fails-mc2", "mc:mc_2:fails-mc1"] self.run_bitbakecmd(cmd, tempdir, "", extraenv=extraenv) def test_multiconfig_mcdepends(self): with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir: extraenv = { - "BBMULTICONFIG" : "mc1 mc2", + "BBMULTICONFIG" : "mc-1 mc_2", "BB_SIGNATURE_HANDLER" : "TestMulticonfigDepends", "EXTRA_BBFILES": "${COREBASE}/recipes/fails-mc/*.bb", } - tasks = self.run_bitbakecmd(["bitbake", "mc:mc1:f1"], tempdir, "", extraenv=extraenv, cleanup=True) - expected = ["mc1:f1:%s" % t for t in self.alltasks] + \ - ["mc2:a1:%s" % t for t in self.alltasks] + tasks = self.run_bitbakecmd(["bitbake", "mc:mc-1:f1"], tempdir, "", extraenv=extraenv, cleanup=True) + expected = ["mc-1:f1:%s" % t for t in self.alltasks] + \ + ["mc_2:a1:%s" % t for t in self.alltasks] self.assertEqual(set(tasks), set(expected)) # A rebuild does nothing - tasks = self.run_bitbakecmd(["bitbake", "mc:mc1:f1"], tempdir, "", extraenv=extraenv, cleanup=True) + tasks = self.run_bitbakecmd(["bitbake", "mc:mc-1:f1"], tempdir, "", extraenv=extraenv, cleanup=True) self.assertEqual(set(tasks), set()) # Test that a signature change in the dependent task causes # mcdepends to rebuild - tasks = self.run_bitbakecmd(["bitbake", "mc:mc2:a1", "-c", "compile", "-f"], tempdir, "", extraenv=extraenv, cleanup=True) - expected = ["mc2:a1:compile"] + tasks = self.run_bitbakecmd(["bitbake", "mc:mc_2:a1", "-c", "compile", "-f"], tempdir, "", extraenv=extraenv, cleanup=True) + expected = ["mc_2:a1:compile"] self.assertEqual(set(tasks), set(expected)) rerun_tasks = self.alltasks[:] for x in ("fetch", "unpack", "patch", "prepare_recipe_sysroot", "configure", "compile"): rerun_tasks.remove(x) - tasks = self.run_bitbakecmd(["bitbake", "mc:mc1:f1"], tempdir, "", extraenv=extraenv, cleanup=True) - expected = ["mc1:f1:%s" % t for t in rerun_tasks] + \ - ["mc2:a1:%s" % t for t in rerun_tasks] + tasks = self.run_bitbakecmd(["bitbake", "mc:mc-1:f1"], tempdir, "", extraenv=extraenv, cleanup=True) + expected = ["mc-1:f1:%s" % t for t in rerun_tasks] + \ + ["mc_2:a1:%s" % t for t in rerun_tasks] self.assertEqual(set(tasks), set(expected)) @unittest.skipIf(sys.version_info < (3, 5, 0), 'Python 3.5 or later required') diff --git a/poky/bitbake/lib/bb/ui/buildinfohelper.py b/poky/bitbake/lib/bb/ui/buildinfohelper.py index 82c62e332..43aa59284 100644 --- a/poky/bitbake/lib/bb/ui/buildinfohelper.py +++ b/poky/bitbake/lib/bb/ui/buildinfohelper.py @@ -148,14 +148,14 @@ class ORMWrapper(object): buildrequest = None if brbe is not None: # Toaster-triggered build - logger.debug(1, "buildinfohelper: brbe is %s" % brbe) + logger.debug("buildinfohelper: brbe is %s" % brbe) br, _ = brbe.split(":") buildrequest = BuildRequest.objects.get(pk=br) prj = buildrequest.project else: # CLI build prj = Project.objects.get_or_create_default_project() - logger.debug(1, "buildinfohelper: project is not specified, defaulting to %s" % prj) + logger.debug("buildinfohelper: project is not specified, defaulting to %s" % prj) if buildrequest is not None: # reuse existing Build object @@ -171,7 +171,7 @@ class ORMWrapper(object): completed_on=now, build_name='') - logger.debug(1, "buildinfohelper: build is created %s" % build) + logger.debug("buildinfohelper: build is created %s" % build) if buildrequest is not None: buildrequest.build = build @@ -906,7 +906,7 @@ class BuildInfoHelper(object): self.project = None - logger.debug(1, "buildinfohelper: Build info helper inited %s" % vars(self)) + logger.debug("buildinfohelper: Build info helper inited %s" % vars(self)) ################### @@ -1620,7 +1620,7 @@ class BuildInfoHelper(object): # if we have a backlog of events, do our best to save them here if len(self.internal_state['backlog']): tempevent = self.internal_state['backlog'].pop() - logger.debug(1, "buildinfohelper: Saving stored event %s " + logger.debug("buildinfohelper: Saving stored event %s " % tempevent) self.store_log_event(tempevent,cli_backlog) else: diff --git a/poky/bitbake/lib/bb/utils.py b/poky/bitbake/lib/bb/utils.py index 5c775bd8a..b282d09ab 100644 --- a/poky/bitbake/lib/bb/utils.py +++ b/poky/bitbake/lib/bb/utils.py @@ -609,7 +609,7 @@ def filter_environment(good_vars): os.environ["LC_ALL"] = "en_US.UTF-8" if removed_vars: - logger.debug(1, "Removed the following variables from the environment: %s", ", ".join(removed_vars.keys())) + logger.debug("Removed the following variables from the environment: %s", ", ".join(removed_vars.keys())) return removed_vars @@ -1613,12 +1613,12 @@ def export_proxies(d): def load_plugins(logger, plugins, pluginpath): def load_plugin(name): - logger.debug(1, 'Loading plugin %s' % name) + logger.debug('Loading plugin %s' % name) spec = importlib.machinery.PathFinder.find_spec(name, path=[pluginpath] ) if spec: return spec.loader.load_module() - logger.debug(1, 'Loading plugins from %s...' % pluginpath) + logger.debug('Loading plugins from %s...' % pluginpath) expanded = (glob.glob(os.path.join(pluginpath, '*' + ext)) for ext in python_extensions) diff --git a/poky/bitbake/lib/bblayers/action.py b/poky/bitbake/lib/bblayers/action.py index 5b78195ad..f05f5d330 100644 --- a/poky/bitbake/lib/bblayers/action.py +++ b/poky/bitbake/lib/bblayers/action.py @@ -50,10 +50,10 @@ class ActionPlugin(LayerPlugin): if not (args.force or notadded): try: self.tinfoil.run_command('parseConfiguration') - except bb.tinfoil.TinfoilUIException: + except (bb.tinfoil.TinfoilUIException, bb.BBHandledException): # Restore the back up copy of bblayers.conf shutil.copy2(backup, bblayers_conf) - bb.fatal("Parse failure with the specified layer added") + bb.fatal("Parse failure with the specified layer added, aborting.") else: for item in notadded: sys.stderr.write("Specified layer %s is already in BBLAYERS\n" % item) diff --git a/poky/bitbake/lib/bblayers/layerindex.py b/poky/bitbake/lib/bblayers/layerindex.py index 95b67a662..b2f27b21e 100644 --- a/poky/bitbake/lib/bblayers/layerindex.py +++ b/poky/bitbake/lib/bblayers/layerindex.py @@ -79,7 +79,7 @@ class LayerIndexPlugin(ActionPlugin): branches = [args.branch] else: branches = (self.tinfoil.config_data.getVar('LAYERSERIES_CORENAMES') or 'master').split() - logger.debug(1, 'Trying branches: %s' % branches) + logger.debug('Trying branches: %s' % branches) ignore_layers = [] if args.ignore: diff --git a/poky/bitbake/lib/hashserv/__init__.py b/poky/bitbake/lib/hashserv/__init__.py index 55f48410d..5f2e101e5 100644 --- a/poky/bitbake/lib/hashserv/__init__.py +++ b/poky/bitbake/lib/hashserv/__init__.py @@ -94,10 +94,10 @@ def chunkify(msg, max_chunk): yield "\n" -def create_server(addr, dbname, *, sync=True, upstream=None): +def create_server(addr, dbname, *, sync=True, upstream=None, read_only=False): from . import server db = setup_database(dbname, sync=sync) - s = server.Server(db, upstream=upstream) + s = server.Server(db, upstream=upstream, read_only=read_only) (typ, a) = parse_address(addr) if typ == ADDR_TYPE_UNIX: diff --git a/poky/bitbake/lib/hashserv/client.py b/poky/bitbake/lib/hashserv/client.py index 0ffd0c2ae..e05c1eb56 100644 --- a/poky/bitbake/lib/hashserv/client.py +++ b/poky/bitbake/lib/hashserv/client.py @@ -99,7 +99,7 @@ class AsyncClient(object): l = await get_line() m = json.loads(l) - if "chunk-stream" in m: + if m and "chunk-stream" in m: lines = [] while True: l = (await get_line()).rstrip("\n") @@ -170,6 +170,12 @@ class AsyncClient(object): {"get": {"taskhash": taskhash, "method": method, "all": all_properties}} ) + async def get_outhash(self, method, outhash, taskhash): + await self._set_mode(self.MODE_NORMAL) + return await self.send_message( + {"get-outhash": {"outhash": outhash, "taskhash": taskhash, "method": method}} + ) + async def get_stats(self): await self._set_mode(self.MODE_NORMAL) return await self.send_message({"get-stats": None}) diff --git a/poky/bitbake/lib/hashserv/server.py b/poky/bitbake/lib/hashserv/server.py index 3ff4c51cc..a0dc0c170 100644 --- a/poky/bitbake/lib/hashserv/server.py +++ b/poky/bitbake/lib/hashserv/server.py @@ -112,6 +112,9 @@ class Stats(object): class ClientError(Exception): pass +class ServerError(Exception): + pass + def insert_task(cursor, data, ignore=False): keys = sorted(data.keys()) query = '''INSERT%s INTO tasks_v2 (%s) VALUES (%s)''' % ( @@ -127,6 +130,18 @@ async def copy_from_upstream(client, db, method, taskhash): d = {k: v for k, v in d.items() if k in TABLE_COLUMNS} keys = sorted(d.keys()) + with closing(db.cursor()) as cursor: + insert_task(cursor, d) + db.commit() + + return d + +async def copy_outhash_from_upstream(client, db, method, outhash, taskhash): + d = await client.get_outhash(method, outhash, taskhash) + if d is not None: + # Filter out unknown columns + d = {k: v for k, v in d.items() if k in TABLE_COLUMNS} + keys = sorted(d.keys()) with closing(db.cursor()) as cursor: insert_task(cursor, d) @@ -137,8 +152,22 @@ async def copy_from_upstream(client, db, method, taskhash): class ServerClient(object): FAST_QUERY = 'SELECT taskhash, method, unihash FROM tasks_v2 WHERE method=:method AND taskhash=:taskhash ORDER BY created ASC LIMIT 1' ALL_QUERY = 'SELECT * FROM tasks_v2 WHERE method=:method AND taskhash=:taskhash ORDER BY created ASC LIMIT 1' - - def __init__(self, reader, writer, db, request_stats, backfill_queue, upstream): + OUTHASH_QUERY = ''' + -- Find tasks with a matching outhash (that is, tasks that + -- are equivalent) + SELECT * FROM tasks_v2 WHERE method=:method AND outhash=:outhash + + -- If there is an exact match on the taskhash, return it. + -- Otherwise return the oldest matching outhash of any + -- taskhash + ORDER BY CASE WHEN taskhash=:taskhash THEN 1 ELSE 2 END, + created ASC + + -- Only return one row + LIMIT 1 + ''' + + def __init__(self, reader, writer, db, request_stats, backfill_queue, upstream, read_only): self.reader = reader self.writer = writer self.db = db @@ -149,15 +178,20 @@ class ServerClient(object): self.handlers = { 'get': self.handle_get, - 'report': self.handle_report, - 'report-equiv': self.handle_equivreport, + 'get-outhash': self.handle_get_outhash, 'get-stream': self.handle_get_stream, 'get-stats': self.handle_get_stats, - 'reset-stats': self.handle_reset_stats, 'chunk-stream': self.handle_chunk, - 'backfill-wait': self.handle_backfill_wait, } + if not read_only: + self.handlers.update({ + 'report': self.handle_report, + 'report-equiv': self.handle_equivreport, + 'reset-stats': self.handle_reset_stats, + 'backfill-wait': self.handle_backfill_wait, + }) + async def process_requests(self): if self.upstream is not None: self.upstream_client = await create_async_client(self.upstream) @@ -282,6 +316,21 @@ class ServerClient(object): self.write_message(d) + async def handle_get_outhash(self, request): + with closing(self.db.cursor()) as cursor: + cursor.execute(self.OUTHASH_QUERY, + {k: request[k] for k in ('method', 'outhash', 'taskhash')}) + + row = cursor.fetchone() + + if row is not None: + logger.debug('Found equivalent outhash %s -> %s', (row['outhash'], row['unihash'])) + d = {k: row[k] for k in row.keys()} + else: + d = None + + self.write_message(d) + async def handle_get_stream(self, request): self.write_message('ok') @@ -335,23 +384,19 @@ class ServerClient(object): async def handle_report(self, data): with closing(self.db.cursor()) as cursor: - cursor.execute(''' - -- Find tasks with a matching outhash (that is, tasks that - -- are equivalent) - SELECT taskhash, method, unihash FROM tasks_v2 WHERE method=:method AND outhash=:outhash - - -- If there is an exact match on the taskhash, return it. - -- Otherwise return the oldest matching outhash of any - -- taskhash - ORDER BY CASE WHEN taskhash=:taskhash THEN 1 ELSE 2 END, - created ASC - - -- Only return one row - LIMIT 1 - ''', {k: data[k] for k in ('method', 'outhash', 'taskhash')}) + cursor.execute(self.OUTHASH_QUERY, + {k: data[k] for k in ('method', 'outhash', 'taskhash')}) row = cursor.fetchone() + if row is None and self.upstream_client: + # Try upstream + row = await copy_outhash_from_upstream(self.upstream_client, + self.db, + data['method'], + data['outhash'], + data['taskhash']) + # If no matching outhash was found, or one *was* found but it # wasn't an exact match on the taskhash, a new entry for this # taskhash should be added @@ -455,7 +500,10 @@ class ServerClient(object): class Server(object): - def __init__(self, db, loop=None, upstream=None): + def __init__(self, db, loop=None, upstream=None, read_only=False): + if upstream and read_only: + raise ServerError("Read-only hashserv cannot pull from an upstream server") + self.request_stats = Stats() self.db = db @@ -467,6 +515,7 @@ class Server(object): self.close_loop = False self.upstream = upstream + self.read_only = read_only self._cleanup_socket = None @@ -510,7 +559,7 @@ class Server(object): async def handle_client(self, reader, writer): # writer.transport.set_write_buffer_limits(0) try: - client = ServerClient(reader, writer, self.db, self.request_stats, self.backfill_queue, self.upstream) + client = ServerClient(reader, writer, self.db, self.request_stats, self.backfill_queue, self.upstream, self.read_only) await client.process_requests() except Exception as e: import traceback diff --git a/poky/bitbake/lib/hashserv/tests.py b/poky/bitbake/lib/hashserv/tests.py index 77a19b807..1a696481e 100644 --- a/poky/bitbake/lib/hashserv/tests.py +++ b/poky/bitbake/lib/hashserv/tests.py @@ -6,6 +6,7 @@ # from . import create_server, create_client +from .client import HashConnectionError import hashlib import logging import multiprocessing @@ -29,7 +30,7 @@ class HashEquivalenceTestSetup(object): server_index = 0 - def start_server(self, dbpath=None, upstream=None): + def start_server(self, dbpath=None, upstream=None, read_only=False): self.server_index += 1 if dbpath is None: dbpath = os.path.join(self.temp_dir.name, "db%d.sqlite" % self.server_index) @@ -38,7 +39,10 @@ class HashEquivalenceTestSetup(object): thread.terminate() thread.join() - server = create_server(self.get_server_addr(self.server_index), dbpath, upstream=upstream) + server = create_server(self.get_server_addr(self.server_index), + dbpath, + upstream=upstream, + read_only=read_only) server.dbpath = dbpath server.thread = multiprocessing.Process(target=_run_server, args=(server, self.server_index)) @@ -242,6 +246,43 @@ class HashEquivalenceCommonTests(object): self.assertClientGetHash(side_client, taskhash4, unihash4) self.assertClientGetHash(self.client, taskhash4, None) + # Test that reporting a unihash in the downstream is able to find a + # match which was previously reported to the upstream server + taskhash5 = '35788efcb8dfb0a02659d81cf2bfd695fb30faf9' + outhash5 = '2765d4a5884be49b28601445c2760c5f21e7e5c0ee2b7e3fce98fd7e5970796f' + unihash5 = 'f46d3fbb439bd9b921095da657a4de906510d2cd' + result = self.client.report_unihash(taskhash5, self.METHOD, outhash5, unihash5) + + taskhash6 = '35788efcb8dfb0a02659d81cf2bfd695fb30fafa' + unihash6 = 'f46d3fbb439bd9b921095da657a4de906510d2ce' + result = down_client.report_unihash(taskhash6, self.METHOD, outhash5, unihash6) + self.assertEqual(result['unihash'], unihash5, 'Server failed to copy unihash from upstream') + + def test_ro_server(self): + (ro_client, ro_server) = self.start_server(dbpath=self.server.dbpath, read_only=True) + + # Report a hash via the read-write server + taskhash = '35788efcb8dfb0a02659d81cf2bfd695fb30faf9' + outhash = '2765d4a5884be49b28601445c2760c5f21e7e5c0ee2b7e3fce98fd7e5970796f' + unihash = 'f46d3fbb439bd9b921095da657a4de906510d2cd' + + result = self.client.report_unihash(taskhash, self.METHOD, outhash, unihash) + self.assertEqual(result['unihash'], unihash, 'Server returned bad unihash') + + # Check the hash via the read-only server + self.assertClientGetHash(ro_client, taskhash, unihash) + + # Ensure that reporting via the read-only server fails + taskhash2 = 'c665584ee6817aa99edfc77a44dd853828279370' + outhash2 = '3c979c3db45c569f51ab7626a4651074be3a9d11a84b1db076f5b14f7d39db44' + unihash2 = '90e9bc1d1f094c51824adca7f8ea79a048d68824' + + with self.assertRaises(HashConnectionError): + ro_client.report_unihash(taskhash2, self.METHOD, outhash2, unihash2) + + # Ensure that the database was not modified + self.assertClientGetHash(self.client, taskhash2, None) + class TestHashEquivalenceUnixServer(HashEquivalenceTestSetup, HashEquivalenceCommonTests, unittest.TestCase): def get_server_addr(self, server_idx): diff --git a/poky/bitbake/lib/layerindexlib/__init__.py b/poky/bitbake/lib/layerindexlib/__init__.py index 45157b668..9ca127b9d 100644 --- a/poky/bitbake/lib/layerindexlib/__init__.py +++ b/poky/bitbake/lib/layerindexlib/__init__.py @@ -94,7 +94,7 @@ class LayerIndex(): if not param: continue item = param.split('=', 1) - logger.debug(1, item) + logger.debug(item) param_dict[item[0]] = item[1] return param_dict @@ -123,7 +123,7 @@ class LayerIndex(): up = urlparse(url) if username: - logger.debug(1, "Configuring authentication for %s..." % url) + logger.debug("Configuring authentication for %s..." % url) password_mgr = urllib.request.HTTPPasswordMgrWithDefaultRealm() password_mgr.add_password(None, "%s://%s" % (up.scheme, up.netloc), username, password) handler = urllib.request.HTTPBasicAuthHandler(password_mgr) @@ -133,20 +133,20 @@ class LayerIndex(): urllib.request.install_opener(opener) - logger.debug(1, "Fetching %s (%s)..." % (url, ["without authentication", "with authentication"][bool(username)])) + logger.debug("Fetching %s (%s)..." % (url, ["without authentication", "with authentication"][bool(username)])) try: res = urlopen(Request(url, headers={'User-Agent': 'Mozilla/5.0 (bitbake/lib/layerindex)'}, unverifiable=True)) except urllib.error.HTTPError as e: - logger.debug(1, "HTTP Error: %s: %s" % (e.code, e.reason)) - logger.debug(1, " Requested: %s" % (url)) - logger.debug(1, " Actual: %s" % (e.geturl())) + logger.debug("HTTP Error: %s: %s" % (e.code, e.reason)) + logger.debug(" Requested: %s" % (url)) + logger.debug(" Actual: %s" % (e.geturl())) if e.code == 404: - logger.debug(1, "Request not found.") + logger.debug("Request not found.") raise LayerIndexFetchError(url, e) else: - logger.debug(1, "Headers:\n%s" % (e.headers)) + logger.debug("Headers:\n%s" % (e.headers)) raise LayerIndexFetchError(url, e) except OSError as e: error = 0 @@ -170,7 +170,7 @@ class LayerIndex(): raise LayerIndexFetchError(url, "Unable to fetch OSError exception: %s" % e) finally: - logger.debug(1, "...fetching %s (%s), done." % (url, ["without authentication", "with authentication"][bool(username)])) + logger.debug("...fetching %s (%s), done." % (url, ["without authentication", "with authentication"][bool(username)])) return res @@ -205,14 +205,14 @@ The format of the indexURI: if reload: self.indexes = [] - logger.debug(1, 'Loading: %s' % indexURI) + logger.debug('Loading: %s' % indexURI) if not self.plugins: raise LayerIndexException("No LayerIndex Plugins available") for plugin in self.plugins: # Check if the plugin was initialized - logger.debug(1, 'Trying %s' % plugin.__class__) + logger.debug('Trying %s' % plugin.__class__) if not hasattr(plugin, 'type') or not plugin.type: continue try: @@ -220,11 +220,11 @@ The format of the indexURI: indexEnt = plugin.load_index(indexURI, load) break except LayerIndexPluginUrlError as e: - logger.debug(1, "%s doesn't support %s" % (plugin.type, e.url)) + logger.debug("%s doesn't support %s" % (plugin.type, e.url)) except NotImplementedError: pass else: - logger.debug(1, "No plugins support %s" % indexURI) + logger.debug("No plugins support %s" % indexURI) raise LayerIndexException("No plugins support %s" % indexURI) # Mark CONFIG data as something we've added... @@ -255,19 +255,19 @@ will write out the individual elements split by layer and related components. for plugin in self.plugins: # Check if the plugin was initialized - logger.debug(1, 'Trying %s' % plugin.__class__) + logger.debug('Trying %s' % plugin.__class__) if not hasattr(plugin, 'type') or not plugin.type: continue try: plugin.store_index(indexURI, index) break except LayerIndexPluginUrlError as e: - logger.debug(1, "%s doesn't support %s" % (plugin.type, e.url)) + logger.debug("%s doesn't support %s" % (plugin.type, e.url)) except NotImplementedError: - logger.debug(1, "Store not implemented in %s" % plugin.type) + logger.debug("Store not implemented in %s" % plugin.type) pass else: - logger.debug(1, "No plugins support %s" % indexURI) + logger.debug("No plugins support %s" % indexURI) raise LayerIndexException("No plugins support %s" % indexURI) @@ -292,7 +292,7 @@ layerBranches set. If not, they are effectively blank.''' the default configuration until the first vcs_url/branch match.''' for index in self.indexes: - logger.debug(1, ' searching %s' % index.config['DESCRIPTION']) + logger.debug(' searching %s' % index.config['DESCRIPTION']) layerBranch = index.find_vcs_url(vcs_url, [branch]) if layerBranch: return layerBranch @@ -304,7 +304,7 @@ layerBranches set. If not, they are effectively blank.''' If a branch has not been specified, we will iterate over the branches in the default configuration until the first collection/branch match.''' - logger.debug(1, 'find_collection: %s (%s) %s' % (collection, version, branch)) + logger.debug('find_collection: %s (%s) %s' % (collection, version, branch)) if branch: branches = [branch] @@ -312,12 +312,12 @@ layerBranches set. If not, they are effectively blank.''' branches = None for index in self.indexes: - logger.debug(1, ' searching %s' % index.config['DESCRIPTION']) + logger.debug(' searching %s' % index.config['DESCRIPTION']) layerBranch = index.find_collection(collection, version, branches) if layerBranch: return layerBranch else: - logger.debug(1, 'Collection %s (%s) not found for branch (%s)' % (collection, version, branch)) + logger.debug('Collection %s (%s) not found for branch (%s)' % (collection, version, branch)) return None def find_layerbranch(self, name, branch=None): @@ -408,7 +408,7 @@ layerBranches set. If not, they are effectively blank.''' version=deplayerbranch.version ) if rdeplayerbranch != deplayerbranch: - logger.debug(1, 'Replaced %s:%s:%s with %s:%s:%s' % \ + logger.debug('Replaced %s:%s:%s with %s:%s:%s' % \ (deplayerbranch.index.config['DESCRIPTION'], deplayerbranch.branch.name, deplayerbranch.layer.name, @@ -1121,7 +1121,7 @@ class LayerBranch(LayerIndexItemObj): @property def branch(self): try: - logger.debug(1, "Get branch object from branches[%s]" % (self.branch_id)) + logger.debug("Get branch object from branches[%s]" % (self.branch_id)) return self.index.branches[self.branch_id] except KeyError: raise AttributeError('Unable to find branches in index to map branch_id %s' % self.branch_id) @@ -1149,7 +1149,7 @@ class LayerBranch(LayerIndexItemObj): @actual_branch.setter def actual_branch(self, value): - logger.debug(1, "Set actual_branch to %s .. name is %s" % (value, self.branch.name)) + logger.debug("Set actual_branch to %s .. name is %s" % (value, self.branch.name)) if value != self.branch.name: self._setattr('actual_branch', value, prop=False) else: diff --git a/poky/bitbake/lib/layerindexlib/cooker.py b/poky/bitbake/lib/layerindexlib/cooker.py index 21ec438a2..2de6e5faa 100644 --- a/poky/bitbake/lib/layerindexlib/cooker.py +++ b/poky/bitbake/lib/layerindexlib/cooker.py @@ -173,7 +173,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin): else: branches = ['HEAD'] - logger.debug(1, "Loading cooker data branches %s" % branches) + logger.debug("Loading cooker data branches %s" % branches) index = self._load_bblayers(branches=branches) @@ -220,7 +220,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin): required=required, layerbranch=layerBranchId, dependency=depLayerBranch.layer_id) - logger.debug(1, '%s requires %s' % (layerDependency.layer.name, layerDependency.dependency.name)) + logger.debug('%s requires %s' % (layerDependency.layer.name, layerDependency.dependency.name)) index.add_element("layerDependencies", [layerDependency]) return layerDependencyId diff --git a/poky/bitbake/lib/layerindexlib/restapi.py b/poky/bitbake/lib/layerindexlib/restapi.py index 7023f42f2..26a1c9674 100644 --- a/poky/bitbake/lib/layerindexlib/restapi.py +++ b/poky/bitbake/lib/layerindexlib/restapi.py @@ -82,7 +82,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin): def load_cache(path, index, branches=[]): - logger.debug(1, 'Loading json file %s' % path) + logger.debug('Loading json file %s' % path) with open(path, 'rt', encoding='utf-8') as f: pindex = json.load(f) @@ -102,7 +102,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin): if newpBranch: index.add_raw_element('branches', layerindexlib.Branch, newpBranch) else: - logger.debug(1, 'No matching branches (%s) in index file(s)' % branches) + logger.debug('No matching branches (%s) in index file(s)' % branches) # No matching branches.. return nothing... return @@ -120,7 +120,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin): load_cache(up.path, index, branches) return index - logger.debug(1, 'Loading from dir %s...' % (up.path)) + logger.debug('Loading from dir %s...' % (up.path)) for (dirpath, _, filenames) in os.walk(up.path): for filename in filenames: if not filename.endswith('.json'): @@ -144,7 +144,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin): def _get_json_response(apiurl=None, username=None, password=None, retry=True): assert apiurl is not None - logger.debug(1, "fetching %s" % apiurl) + logger.debug("fetching %s" % apiurl) up = urlparse(apiurl) @@ -163,9 +163,9 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin): parsed = json.loads(res.read().decode('utf-8')) except ConnectionResetError: if retry: - logger.debug(1, "%s: Connection reset by peer. Retrying..." % url) + logger.debug("%s: Connection reset by peer. Retrying..." % url) parsed = _get_json_response(apiurl=up_stripped.geturl(), username=username, password=password, retry=False) - logger.debug(1, "%s: retry successful.") + logger.debug("%s: retry successful.") else: raise layerindexlib.LayerIndexFetchError('%s: Connection reset by peer. Is there a firewall blocking your connection?' % apiurl) @@ -207,25 +207,25 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin): if "*" not in branches: filter = "?filter=name:%s" % "OR".join(branches) - logger.debug(1, "Loading %s from %s" % (branches, index.apilinks['branches'])) + logger.debug("Loading %s from %s" % (branches, index.apilinks['branches'])) # The link won't include username/password, so pull it from the original url pindex['branches'] = _get_json_response(index.apilinks['branches'] + filter, username=up.username, password=up.password) if not pindex['branches']: - logger.debug(1, "No valid branches (%s) found at url %s." % (branch, url)) + logger.debug("No valid branches (%s) found at url %s." % (branch, url)) return index index.add_raw_element("branches", layerindexlib.Branch, pindex['branches']) # Load all of the layerItems (these can not be easily filtered) - logger.debug(1, "Loading %s from %s" % ('layerItems', index.apilinks['layerItems'])) + logger.debug("Loading %s from %s" % ('layerItems', index.apilinks['layerItems'])) # The link won't include username/password, so pull it from the original url pindex['layerItems'] = _get_json_response(index.apilinks['layerItems'], username=up.username, password=up.password) if not pindex['layerItems']: - logger.debug(1, "No layers were found at url %s." % (url)) + logger.debug("No layers were found at url %s." % (url)) return index index.add_raw_element("layerItems", layerindexlib.LayerItem, pindex['layerItems']) @@ -235,13 +235,13 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin): for branch in index.branches: filter = "?filter=branch__name:%s" % index.branches[branch].name - logger.debug(1, "Loading %s from %s" % ('layerBranches', index.apilinks['layerBranches'])) + logger.debug("Loading %s from %s" % ('layerBranches', index.apilinks['layerBranches'])) # The link won't include username/password, so pull it from the original url pindex['layerBranches'] = _get_json_response(index.apilinks['layerBranches'] + filter, username=up.username, password=up.password) if not pindex['layerBranches']: - logger.debug(1, "No valid layer branches (%s) found at url %s." % (branches or "*", url)) + logger.debug("No valid layer branches (%s) found at url %s." % (branches or "*", url)) return index index.add_raw_element("layerBranches", layerindexlib.LayerBranch, pindex['layerBranches']) @@ -256,7 +256,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin): ("distros", layerindexlib.Distro)]: if lName not in load: continue - logger.debug(1, "Loading %s from %s" % (lName, index.apilinks[lName])) + logger.debug("Loading %s from %s" % (lName, index.apilinks[lName])) # The link won't include username/password, so pull it from the original url pindex[lName] = _get_json_response(index.apilinks[lName] + filter, @@ -283,7 +283,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin): if up.scheme != 'file': raise layerindexlib.plugin.LayerIndexPluginUrlError(self.type, url) - logger.debug(1, "Storing to %s..." % up.path) + logger.debug("Storing to %s..." % up.path) try: layerbranches = index.layerBranches @@ -299,12 +299,12 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin): if getattr(index, objects)[obj].layerbranch_id == layerbranchid: filtered.append(getattr(index, objects)[obj]._data) except AttributeError: - logger.debug(1, 'No obj.layerbranch_id: %s' % objects) + logger.debug('No obj.layerbranch_id: %s' % objects) # No simple filter method, just include it... try: filtered.append(getattr(index, objects)[obj]._data) except AttributeError: - logger.debug(1, 'No obj._data: %s %s' % (objects, type(obj))) + logger.debug('No obj._data: %s %s' % (objects, type(obj))) filtered.append(obj) return filtered diff --git a/poky/bitbake/lib/layerindexlib/tests/cooker.py b/poky/bitbake/lib/layerindexlib/tests/cooker.py index 1d0685e09..5ddf89aa2 100644 --- a/poky/bitbake/lib/layerindexlib/tests/cooker.py +++ b/poky/bitbake/lib/layerindexlib/tests/cooker.py @@ -72,7 +72,7 @@ class LayerIndexCookerTest(LayersTest): def test_find_collection(self): def _check(collection, expected): - self.logger.debug(1, "Looking for collection %s..." % collection) + self.logger.debug("Looking for collection %s..." % collection) result = self.layerindex.find_collection(collection) if expected: self.assertIsNotNone(result, msg="Did not find %s when it shouldn't be there" % collection) @@ -91,7 +91,7 @@ class LayerIndexCookerTest(LayersTest): def test_find_layerbranch(self): def _check(name, expected): - self.logger.debug(1, "Looking for layerbranch %s..." % name) + self.logger.debug("Looking for layerbranch %s..." % name) result = self.layerindex.find_layerbranch(name) if expected: self.assertIsNotNone(result, msg="Did not find %s when it shouldn't be there" % collection) diff --git a/poky/bitbake/lib/layerindexlib/tests/restapi.py b/poky/bitbake/lib/layerindexlib/tests/restapi.py index 4646d01f9..33b5c1c4c 100644 --- a/poky/bitbake/lib/layerindexlib/tests/restapi.py +++ b/poky/bitbake/lib/layerindexlib/tests/restapi.py @@ -57,11 +57,11 @@ class LayerIndexWebRestApiTest(LayersTest): type in self.layerindex.indexes[0].config['local']: continue for id in getattr(self.layerindex.indexes[0], type): - self.logger.debug(1, "type %s" % (type)) + self.logger.debug("type %s" % (type)) self.assertTrue(id in getattr(reload.indexes[0], type), msg="Id number not in reloaded index") - self.logger.debug(1, "%s ? %s" % (getattr(self.layerindex.indexes[0], type)[id], getattr(reload.indexes[0], type)[id])) + self.logger.debug("%s ? %s" % (getattr(self.layerindex.indexes[0], type)[id], getattr(reload.indexes[0], type)[id])) self.assertEqual(getattr(self.layerindex.indexes[0], type)[id], getattr(reload.indexes[0], type)[id], msg="Reloaded contents different") @@ -80,11 +80,11 @@ class LayerIndexWebRestApiTest(LayersTest): type in self.layerindex.indexes[0].config['local']: continue for id in getattr(self.layerindex.indexes[0] ,type): - self.logger.debug(1, "type %s" % (type)) + self.logger.debug("type %s" % (type)) self.assertTrue(id in getattr(reload.indexes[0], type), msg="Id number missing from reloaded data") - self.logger.debug(1, "%s ? %s" % (getattr(self.layerindex.indexes[0] ,type)[id], getattr(reload.indexes[0], type)[id])) + self.logger.debug("%s ? %s" % (getattr(self.layerindex.indexes[0] ,type)[id], getattr(reload.indexes[0], type)[id])) self.assertEqual(getattr(self.layerindex.indexes[0] ,type)[id], getattr(reload.indexes[0], type)[id], msg="reloaded data does not match original") @@ -111,14 +111,14 @@ class LayerIndexWebRestApiTest(LayersTest): if dep.layer.name == 'meta-python': break else: - self.logger.debug(1, "meta-python was not found") + self.logger.debug("meta-python was not found") raise self.failureException # Only check the first element... break else: # Empty list, this is bad. - self.logger.debug(1, "Empty list of dependencies") + self.logger.debug("Empty list of dependencies") self.assertIsNotNone(first, msg="Empty list of dependencies") # Last dep should be the requested item @@ -128,7 +128,7 @@ class LayerIndexWebRestApiTest(LayersTest): @skipIfNoNetwork() def test_find_collection(self): def _check(collection, expected): - self.logger.debug(1, "Looking for collection %s..." % collection) + self.logger.debug("Looking for collection %s..." % collection) result = self.layerindex.find_collection(collection) if expected: self.assertIsNotNone(result, msg="Did not find %s when it should be there" % collection) @@ -148,11 +148,11 @@ class LayerIndexWebRestApiTest(LayersTest): @skipIfNoNetwork() def test_find_layerbranch(self): def _check(name, expected): - self.logger.debug(1, "Looking for layerbranch %s..." % name) + self.logger.debug("Looking for layerbranch %s..." % name) for index in self.layerindex.indexes: for layerbranchid in index.layerBranches: - self.logger.debug(1, "Present: %s" % index.layerBranches[layerbranchid].layer.name) + self.logger.debug("Present: %s" % index.layerBranches[layerbranchid].layer.name) result = self.layerindex.find_layerbranch(name) if expected: self.assertIsNotNone(result, msg="Did not find %s when it should be there" % collection) diff --git a/poky/documentation/conf.py b/poky/documentation/conf.py index 407ea3292..5a2e25f7b 100644 --- a/poky/documentation/conf.py +++ b/poky/documentation/conf.py @@ -33,6 +33,9 @@ author = 'The Linux Foundation' # -- General configuration --------------------------------------------------- +# Prevent building with an outdated version of sphinx +needs_sphinx = "3.1" + # to load local extension from the folder 'sphinx' sys.path.insert(0, os.path.abspath('sphinx')) diff --git a/poky/documentation/dev-manual/common-tasks.rst b/poky/documentation/dev-manual/common-tasks.rst index e1dee8ecd..65db4aed3 100644 --- a/poky/documentation/dev-manual/common-tasks.rst +++ b/poky/documentation/dev-manual/common-tasks.rst @@ -2075,6 +2075,12 @@ recipe: SYSROOT_DIRS += "/opt" +.. note:: + + The `/sysroot-only` is to be used by recipes that generate artifacts + that are not included in the target filesystem, allowing them to share + these artifacts without needing to use the ``DEPLOY_DIR``. + For a more complete description of the :ref:`ref-tasks-populate_sysroot` task and its associated functions, see the @@ -2298,7 +2304,7 @@ directory BitBake uses for the build. S = "${WORKDIR}" do_compile() { - ${CC} helloworld.c -o helloworld + ${CC} ${LDFLAGS} helloworld.c -o helloworld } do_install() { diff --git a/poky/documentation/figures/yp-how-it-works-new-diagram.png b/poky/documentation/figures/yp-how-it-works-new-diagram.png Binary files differindex 2ce076f3c..953f37ead 100644 --- a/poky/documentation/figures/yp-how-it-works-new-diagram.png +++ b/poky/documentation/figures/yp-how-it-works-new-diagram.png diff --git a/poky/documentation/kernel-dev/common.rst b/poky/documentation/kernel-dev/common.rst index 6691da448..58adcc9b7 100644 --- a/poky/documentation/kernel-dev/common.rst +++ b/poky/documentation/kernel-dev/common.rst @@ -139,7 +139,7 @@ section: ~/poky/build/tmp/deploy/sdk For this example, the installer file is named - ``poky-glibc-x86_64-core-image-minimal-i586-toolchain-ext-DISTRO.sh``. + ``poky-glibc-x86_64-core-image-minimal-i586-toolchain-ext-&DISTRO;.sh``. 6. *Install the Extensible SDK:* Use the following command to install the SDK. For this example, install the SDK in the default diff --git a/poky/documentation/poky.yaml b/poky/documentation/poky.yaml index c1340c25e..3c30c4430 100644 --- a/poky/documentation/poky.yaml +++ b/poky/documentation/poky.yaml @@ -1,12 +1,12 @@ -DISTRO : "3.2" +DISTRO : "3.2.2" DISTRO_NAME_NO_CAP : "gatesgarth" DISTRO_NAME : "Gatesgarth" DISTRO_NAME_NO_CAP_MINUS_ONE : "dunfell" DISTRO_NAME_NO_CAP_LTS : "dunfell" -YOCTO_DOC_VERSION : "3.2" -YOCTO_DOC_VERSION_MINUS_ONE : "3.1.4" -DISTRO_REL_TAG : "yocto-3.2" -POKYVERSION : "24.0.0" +YOCTO_DOC_VERSION : "3.2.2" +YOCTO_DOC_VERSION_MINUS_ONE : "3.1.6" +DISTRO_REL_TAG : "yocto-3.2.2" +POKYVERSION : "24.0.2" YOCTO_POKY : "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;" YOCTO_DL_URL : "https://downloads.yoctoproject.org" YOCTO_AB_URL : "https://autobuilder.yoctoproject.org" diff --git a/poky/documentation/ref-manual/classes.rst b/poky/documentation/ref-manual/classes.rst index a152dcac7..be112e0fa 100644 --- a/poky/documentation/ref-manual/classes.rst +++ b/poky/documentation/ref-manual/classes.rst @@ -931,7 +931,7 @@ For information on customizing images, see the in the Yocto Project Development Tasks Manual. For information on how images are created, see the ":ref:`overview-manual/concepts:images`" section in the -Yocto Project Overview and Concpets Manual. +Yocto Project Overview and Concepts Manual. .. _ref-classes-image-buildinfo: @@ -1375,11 +1375,13 @@ generation. =========================== 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. +device trees, a U-boot script, a Initramfs bundle and a RAM disk +into a single FIT image. In theory, a FIT image can support any number +of kernels, U-boot scripts, Initramfs bundles, 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 trees. +limited usescases: just one kernel image, an optional U-boot script, +an optional Initramfs bundle, an optional RAM disk, and any number of +device tree. To create a FIT image, it is required that :term:`KERNEL_CLASSES` is set to include "kernel-fitimage" and :term:`KERNEL_IMAGETYPE` @@ -1406,7 +1408,27 @@ Only a single RAM disk can be added to the FIT image created by 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. +:term:`INITRAMFS_IMAGE` is specified and that :term:`INITRAMFS_IMAGE_BUNDLE` +is set to 0. + +Only a single Initramfs bundle can be added to the FIT image created by +``kernel-fitimage`` and the Initramfs bundle in FIT is optional. +In case of Initramfs, the kernel is configured to be bundled with the rootfs +in the same binary (example: zImage-initramfs-:term:`MACHINE`.bin). +When the kernel is copied to RAM and executed, it unpacks the Initramfs rootfs. +The Initramfs bundle can be enabled when :term:`INITRAMFS_IMAGE` +is specified and that :term:`INITRAMFS_IMAGE_BUNDLE` is set to 1. +The address where the Initramfs bundle is to be loaded by U-boot is specified +by :term:`UBOOT_LOADADDRESS` and the entrypoint by :term:`UBOOT_ENTRYPOINT`. + +Only a single U-boot boot script can be added to the FIT image created by +``kernel-fitimage`` and the boot script is optional. +The boot script is specified in the ITS file as a text file containing +U-boot commands. When using a boot script the user should configure the +U-boot ``do_install`` task to copy the script to sysroot. +So the script can be included in the the FIT image by the ``kernel-fitimage`` +class. At run-time, U-boot CONFIG_BOOTCOMMAND define can be configured to +load the boot script from the FIT image and executes it. The FIT image generated by ``kernel-fitimage`` class is signed when the variables :term:`UBOOT_SIGN_ENABLE`, :term:`UBOOT_MKIMAGE_DTCOPTS`, diff --git a/poky/documentation/ref-manual/devtool-reference.rst b/poky/documentation/ref-manual/devtool-reference.rst index cc5848fd4..5075f0c22 100644 --- a/poky/documentation/ref-manual/devtool-reference.rst +++ b/poky/documentation/ref-manual/devtool-reference.rst @@ -204,20 +204,20 @@ specify these options when using the ``devtool add`` command: - To specify a source branch, use the ``--srcbranch`` option: :: - $ devtool add --srcbranch DISTRO_NAME_NO_CAP jackson /home/user/sources/jackson + $ devtool add --srcbranch &DISTRO_NAME_NO_CAP; jackson /home/user/sources/jackson - In the previous example, you are checking out the DISTRO_NAME_NO_CAP + In the previous example, you are checking out the &DISTRO_NAME_NO_CAP; branch. - To specify a specific tag or commit hash, use the ``--srcrev`` option: :: - $ devtool add --srcrev DISTRO_REL_TAG jackson /home/user/sources/jackson + $ devtool add --srcrev &DISTRO_REL_TAG; jackson /home/user/sources/jackson $ devtool add --srcrev some_commit_hash /home/user/sources/jackson The previous examples check out the - DISTRO_REL_TAG tag and the commit associated with the + &DISTRO_REL_TAG; tag and the commit associated with the some_commit_hash hash. .. note:: diff --git a/poky/documentation/ref-manual/examples/hello-single/hello.bb b/poky/documentation/ref-manual/examples/hello-single/hello.bb index 0812743e3..90d3aefd8 100644 --- a/poky/documentation/ref-manual/examples/hello-single/hello.bb +++ b/poky/documentation/ref-manual/examples/hello-single/hello.bb @@ -8,7 +8,7 @@ SRC_URI = "file://helloworld.c" S = "${WORKDIR}" do_compile() { - ${CC} helloworld.c -o helloworld + ${CC} ${LDFLAGS} helloworld.c -o helloworld } do_install() { diff --git a/poky/documentation/ref-manual/release-process.rst b/poky/documentation/ref-manual/release-process.rst index d8d362282..ed5a09a55 100644 --- a/poky/documentation/ref-manual/release-process.rst +++ b/poky/documentation/ref-manual/release-process.rst @@ -12,7 +12,7 @@ stability. Major and Minor Release Cadence =============================== -The Yocto Project delivers major releases (e.g. DISTRO) using a six +The Yocto Project delivers major releases (e.g. &DISTRO;) using a six month cadence roughly timed each April and October of the year. Following are examples of some major YP releases with their codenames also shown. See the "`Major Release @@ -57,7 +57,7 @@ codename are likely to be compatible and thus work together. .. note:: Codenames are associated with major releases because a Yocto Project - release number (e.g. DISTRO) could conflict with a given layer or + release number (e.g. &DISTRO;) could conflict with a given layer or company versioning scheme. Codenames are unique, interesting, and easily identifiable. diff --git a/poky/documentation/ref-manual/system-requirements.rst b/poky/documentation/ref-manual/system-requirements.rst index 66afb0810..c8c1381cb 100644 --- a/poky/documentation/ref-manual/system-requirements.rst +++ b/poky/documentation/ref-manual/system-requirements.rst @@ -340,12 +340,12 @@ of the two methods by which you can get these tools: traditional installer: :: - $ sh ~/Downloads/x86_64-buildtools-nativesdk-standalone-DISTRO.sh + $ sh ~/Downloads/x86_64-buildtools-nativesdk-standalone-&DISTRO;.sh Here is an example for the extended installer: :: - $ sh ~/Downloads/x86_64-buildtools-extended-nativesdk-standalone-DISTRO.sh + $ sh ~/Downloads/x86_64-buildtools-extended-nativesdk-standalone-&DISTRO;.sh During execution, a prompt appears that allows you to choose the installation directory. For example, you could choose the following: diff --git a/poky/documentation/ref-manual/terms.rst b/poky/documentation/ref-manual/terms.rst index 966962005..bf4614887 100644 --- a/poky/documentation/ref-manual/terms.rst +++ b/poky/documentation/ref-manual/terms.rst @@ -90,13 +90,13 @@ universal, the list includes them just in case: - Provide a directory path and specifically name the Build Directory. Any intermediate folders in the pathname must exist. This next example creates a Build Directory named - ``YP-POKYVERSION`` in your home directory within the existing + ``YP-&POKYVERSION;`` in your home directory within the existing directory ``mybuilds``: .. code-block:: shell $ cd $HOME - $ source $HOME/poky/oe-init-build-env $HOME/mybuilds/YP-POKYVERSION + $ source $HOME/poky/oe-init-build-env $HOME/mybuilds/YP-&POKYVERSION; .. note:: diff --git a/poky/documentation/ref-manual/variables.rst b/poky/documentation/ref-manual/variables.rst index 4ce264813..2cb37b6a2 100644 --- a/poky/documentation/ref-manual/variables.rst +++ b/poky/documentation/ref-manual/variables.rst @@ -4202,11 +4202,11 @@ system and gives an overview of their function and contents. this variable in your layer's ``conf/layer.conf`` configuration file. For the list, use the Yocto Project :yocto_wiki:`Release Name </Releases>` (e.g. - DISTRO_NAME_NO_CAP). To specify multiple OE-Core versions for the + &DISTRO_NAME_NO_CAP;). To specify multiple OE-Core versions for the layer, use a space-separated list: :: - LAYERSERIES_COMPAT_layer_root_name = "DISTRO_NAME_NO_CAP DISTRO_NAME_NO_CAP_MINUS_ONE" + LAYERSERIES_COMPAT_layer_root_name = "&DISTRO_NAME_NO_CAP; &DISTRO_NAME_NO_CAP_MINUS_ONE;" .. note:: @@ -5915,23 +5915,16 @@ system and gives an overview of their function and contents. file ``eudev_3.2.9.bb``: :: - PROVIDES = "udev" + PROVIDES += "udev" The ``PROVIDES`` statement results in the "eudev" recipe also being available as simply "udev". .. note:: - Given that a recipe's own recipe name is already implicitly in its - own PROVIDES list, it is unnecessary to add aliases with the "+=" operator; - using a simple assignment will be sufficient. In other words, - while you could write: - :: - - PROVIDES += "udev" - - - in the above, the "+=" is overkill and unnecessary. + A recipe's own recipe name (:term:`PN`) is always implicitly prepended + to `PROVIDES`, so while using "+=" in the above example may not be + strictly necessary it is recommended to avoid confusion. In addition to providing recipes under alternate names, the ``PROVIDES`` mechanism is also used to implement virtual targets. A diff --git a/poky/documentation/releases.rst b/poky/documentation/releases.rst index b40907202..c4865253f 100644 --- a/poky/documentation/releases.rst +++ b/poky/documentation/releases.rst @@ -10,6 +10,7 @@ - :yocto_docs:`3.2 Documentation </3.2>` - :yocto_docs:`3.2.1 Documentation </3.2.1>` +- :yocto_docs:`3.2.2 Documentation </3.2.2>` **************************** 3.1 'dunfell' Release Series @@ -20,6 +21,8 @@ - :yocto_docs:`3.1.2 Documentation </3.1.2>` - :yocto_docs:`3.1.3 Documentation </3.1.3>` - :yocto_docs:`3.1.4 Documentation </3.1.4>` +- :yocto_docs:`3.1.5 Documentation </3.1.5>` +- :yocto_docs:`3.1.6 Documentation </3.1.6>` ========================== Previous Release Manuals diff --git a/poky/documentation/sdk-manual/appendix-obtain.rst b/poky/documentation/sdk-manual/appendix-obtain.rst index cdfe2cc85..f158c244a 100644 --- a/poky/documentation/sdk-manual/appendix-obtain.rst +++ b/poky/documentation/sdk-manual/appendix-obtain.rst @@ -58,14 +58,14 @@ Follow these steps to locate and hand-install the toolchain: folder and download the following installer: :: - poky-glibc-x86_64-core-image-sato-core2-64-toolchain-ext-DISTRO.sh + poky-glibc-x86_64-core-image-sato-core2-64-toolchain-ext-&DISTRO;.sh 4. *Run the Installer:* Be sure you have execution privileges and run the installer. Following is an example from the ``Downloads`` directory: :: - $ ~/Downloads/poky-glibc-x86_64-core-image-sato-core2-64-toolchain-ext-DISTRO.sh + $ ~/Downloads/poky-glibc-x86_64-core-image-sato-core2-64-toolchain-ext-&DISTRO;.sh During execution of the script, you choose the root location for the toolchain. See the "`Installed Standard SDK Directory @@ -174,7 +174,7 @@ build the SDK installer. Follow these steps: :: $ cd ~/poky/build/tmp/deploy/sdk - $ ./poky-glibc-x86_64-core-image-sato-core2-64-toolchain-ext-DISTRO.sh + $ ./poky-glibc-x86_64-core-image-sato-core2-64-toolchain-ext-&DISTRO;.sh During execution of the script, you choose the root location for the toolchain. See the "`Installed Standard SDK Directory diff --git a/poky/documentation/sdk-manual/extensible.rst b/poky/documentation/sdk-manual/extensible.rst index c94213d6c..5962e9460 100644 --- a/poky/documentation/sdk-manual/extensible.rst +++ b/poky/documentation/sdk-manual/extensible.rst @@ -82,10 +82,10 @@ is the general form: For example, the following SDK installer is for a 64-bit development host system and a i586-tuned target architecture based off -the SDK for ``core-image-sato`` and using the current DISTRO snapshot: +the SDK for ``core-image-sato`` and using the current &DISTRO; snapshot: :: - poky-glibc-x86_64-core-image-sato-i586-toolchain-ext-DISTRO.sh + poky-glibc-x86_64-core-image-sato-i586-toolchain-ext-&DISTRO;.sh .. note:: diff --git a/poky/documentation/sdk-manual/working-projects.rst b/poky/documentation/sdk-manual/working-projects.rst index 3e40936ff..bddf00a7d 100644 --- a/poky/documentation/sdk-manual/working-projects.rst +++ b/poky/documentation/sdk-manual/working-projects.rst @@ -292,11 +292,11 @@ example: the string "environment-setup" and contains the machine architecture, which is followed by the string "poky-linux". For this example, the command sources a script from the default SDK installation directory - that uses the 32-bit Intel x86 Architecture and the DISTRO_NAME Yocto + that uses the 32-bit Intel x86 Architecture and the &DISTRO_NAME; Yocto Project release: :: - $ source /opt/poky/DISTRO/environment-setup-i586-poky-linux + $ source /opt/poky/&DISTRO;/environment-setup-i586-poky-linux 3. *Create the Makefile:* For this example, the Makefile contains two lines that can be used to set the ``CC`` variable. One line is diff --git a/poky/documentation/sphinx-static/switchers.js b/poky/documentation/sphinx-static/switchers.js index 754de2e6a..a7c348a7b 100644 --- a/poky/documentation/sphinx-static/switchers.js +++ b/poky/documentation/sphinx-static/switchers.js @@ -3,8 +3,8 @@ var all_versions = { 'dev': 'dev (3.3)', - '3.2.1': '3.2.1', - '3.1.4': '3.1.4', + '3.2.2': '3.2.2', + '3.1.6': '3.1.6', '3.0.4': '3.0.4', '2.7.4': '2.7.4', }; diff --git a/poky/meta-poky/conf/local.conf.sample.extended b/poky/meta-poky/conf/local.conf.sample.extended index 62415a43e..ba1d0973b 100644 --- a/poky/meta-poky/conf/local.conf.sample.extended +++ b/poky/meta-poky/conf/local.conf.sample.extended @@ -23,6 +23,13 @@ # # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would # be appropriate for example. +# +# Some users are behind firewalls or use servers where the number of parallel connections +# is limited. In such cases you can limit the number of fetch tasks which run in parallel by +# setting the option below, in this case limiting to a maximum of 4 fetch tasks in parallel: +# +#do_fetch[number_threads] = "4" +# # If you want to get an image based on directfb without x11 alter # DISTRO_FEATURES: @@ -87,10 +94,7 @@ DISTRO_FEATURES_remove = "x11" # PACKAGE_DEBUG_SPLIT_STYLE = 'debug-file-directory' # Uncomment these to build a package such that you can use gprof to profile it. -# NOTE: This will only work with 'linux' targets, not -# 'linux-uclibc', as uClibc doesn't provide the necessary -# object files. Also, don't build glibc itself with these -# flags, or it'll fail to build. +# NOTE: Don't build glibc itself with these flags, or it'll fail to build. # # PROFILE_OPTIMIZATION = "-pg" # SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}" @@ -188,7 +192,8 @@ DISTRO_FEATURES_remove = "x11" # commercial_lame \ # commercial_libmad \ # commercial_libomxil \ -# commercial_mpeg2dec" +# commercial_mpeg2dec \ +# commercial_qmmp" # @@ -325,7 +330,7 @@ DISTRO_FEATURES_remove = "x11" # The INITRAMFS_IMAGE image variable will cause an additional recipe to # be built as a dependency to the what ever rootfs recipe you might be # using such as core-image-sato. The initramfs might be needed for -# the initial boot of of the target system such as to load kernel +# the initial boot of the target system such as to load kernel # modules prior to mounting the root file system. # # INITRAMFS_IMAGE_BUNDLE variable controls if the image recipe @@ -365,20 +370,23 @@ DISTRO_FEATURES_remove = "x11" # # -# Use busybox/mdev for system initialization +# System initialization +# +#INIT_MANAGER = "none" +#INIT_MANAGER = "sysvinit" +#INIT_MANAGER = "systemd" +#INIT_MANAGER = "mdev-busybox" + +# +# Use a full set of packages instead of busybox for base utils # -#VIRTUAL-RUNTIME_dev_manager = "busybox-mdev" -#VIRTUAL-RUNTIME_login_manager = "busybox" -#VIRTUAL-RUNTIME_init_manager = "busybox" -#VIRTUAL-RUNTIME_initscripts = "initscripts" -#VIRTUAL-RUNTIME_keymaps = "keymaps" -#DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" +#PREFERRED_PROVIDER_base-utils = "packagegroup-core-base-utils" +#VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils" +#VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock" +#VIRTUAL-RUNTIME_base-utils-syslog = "syslog" # -# Use systemd for system initialization +# Enable LTO system-wide # -#DISTRO_FEATURES_append = " systemd" -#DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" -#VIRTUAL-RUNTIME_login_manager = "shadow-base" -#VIRTUAL-RUNTIME_init_manager = "systemd" -#VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" +#require conf/distro/include/lto.inc +#DISTRO_FEATURES_append = " lto" diff --git a/poky/meta-selftest/files/static-group b/poky/meta-selftest/files/static-group index 892231b6e..b2e0e2f87 100644 --- a/poky/meta-selftest/files/static-group +++ b/poky/meta-selftest/files/static-group @@ -19,3 +19,7 @@ tracing:x:519: pulse:x:520: bind:x:521: builder:x:522: +_apt:x:523: +weston-launch:x:524: +weston:x:525: +wayland:x:526: diff --git a/poky/meta-selftest/files/static-passwd b/poky/meta-selftest/files/static-passwd index babbfbc9d..2cfd0c9b4 100644 --- a/poky/meta-selftest/files/static-passwd +++ b/poky/meta-selftest/files/static-passwd @@ -15,3 +15,5 @@ sshd:x:516:516::/:/bin/nologin pulse:x:520:520::/:/bin/nologin bind:x:521:521::/:/bin/nologin builder:x:522:522::/:/bin/nologin +_apt:x:523:523::/:/bin/nologin +weston:x:525:525::/:/bin/nologin diff --git a/poky/meta-selftest/recipes-test/license/incompatible-license.bb b/poky/meta-selftest/recipes-test/license/incompatible-license.bb index 1728ad76b..282f5c287 100644 --- a/poky/meta-selftest/recipes-test/license/incompatible-license.bb +++ b/poky/meta-selftest/recipes-test/license/incompatible-license.bb @@ -1,3 +1,3 @@ SUMMARY = "Recipe with an SPDX license" DESCRIPTION = "Is licensed with an SPDX license to be used for testing" -LICENSE = "GPL-3.0" +LICENSE = "GPL-3.0-only" diff --git a/poky/meta-selftest/recipes-test/license/incompatible-licenses.bb b/poky/meta-selftest/recipes-test/license/incompatible-licenses.bb index 9c1545efb..ab3b58d2c 100644 --- a/poky/meta-selftest/recipes-test/license/incompatible-licenses.bb +++ b/poky/meta-selftest/recipes-test/license/incompatible-licenses.bb @@ -1,3 +1,3 @@ SUMMARY = "Recipe with multiple SPDX licenses" DESCRIPTION = "Is licensed with multiple SPDX licenses to be used for testing" -LICENSE = "GPL-2.0 & GPL-3.0 & LGPL-3.0" +LICENSE = "GPL-2.0-only & GPL-3.0 & LGPL-3.0-only" diff --git a/poky/meta-yocto-bsp/conf/layer.conf b/poky/meta-yocto-bsp/conf/layer.conf index eb9f55ea9..bf0c1bfec 100644 --- a/poky/meta-yocto-bsp/conf/layer.conf +++ b/poky/meta-yocto-bsp/conf/layer.conf @@ -5,12 +5,6 @@ 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 523472ab1..f8368ebd0 100644 --- a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -24,7 +24,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.8%" +PREFERRED_VERSION_linux-yocto ?= "5.10%" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" diff --git a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf index 75bc5e5f2..fbe33be9d 100644 --- a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -11,7 +11,7 @@ KERNEL_ALT_IMAGETYPE = "vmlinux.bin" KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.8%" +PREFERRED_VERSION_linux-yocto ?= "5.10%" SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" diff --git a/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index a6c396c79..1de069011 100644 --- a/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -2,6 +2,7 @@ include conf/machine/include/x86-base.inc require conf/machine/include/qemuboot-x86.inc MACHINE_FEATURES += "wifi efi pcbios" +PREFERRED_VERSION_linux-yocto ?= "5.10%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "${XSERVER_X86_BASE} \ diff --git a/poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb b/poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb index 00680de89..8f10bd239 100644 --- a/poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb +++ b/poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Intel gma500_gfx fix for certain hardware" DESCRIPTION = "Avoid inserting gma500_gfx module for certain hardware devices." LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://gma500-gfx-check.conf \ file://gma500-gfx-check.sh " diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend new file mode 100644 index 000000000..87e47352a --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend @@ -0,0 +1,23 @@ +KBRANCH_genericx86 = "v5.10/standard/base" +KBRANCH_genericx86-64 = "v5.10/standard/base" +KBRANCH_edgerouter = "v5.10/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v5.10/standard/beaglebone" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" +SRCREV_machine_genericx86-64 ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" +SRCREV_machine_edgerouter ?= "2e1fb8f84f09ca768eb531f33a126a40bb90e791" +SRCREV_machine_beaglebone-yocto ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" + +COMPATIBLE_MACHINE_genericx86 = "genericx86" +COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" + +LINUX_VERSION_genericx86 = "5.10.12" +LINUX_VERSION_genericx86-64 = "5.10.12" +LINUX_VERSION_edgerouter = "5.10.12" +LINUX_VERSION_beaglebone-yocto = "5.10.12" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend index 4ee895dbd..35147d2da 100644 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend @@ -7,8 +7,8 @@ KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KMACHINE_beaglebone-yocto ?= "beaglebone" -SRCREV_machine_genericx86 ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" -SRCREV_machine_genericx86-64 ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" +SRCREV_machine_genericx86 ?= "31db2b47ac7d8508080fbb7344399b501216de66" +SRCREV_machine_genericx86-64 ?= "31db2b47ac7d8508080fbb7344399b501216de66" SRCREV_machine_edgerouter ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" SRCREV_machine_beaglebone-yocto ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" @@ -17,7 +17,7 @@ COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" -LINUX_VERSION_genericx86 = "5.4.69" -LINUX_VERSION_genericx86-64 = "5.4.69" +LINUX_VERSION_genericx86 = "5.4.94" +LINUX_VERSION_genericx86-64 = "5.4.94" LINUX_VERSION_edgerouter = "5.4.58" LINUX_VERSION_beaglebone-yocto = "5.4.58" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend deleted file mode 100644 index a04f332cf..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend +++ /dev/null @@ -1,23 +0,0 @@ -KBRANCH_genericx86 = "v5.8/standard/base" -KBRANCH_genericx86-64 = "v5.8/standard/base" -KBRANCH_edgerouter = "v5.8/standard/edgerouter" -KBRANCH_beaglebone-yocto = "v5.8/standard/beaglebone" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KMACHINE_beaglebone-yocto ?= "beaglebone" - -SRCREV_machine_genericx86 ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" -SRCREV_machine_genericx86-64 ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" -SRCREV_machine_edgerouter ?= "912adf166eb0688e011154048f5fa0e5863249c3" -SRCREV_machine_beaglebone-yocto ?= "912adf166eb0688e011154048f5fa0e5863249c3" - -COMPATIBLE_MACHINE_genericx86 = "genericx86" -COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" -COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" - -LINUX_VERSION_genericx86 = "5.8.13" -LINUX_VERSION_genericx86-64 = "5.8.13" -LINUX_VERSION_edgerouter = "5.8.2" -LINUX_VERSION_beaglebone-yocto = "5.8.2" diff --git a/poky/meta/classes/autotools.bbclass b/poky/meta/classes/autotools.bbclass index 2ceb790b5..9dc8ebdaa 100644 --- a/poky/meta/classes/autotools.bbclass +++ b/poky/meta/classes/autotools.bbclass @@ -17,7 +17,7 @@ def autotools_dep_prepend(d): and not d.getVar('INHIBIT_DEFAULT_DEPS'): deps += 'libtool-cross ' - return deps + 'gnu-config-native ' + return deps DEPENDS_prepend = "${@autotools_dep_prepend(d)} " @@ -30,7 +30,7 @@ inherit siteinfo export CONFIG_SITE acpaths ?= "default" -EXTRA_AUTORECONF = "--exclude=autopoint" +EXTRA_AUTORECONF = "--exclude=autopoint --exclude=gtkdocize" export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir}" @@ -215,21 +215,13 @@ autotools_do_configure() { PRUNE_M4="$PRUNE_M4 gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4" fi mkdir -p m4 - if grep -q "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC; then - if ! echo "${DEPENDS}" | grep -q intltool-native; then - bbwarn "Missing DEPENDS on intltool-native" - fi - PRUNE_M4="$PRUNE_M4 intltool.m4" - bbnote Executing intltoolize --copy --force --automake - intltoolize --copy --force --automake - fi for i in $PRUNE_M4; do find ${S} -ignore_readdir_race -name $i -delete done bbnote Executing ACLOCAL=\"$ACLOCAL\" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths - ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || die "autoreconf execution failed." + ACLOCAL="$ACLOCAL" autoreconf -Wcross -Wno-obsolete --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || die "autoreconf execution failed." cd $olddir fi if [ -e ${CONFIGURE_SCRIPT} ]; then diff --git a/poky/meta/classes/baremetal-image.bbclass b/poky/meta/classes/baremetal-image.bbclass index 90d58f261..b0f5e885b 100644 --- a/poky/meta/classes/baremetal-image.bbclass +++ b/poky/meta/classes/baremetal-image.bbclass @@ -56,7 +56,6 @@ python do_rootfs(){ # Assure binaries, manifest and qemubootconf are populated on DEPLOY_DIR_IMAGE do_image_complete[dirs] = "${TOPDIR}" -do_image_complete[umask] = "022" SSTATETASKS += "do_image_complete" SSTATE_SKIP_CREATION_task-image-complete = '1' do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}" diff --git a/poky/meta/classes/base.bbclass b/poky/meta/classes/base.bbclass index 78ae28bb0..b4160402f 100644 --- a/poky/meta/classes/base.bbclass +++ b/poky/meta/classes/base.bbclass @@ -506,15 +506,10 @@ python () { # in order to capture permissions, owners, groups and special files if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): d.appendVarFlag('do_prepare_recipe_sysroot', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') - d.setVarFlag('do_unpack', 'umask', '022') - d.setVarFlag('do_configure', 'umask', '022') - d.setVarFlag('do_compile', 'umask', '022') d.appendVarFlag('do_install', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') d.setVarFlag('do_install', 'fakeroot', '1') - d.setVarFlag('do_install', 'umask', '022') d.appendVarFlag('do_package', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') d.setVarFlag('do_package', 'fakeroot', '1') - d.setVarFlag('do_package', 'umask', '022') d.setVarFlag('do_package_setscene', 'fakeroot', '1') d.appendVarFlag('do_package_setscene', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') d.setVarFlag('do_devshell', 'fakeroot', '1') @@ -596,62 +591,62 @@ python () { needsrcrev = False srcuri = d.getVar('SRC_URI') - for uri in srcuri.split(): - (scheme, _ , path) = bb.fetch.decodeurl(uri)[:3] + for uri_string in srcuri.split(): + uri = bb.fetch.URI(uri_string) # HTTP/FTP use the wget fetcher - if scheme in ("http", "https", "ftp"): + if uri.scheme in ("http", "https", "ftp"): d.appendVarFlag('do_fetch', 'depends', ' wget-native:do_populate_sysroot') # Svn packages should DEPEND on subversion-native - if scheme == "svn": + if uri.scheme == "svn": needsrcrev = True d.appendVarFlag('do_fetch', 'depends', ' subversion-native:do_populate_sysroot') # Git packages should DEPEND on git-native - elif scheme in ("git", "gitsm"): + elif uri.scheme in ("git", "gitsm"): needsrcrev = True d.appendVarFlag('do_fetch', 'depends', ' git-native:do_populate_sysroot') # Mercurial packages should DEPEND on mercurial-native - elif scheme == "hg": + elif uri.scheme == "hg": needsrcrev = True d.appendVar("EXTRANATIVEPATH", ' python3-native ') d.appendVarFlag('do_fetch', 'depends', ' mercurial-native:do_populate_sysroot') # Perforce packages support SRCREV = "${AUTOREV}" - elif scheme == "p4": + elif uri.scheme == "p4": needsrcrev = True # OSC packages should DEPEND on osc-native - elif scheme == "osc": + elif uri.scheme == "osc": d.appendVarFlag('do_fetch', 'depends', ' osc-native:do_populate_sysroot') - elif scheme == "npm": + elif uri.scheme == "npm": d.appendVarFlag('do_fetch', 'depends', ' nodejs-native:do_populate_sysroot') # *.lz4 should DEPEND on lz4-native for unpacking - if path.endswith('.lz4'): + if uri.path.endswith('.lz4'): d.appendVarFlag('do_unpack', 'depends', ' lz4-native:do_populate_sysroot') # *.lz should DEPEND on lzip-native for unpacking - elif path.endswith('.lz'): + elif uri.path.endswith('.lz'): d.appendVarFlag('do_unpack', 'depends', ' lzip-native:do_populate_sysroot') # *.xz should DEPEND on xz-native for unpacking - elif path.endswith('.xz') or path.endswith('.txz'): + elif uri.path.endswith('.xz') or uri.path.endswith('.txz'): d.appendVarFlag('do_unpack', 'depends', ' xz-native:do_populate_sysroot') # .zip should DEPEND on unzip-native for unpacking - elif path.endswith('.zip') or path.endswith('.jar'): + elif uri.path.endswith('.zip') or uri.path.endswith('.jar'): d.appendVarFlag('do_unpack', 'depends', ' unzip-native:do_populate_sysroot') # Some rpm files may be compressed internally using xz (for example, rpms from Fedora) - elif path.endswith('.rpm'): + elif uri.path.endswith('.rpm'): d.appendVarFlag('do_unpack', 'depends', ' xz-native:do_populate_sysroot') # *.deb should DEPEND on xz-native for unpacking - elif path.endswith('.deb'): + elif uri.path.endswith('.deb'): d.appendVarFlag('do_unpack', 'depends', ' xz-native:do_populate_sysroot') if needsrcrev: diff --git a/poky/meta/classes/buildhistory.bbclass b/poky/meta/classes/buildhistory.bbclass index daae05614..117a44eaf 100644 --- a/poky/meta/classes/buildhistory.bbclass +++ b/poky/meta/classes/buildhistory.bbclass @@ -859,7 +859,7 @@ END } python buildhistory_eventhandler() { - if e.data.getVar('BUILDHISTORY_FEATURES').strip(): + if (e.data.getVar('BUILDHISTORY_FEATURES') or "").strip(): reset = e.data.getVar("BUILDHISTORY_RESET") olddir = e.data.getVar("BUILDHISTORY_OLD_DIR") if isinstance(e, bb.event.BuildStarted): diff --git a/poky/meta/classes/buildstats.bbclass b/poky/meta/classes/buildstats.bbclass index 6f8718723..a8ee6e69a 100644 --- a/poky/meta/classes/buildstats.bbclass +++ b/poky/meta/classes/buildstats.bbclass @@ -104,14 +104,46 @@ def write_task_data(status, logfile, e, d): f.write("Status: FAILED \n") f.write("Ended: %0.2f \n" % e.time) +def write_host_data(logfile, e, d): + import subprocess, os, datetime + cmds = d.getVar('BB_LOG_HOST_STAT_CMDS') + if cmds is None: + d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") + d.setVar("BB_LOG_HOST_STAT_ON_FAILURE", "0") + bb.warn("buildstats: Collecting host data failed. Set BB_LOG_HOST_STAT_CMDS=\"command1 ; command2 ; ... \" in conf\/local.conf\n") + return + path = d.getVar("PATH") + opath = d.getVar("BB_ORIGENV", False).getVar("PATH") + ospath = os.environ['PATH'] + os.environ['PATH'] = path + ":" + opath + ":" + ospath + with open(logfile, "a") as f: + f.write("Event Time: %f\nDate: %s\n" % (e.time, datetime.datetime.now())) + for cmd in cmds.split(";"): + if len(cmd) == 0: + continue + try: + output = subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT, timeout=1).decode('utf-8') + except (subprocess.CalledProcessError, subprocess.TimeoutExpired, FileNotFoundError) as err: + output = "Error running command: %s\n%s\n" % (cmd, err) + f.write("%s\n%s\n" % (cmd, output)) + os.environ['PATH'] = ospath + python run_buildstats () { import bb.build import bb.event import time, subprocess, platform bn = d.getVar('BUILDNAME') - bsdir = os.path.join(d.getVar('BUILDSTATS_BASE'), bn) - taskdir = os.path.join(bsdir, d.getVar('PF')) + ######################################################################## + # bitbake fires HeartbeatEvent even before a build has been + # triggered, causing BUILDNAME to be None + ######################################################################## + if bn is not None: + bsdir = os.path.join(d.getVar('BUILDSTATS_BASE'), bn) + taskdir = os.path.join(bsdir, d.getVar('PF')) + if isinstance(e, bb.event.HeartbeatEvent) and bb.utils.to_boolean(d.getVar("BB_LOG_HOST_STAT_ON_INTERVAL")): + bb.utils.mkdirhier(bsdir) + write_host_data(os.path.join(bsdir, "host_stats"), e, d) if isinstance(e, bb.event.BuildStarted): ######################################################################## @@ -186,10 +218,12 @@ python run_buildstats () { build_status = os.path.join(bsdir, "build_stats") with open(build_status, "a") as f: f.write(d.expand("Failed at: ${PF} at task: %s \n" % e.task)) + if bb.utils.to_boolean(d.getVar("BB_LOG_HOST_STAT_ON_FAILURE")): + write_host_data(build_status, e, d) } addhandler run_buildstats -run_buildstats[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.build.TaskStarted bb.build.TaskSucceeded bb.build.TaskFailed" +run_buildstats[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.event.HeartbeatEvent bb.build.TaskStarted bb.build.TaskSucceeded bb.build.TaskFailed" python runqueue_stats () { import buildstats diff --git a/poky/meta/classes/ccache.bbclass b/poky/meta/classes/ccache.bbclass index f00fafc29..4532894c5 100644 --- a/poky/meta/classes/ccache.bbclass +++ b/poky/meta/classes/ccache.bbclass @@ -1,7 +1,5 @@ # # 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" @@ -51,8 +49,9 @@ python() { """ pn = d.getVar('PN') # quilt-native doesn't need ccache since no c files - if not (pn in ('ccache-native', 'quilt-native') or + if not (bb.data.inherits_class("native", d) or bb.utils.to_boolean(d.getVar('CCACHE_DISABLE'))): + d.appendVar('DEPENDS', ' ccache-native') d.setVar('CCACHE', 'ccache ') } diff --git a/poky/meta/classes/cmake.bbclass b/poky/meta/classes/cmake.bbclass index 7c055e8a3..4af22268b 100644 --- a/poky/meta/classes/cmake.bbclass +++ b/poky/meta/classes/cmake.bbclass @@ -187,6 +187,7 @@ cmake_do_configure() { -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \ + -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON \ ${EXTRA_OECMAKE} \ -Wno-dev } diff --git a/poky/meta/classes/cve-check.bbclass b/poky/meta/classes/cve-check.bbclass index d843e7c4a..112ee3379 100644 --- a/poky/meta/classes/cve-check.bbclass +++ b/poky/meta/classes/cve-check.bbclass @@ -53,6 +53,16 @@ CVE_CHECK_PN_WHITELIST ?= "" # CVE_CHECK_WHITELIST ?= "" +# Layers to be excluded +CVE_CHECK_LAYER_EXCLUDELIST ??= "" + +# Layers to be included +CVE_CHECK_LAYER_INCLUDELIST ??= "" + + +# set to "alphabetical" for version using single alphabetical character as increament release +CVE_VERSION_SUFFIX ??= "" + python cve_save_summary_handler () { import shutil import datetime @@ -206,10 +216,11 @@ def check_cves(d, patched_cves): """ Connect to the NVD database and find unpatched cves. """ - from distutils.version import LooseVersion + from oe.cve_check import Version pn = d.getVar("PN") real_pv = d.getVar("PV") + suffix = d.getVar("CVE_VERSION_SUFFIX") cves_unpatched = [] # CVE_PRODUCT can contain more than one product (eg. curl/libcurl) @@ -263,8 +274,8 @@ def check_cves(d, patched_cves): else: if operator_start: try: - vulnerable_start = (operator_start == '>=' and LooseVersion(pv) >= LooseVersion(version_start)) - vulnerable_start |= (operator_start == '>' and LooseVersion(pv) > LooseVersion(version_start)) + vulnerable_start = (operator_start == '>=' and Version(pv,suffix) >= Version(version_start,suffix)) + vulnerable_start |= (operator_start == '>' and Version(pv,suffix) > Version(version_start,suffix)) except: bb.warn("%s: Failed to compare %s %s %s for %s" % (product, pv, operator_start, version_start, cve)) @@ -274,8 +285,8 @@ def check_cves(d, patched_cves): if operator_end: try: - vulnerable_end = (operator_end == '<=' and LooseVersion(pv) <= LooseVersion(version_end)) - vulnerable_end |= (operator_end == '<' and LooseVersion(pv) < LooseVersion(version_end)) + vulnerable_end = (operator_end == '<=' and Version(pv,suffix) <= Version(version_end,suffix) ) + vulnerable_end |= (operator_end == '<' and Version(pv,suffix) < Version(version_end,suffix) ) except: bb.warn("%s: Failed to compare %s %s %s for %s" % (product, pv, operator_end, version_end, cve)) @@ -330,7 +341,20 @@ def cve_write_data(d, patched, unpatched, whitelisted, cve_data): CVE manifest if enabled. """ + cve_file = d.getVar("CVE_CHECK_LOG") + fdir_name = d.getVar("FILE_DIRNAME") + layer = fdir_name.split("/")[-3] + + include_layers = d.getVar("CVE_CHECK_LAYER_INCLUDELIST").split() + exclude_layers = d.getVar("CVE_CHECK_LAYER_EXCLUDELIST").split() + + if exclude_layers and layer in exclude_layers: + return + + if include_layers and layer not in include_layers: + return + nvd_link = "https://web.nvd.nist.gov/view/vuln/detail?vulnId=" write_string = "" unpatched_cves = [] @@ -340,6 +364,7 @@ def cve_write_data(d, patched, unpatched, whitelisted, cve_data): is_patched = cve in patched if is_patched and (d.getVar("CVE_CHECK_REPORT_PATCHED") != "1"): continue + write_string += "LAYER: %s\n" % layer write_string += "PACKAGE NAME: %s\n" % d.getVar("PN") write_string += "PACKAGE VERSION: %s%s\n" % (d.getVar("EXTENDPE"), d.getVar("PV")) write_string += "CVE: %s\n" % cve diff --git a/poky/meta/classes/devicetree.bbclass b/poky/meta/classes/devicetree.bbclass index c772ab2ab..ece883acc 100644 --- a/poky/meta/classes/devicetree.bbclass +++ b/poky/meta/classes/devicetree.bbclass @@ -18,7 +18,7 @@ SECTION ?= "bsp" # device trees built with them are at least GPLv2 (and in some cases dual # licensed). Default to GPLv2 if the recipe does not specify a license. LICENSE ?= "GPLv2" -LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "dtc-native" diff --git a/poky/meta/classes/distutils3-base.bbclass b/poky/meta/classes/distutils3-base.bbclass index a277d1c7b..302ee8c82 100644 --- a/poky/meta/classes/distutils3-base.bbclass +++ b/poky/meta/classes/distutils3-base.bbclass @@ -1,4 +1,5 @@ -DEPENDS += "${@["${PYTHON_PN}-native ${PYTHON_PN}", ""][(d.getVar('PACKAGES') == '')]}" +DEPENDS_append_class-target = " ${PYTHON_PN}-native ${PYTHON_PN}" +DEPENDS_append_class-nativesdk = " ${PYTHON_PN}-native ${PYTHON_PN}" RDEPENDS_${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}" inherit distutils-common-base python3native python3targetconfig diff --git a/poky/meta/classes/externalsrc.bbclass b/poky/meta/classes/externalsrc.bbclass index dd0939578..c7b2bf2f4 100644 --- a/poky/meta/classes/externalsrc.bbclass +++ b/poky/meta/classes/externalsrc.bbclass @@ -68,6 +68,7 @@ python () { url_data = fetch.ud[url] parm = url_data.parm if (url_data.type == 'file' or + url_data.type == 'npmsw' or 'type' in parm and parm['type'] == 'kmeta'): local_srcuri.append(url) @@ -190,6 +191,7 @@ def srctree_hash_files(d, srcdir=None): import shutil import subprocess import tempfile + import hashlib s_dir = srcdir or d.getVar('EXTERNALSRC') git_dir = None @@ -197,6 +199,10 @@ def srctree_hash_files(d, srcdir=None): try: git_dir = os.path.join(s_dir, subprocess.check_output(['git', '-C', s_dir, 'rev-parse', '--git-dir'], stderr=subprocess.DEVNULL).decode("utf-8").rstrip()) + top_git_dir = os.path.join(s_dir, subprocess.check_output(['git', '-C', d.getVar("TOPDIR"), 'rev-parse', '--git-dir'], + stderr=subprocess.DEVNULL).decode("utf-8").rstrip()) + if git_dir == top_git_dir: + git_dir = None except subprocess.CalledProcessError: pass @@ -210,7 +216,16 @@ def srctree_hash_files(d, srcdir=None): env = os.environ.copy() env['GIT_INDEX_FILE'] = tmp_index.name subprocess.check_output(['git', 'add', '-A', '.'], cwd=s_dir, env=env) - sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8") + git_sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8") + submodule_helper = subprocess.check_output(['git', 'submodule--helper', 'list'], cwd=s_dir, env=env).decode("utf-8") + for line in submodule_helper.splitlines(): + module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1]) + proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + proc.communicate() + proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) + stdout, _ = proc.communicate() + git_sha1 += stdout.decode("utf-8") + sha1 = hashlib.sha1(git_sha1.encode("utf-8")).hexdigest() with open(oe_hash_file, 'w') as fobj: fobj.write(sha1) ret = oe_hash_file + ':True' diff --git a/poky/meta/classes/go.bbclass b/poky/meta/classes/go.bbclass index 5b26378a4..77ec98dd5 100644 --- a/poky/meta/classes/go.bbclass +++ b/poky/meta/classes/go.bbclass @@ -54,7 +54,6 @@ GOTOOLDIR_class-native = "${STAGING_LIBDIR_NATIVE}/go/pkg/tool/${BUILD_GOTUPLE}" export GOTOOLDIR export CGO_ENABLED ?= "1" -export CGO_ENABLED_riscv64 = "0" export CGO_CFLAGS ?= "${CFLAGS}" export CGO_CPPFLAGS ?= "${CPPFLAGS}" export CGO_CXXFLAGS ?= "${CXXFLAGS}" @@ -116,7 +115,8 @@ go_do_install() { install -d ${D}${libdir}/go/src/${GO_IMPORT} tar -C ${S}/src/${GO_IMPORT} -cf - --exclude-vcs --exclude '*.test' --exclude 'testdata' . | \ tar -C ${D}${libdir}/go/src/${GO_IMPORT} --no-same-owner -xf - - tar -C ${B} -cf - --exclude-vcs pkg | tar -C ${D}${libdir}/go --no-same-owner -xf - + tar -C ${B} -cf - --exclude-vcs --exclude '*.test' --exclude 'testdata' pkg | \ + tar -C ${D}${libdir}/go --no-same-owner -xf - if [ -n "`ls ${B}/${GO_BUILD_BINDIR}/`" ]; then install -d ${D}${bindir} @@ -146,10 +146,10 @@ FILES_${PN}-staticdev = "${libdir}/go/pkg" INSANE_SKIP_${PN} += "ldflags" # Add -buildmode=pie to GOBUILDFLAGS to satisfy "textrel" QA checking, but mips -# doesn't support -buildmode=pie, so skip the QA checking for mips and its +# doesn't support -buildmode=pie, so skip the QA checking for mips/rv32 and its # variants. python() { - if 'mips' in d.getVar('TARGET_ARCH') or 'riscv' in d.getVar('TARGET_ARCH'): + if 'mips' in d.getVar('TARGET_ARCH') or 'riscv32' in d.getVar('TARGET_ARCH'): d.appendVar('INSANE_SKIP_%s' % d.getVar('PN'), " textrel") else: d.appendVar('GOBUILDFLAGS', ' -buildmode=pie') diff --git a/poky/meta/classes/goarch.bbclass b/poky/meta/classes/goarch.bbclass index 1099b9576..e4e0ca37b 100644 --- a/poky/meta/classes/goarch.bbclass +++ b/poky/meta/classes/goarch.bbclass @@ -47,7 +47,6 @@ COMPATIBLE_HOST_linux-gnux32 = "null" COMPATIBLE_HOST_linux-muslx32 = "null" COMPATIBLE_HOST_powerpc = "null" COMPATIBLE_HOST_powerpc64 = "null" -COMPATIBLE_HOST_powerpc64le = "null" COMPATIBLE_HOST_mipsarchn32 = "null" ARM_INSTRUCTION_SET_armv4 = "arm" @@ -79,10 +78,10 @@ def go_map_arch(a, d): return 'mips' elif a == 'mipsel': return 'mipsle' + elif re.match('p(pc|owerpc)(64le)', a): + return 'ppc64le' elif re.match('p(pc|owerpc)(64)', a): return 'ppc64' - elif re.match('p(pc|owerpc)(64el)', a): - return 'ppc64le' elif a == 'riscv64': return 'riscv64' else: @@ -99,7 +98,7 @@ def go_map_386(a, f, d): if ('core2' in f) or ('corei7' in f): return 'sse2' else: - return '387' + return 'softfloat' return '' def go_map_mips(a, f, d): @@ -115,5 +114,3 @@ def go_map_os(o, d): if o.startswith('linux'): return 'linux' return o - - diff --git a/poky/meta/classes/gtk-doc.bbclass b/poky/meta/classes/gtk-doc.bbclass index 7dd662bf8..ef99e63fa 100644 --- a/poky/meta/classes/gtk-doc.bbclass +++ b/poky/meta/classes/gtk-doc.bbclass @@ -7,6 +7,7 @@ # # It should be used in recipes to determine whether gtk-doc based documentation should be built, # so that qemu use can be avoided when necessary. +GTKDOC_ENABLED_class-native = "False" GTKDOC_ENABLED ?= "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', \ bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d), 'False', d)}" diff --git a/poky/meta/classes/image-live.bbclass b/poky/meta/classes/image-live.bbclass index 9ea5ddc31..1b2183ead 100644 --- a/poky/meta/classes/image-live.bbclass +++ b/poky/meta/classes/image-live.bbclass @@ -234,7 +234,7 @@ build_hddimg() { bberror "${HDDDIR}/rootfs.img rootfs size is greather than or equal to 4GB," bberror "and this doesn't work on a FAT filesystem. You can either:" bberror "1) Reduce the size of rootfs.img, or," - bbfatal "2) Use wic, vmdk or vdi instead of hddimg\n" + bbfatal "2) Use wic, vmdk,vhd, vhdx or vdi instead of hddimg\n" fi fi diff --git a/poky/meta/classes/image.bbclass b/poky/meta/classes/image.bbclass index 045f4494c..41fc32917 100644 --- a/poky/meta/classes/image.bbclass +++ b/poky/meta/classes/image.bbclass @@ -33,7 +33,7 @@ INHIBIT_DEFAULT_DEPS = "1" # IMAGE_FEATURES may contain any available package group IMAGE_FEATURES ?= "" IMAGE_FEATURES[type] = "list" -IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs stateless-rootfs empty-root-password allow-empty-password allow-root-login post-install-logging" +IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs read-only-rootfs-delayed-postinsts stateless-rootfs empty-root-password allow-empty-password allow-root-login post-install-logging" # Generate companion debugfs? IMAGE_GEN_DEBUGFS ?= "0" @@ -180,6 +180,8 @@ IMAGE_LOCALES_ARCHIVE ?= '1' # aren't yet available. PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}" +PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/intercept_scripts,${WORKDIR}/oe-rootfs-repo,${WORKDIR}/sstate-build-image_complete" + PACKAGE_EXCLUDE ??= "" PACKAGE_EXCLUDE[type] = "list" @@ -248,7 +250,6 @@ fakeroot python do_rootfs () { } do_rootfs[dirs] = "${TOPDIR}" do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}" -do_rootfs[umask] = "022" do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}" addtask rootfs after do_prepare_recipe_sysroot @@ -261,7 +262,6 @@ fakeroot python do_image () { execute_pre_post_process(d, pre_process_cmds) } do_image[dirs] = "${TOPDIR}" -do_image[umask] = "022" addtask do_image after do_rootfs fakeroot python do_image_complete () { @@ -272,7 +272,6 @@ fakeroot python do_image_complete () { execute_pre_post_process(d, post_process_cmds) } do_image_complete[dirs] = "${TOPDIR}" -do_image_complete[umask] = "022" SSTATETASKS += "do_image_complete" SSTATE_SKIP_CREATION_task-image-complete = '1' do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}" diff --git a/poky/meta/classes/image_types.bbclass b/poky/meta/classes/image_types.bbclass index 286009057..802869140 100644 --- a/poky/meta/classes/image_types.bbclass +++ b/poky/meta/classes/image_types.bbclass @@ -110,7 +110,7 @@ IMAGE_CMD_squashfs-lz4 = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAM IMAGE_CMD_TAR ?= "tar" # ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs -IMAGE_CMD_tar = "${IMAGE_CMD_TAR} --sort=name --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]" +IMAGE_CMD_tar = "${IMAGE_CMD_TAR} --sort=name --format=posix --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]" do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" IMAGE_CMD_cpio () { @@ -269,7 +269,7 @@ IMAGE_TYPES = " \ # CONVERSION_CMD/DEPENDS. COMPRESSIONTYPES ?= "" -CONVERSIONTYPES = "gz bz2 lzma xz lz4 lzo zip zst sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap u-boot vmdk vdi qcow2 base64 ${COMPRESSIONTYPES}" +CONVERSIONTYPES = "gz bz2 lzma xz lz4 lzo zip zst sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap u-boot vmdk vhd vhdx vdi qcow2 base64 ${COMPRESSIONTYPES}" CONVERSION_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" CONVERSION_CMD_gz = "gzip -f -9 -n -c --rsyncable ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz" CONVERSION_CMD_bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" @@ -288,6 +288,8 @@ CONVERSION_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap" CONVERSION_CMD_u-boot = "mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C none -n ${IMAGE_NAME} -d ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.u-boot" CONVERSION_CMD_vmdk = "qemu-img convert -O vmdk ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vmdk" +CONVERSION_CMD_vhdx = "qemu-img convert -O vhdx -o subformat=dynamic ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vhdx" +CONVERSION_CMD_vhd = "qemu-img convert -O vpc -o subformat=fixed ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vhd" CONVERSION_CMD_vdi = "qemu-img convert -O vdi ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vdi" CONVERSION_CMD_qcow2 = "qemu-img convert -O qcow2 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qcow2" CONVERSION_CMD_base64 = "base64 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.base64" @@ -306,6 +308,8 @@ CONVERSION_DEPENDS_vmdk = "qemu-system-native" CONVERSION_DEPENDS_vdi = "qemu-system-native" CONVERSION_DEPENDS_qcow2 = "qemu-system-native" CONVERSION_DEPENDS_base64 = "coreutils-native" +CONVERSION_DEPENDS_vhdx = "qemu-system-native" +CONVERSION_DEPENDS_vhd = "qemu-system-native" RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4" RUNNABLE_MACHINE_PATTERNS ?= "qemu" @@ -313,7 +317,7 @@ RUNNABLE_MACHINE_PATTERNS ?= "qemu" DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso" # The IMAGE_TYPES_MASKED variable will be used to mask out from the IMAGE_FSTYPES, -# images that will not be built at do_rootfs time: vmdk, vdi, qcow2, hddimg, iso, etc. +# images that will not be built at do_rootfs time: vmdk, vhd, vhdx, vdi, qcow2, hddimg, iso, etc. IMAGE_TYPES_MASKED ?= "" # bmap requires python3 to be in the PATH diff --git a/poky/meta/classes/image_types_wic.bbclass b/poky/meta/classes/image_types_wic.bbclass index 286e0f5d5..49be1da77 100644 --- a/poky/meta/classes/image_types_wic.bbclass +++ b/poky/meta/classes/image_types_wic.bbclass @@ -3,7 +3,7 @@ WICVARS ?= "\ BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_EFI_BOOT_FILES IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ - ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ + ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS HOSTTOOLS_DIR \ KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND \ ASSUME_PROVIDED PSEUDO_IGNORE_PATHS" @@ -29,11 +29,17 @@ WIC_CREATE_EXTRA_ARGS ?= "" IMAGE_CMD_wic () { out="${IMGDEPLOYDIR}/${IMAGE_NAME}" build_wic="${WORKDIR}/build-wic" + tmp_wic="${WORKDIR}/tmp-wic" wks="${WKS_FULL_PATH}" + if [ -e "$tmp_wic" ]; then + # Ensure we don't have any junk leftover from a previously interrupted + # do_image_wic execution + rm -rf "$tmp_wic" + fi if [ -z "$wks" ]; then bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." fi - BUILDDIR="${TOPDIR}" PSEUDO_UNLOAD=1 wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$build_wic/" ${WIC_CREATE_EXTRA_ARGS} + BUILDDIR="${TOPDIR}" PSEUDO_UNLOAD=1 wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$build_wic/" -w "$tmp_wic" ${WIC_CREATE_EXTRA_ARGS} mv "$build_wic/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" } IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" diff --git a/poky/meta/classes/insane.bbclass b/poky/meta/classes/insane.bbclass index 105d2a5ce..53230fc66 100644 --- a/poky/meta/classes/insane.bbclass +++ b/poky/meta/classes/insane.bbclass @@ -27,7 +27,7 @@ WARN_QA ?= " libdir xorg-driver-abi \ infodir build-deps src-uri-bad symlink-to-sysroot multilib \ invalid-packageconfig host-user-contaminated uppercase-pn patch-fuzz \ mime mime-xdg unlisted-pkg-lics unhandled-features-check \ - missing-update-alternatives \ + missing-update-alternatives native-last \ " ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ perms dep-cmp pkgvarcheck perm-config perm-line perm-link \ @@ -1366,6 +1366,37 @@ python () { d.setVarFlag('do_package_qa', 'rdeptask', '') for i in issues: package_qa_handle_error("pkgvarcheck", "%s: Variable %s is set as not being package specific, please fix this." % (d.getVar("FILE"), i), d) + + if 'native-last' not in (d.getVar('INSANE_SKIP') or "").split(): + for native_class in ['native', 'nativesdk']: + if bb.data.inherits_class(native_class, d): + + inherited_classes = d.getVar('__inherit_cache', False) or [] + needle = os.path.join('classes', native_class) + + bbclassextend = (d.getVar('BBCLASSEXTEND') or '').split() + # BBCLASSEXTEND items are always added in the end + skip_classes = bbclassextend + if bb.data.inherits_class('native', d) or 'native' in bbclassextend: + # native also inherits nopackages and relocatable bbclasses + skip_classes.extend(['nopackages', 'relocatable']) + + broken_order = [] + for class_item in reversed(inherited_classes): + if needle not in class_item: + for extend_item in skip_classes: + if os.path.join('classes', '%s.bbclass' % extend_item) in class_item: + break + else: + pn = d.getVar('PN') + broken_order.append(os.path.basename(class_item)) + else: + break + if broken_order: + package_qa_handle_error("native-last", "%s: native/nativesdk class is not inherited last, this can result in unexpected behaviour. " + "Classes inherited after native/nativesdk: %s" % (pn, " ".join(broken_order)), d) + + qa_sane = d.getVar("QA_SANE") if not qa_sane: bb.fatal("Fatal QA errors found, failing task.") diff --git a/poky/meta/classes/kernel-devicetree.bbclass b/poky/meta/classes/kernel-devicetree.bbclass index 81dda8003..d4f886420 100644 --- a/poky/meta/classes/kernel-devicetree.bbclass +++ b/poky/meta/classes/kernel-devicetree.bbclass @@ -9,6 +9,9 @@ FILES_${KERNEL_PACKAGE_NAME}-image-zimage-bundle = "/${KERNEL_IMAGEDEST}/zImage- # Generate kernel+devicetree bundle KERNEL_DEVICETREE_BUNDLE ?= "0" +# dtc flags passed via DTC_FLAGS env variable +KERNEL_DTC_FLAGS ?= "" + normalize_dtb () { dtb="$1" if echo $dtb | grep -q '/dts/'; then @@ -50,6 +53,10 @@ do_configure_append() { } do_compile_append() { + if [ -n "${KERNEL_DTC_FLAGS}" ]; then + export DTC_FLAGS="${KERNEL_DTC_FLAGS}" + fi + for dtbf in ${KERNEL_DEVICETREE}; do dtb=`normalize_dtb "$dtbf"` oe_runmake $dtb CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} diff --git a/poky/meta/classes/kernel-fitimage.bbclass b/poky/meta/classes/kernel-fitimage.bbclass index 9fa302a5c..f5082c93d 100644 --- a/poky/meta/classes/kernel-fitimage.bbclass +++ b/poky/meta/classes/kernel-fitimage.bbclass @@ -1,5 +1,7 @@ inherit kernel-uboot kernel-artifact-names uboot-sign +KERNEL_IMAGETYPE_REPLACEMENT = "" + python __anonymous () { kerneltypes = d.getVar('KERNEL_IMAGETYPES') or "" if 'fitImage' in kerneltypes.split(): @@ -21,6 +23,8 @@ python __anonymous () { else: replacementtype = "zImage" + d.setVar("KERNEL_IMAGETYPE_REPLACEMENT", replacementtype) + # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal # to kernel.bbclass . We have to override it, since we pack zImage # (at least for now) into the fitImage . @@ -45,6 +49,8 @@ python __anonymous () { if d.getVar('UBOOT_SIGN_ENABLE') == "1" and d.getVar('UBOOT_DTB_BINARY'): uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot' d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_populate_sysroot' % uboot_pn) + if d.getVar('INITRAMFS_IMAGE_BUNDLE') == "1": + d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' %s:do_populate_sysroot' % uboot_pn) } # Options for the device tree compiler passed to mkimage '-D' feature: @@ -155,7 +161,7 @@ fitimage_emit_section_kernel() { fi cat << EOF >> ${1} - kernel@${2} { + kernel-${2} { description = "Linux kernel"; data = /incbin/("${3}"); type = "kernel"; @@ -164,7 +170,7 @@ fitimage_emit_section_kernel() { compression = "${4}"; load = <${UBOOT_LOADADDRESS}>; entry = <${ENTRYPOINT}>; - hash@1 { + hash-1 { algo = "${kernel_csum}"; }; }; @@ -173,7 +179,7 @@ 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 { + signature-1 { algo = "${kernel_csum},${kernel_sign_algo}"; key-name-hint = "${kernel_sign_keyname}"; }; @@ -204,14 +210,14 @@ fitimage_emit_section_dtb() { dtb_loadline="load = <${UBOOT_DTB_LOADADDRESS}>;" fi cat << EOF >> ${1} - fdt@${2} { + fdt-${2} { description = "Flattened Device Tree blob"; data = /incbin/("${3}"); type = "flat_dt"; arch = "${UBOOT_ARCH}"; compression = "none"; ${dtb_loadline} - hash@1 { + hash-1 { algo = "${dtb_csum}"; }; }; @@ -220,7 +226,7 @@ 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 { + signature-1 { algo = "${dtb_csum},${dtb_sign_algo}"; key-name-hint = "${dtb_sign_keyname}"; }; @@ -230,6 +236,43 @@ EOF } # +# Emit the fitImage ITS u-boot script section +# +# $1 ... .its filename +# $2 ... Image counter +# $3 ... Path to boot script image +fitimage_emit_section_boot_script() { + + bootscr_csum="${FIT_HASH_ALG}" + bootscr_sign_algo="${FIT_SIGN_ALG}" + bootscr_sign_keyname="${UBOOT_SIGN_KEYNAME}" + + cat << EOF >> ${1} + bootscr@${2} { + description = "U-boot script"; + data = /incbin/("${3}"); + type = "script"; + arch = "${UBOOT_ARCH}"; + compression = "none"; + hash@1 { + algo = "${bootscr_csum}"; + }; + }; +EOF + + if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${bootscr_sign_keyname}" ] ; then + sed -i '$ d' ${1} + cat << EOF >> ${1} + signature@1 { + algo = "${bootscr_csum},${bootscr_sign_algo}"; + key-name-hint = "${bootscr_sign_keyname}"; + }; + }; +EOF + fi +} + +# # Emit the fitImage ITS setup section # # $1 ... .its filename @@ -240,7 +283,7 @@ fitimage_emit_section_setup() { setup_csum="${FIT_HASH_ALG}" cat << EOF >> ${1} - setup@${2} { + setup-${2} { description = "Linux setup.bin"; data = /incbin/("${3}"); type = "x86_setup"; @@ -249,7 +292,7 @@ fitimage_emit_section_setup() { compression = "none"; load = <0x00090000>; entry = <0x00090000>; - hash@1 { + hash-1 { algo = "${setup_csum}"; }; }; @@ -278,7 +321,7 @@ fitimage_emit_section_ramdisk() { fi cat << EOF >> ${1} - ramdisk@${2} { + ramdisk-${2} { description = "${INITRAMFS_IMAGE}"; data = /incbin/("${3}"); type = "ramdisk"; @@ -287,7 +330,7 @@ fitimage_emit_section_ramdisk() { compression = "none"; ${ramdisk_loadline} ${ramdisk_entryline} - hash@1 { + hash-1 { algo = "${ramdisk_csum}"; }; }; @@ -296,7 +339,7 @@ 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 { + signature-1 { algo = "${ramdisk_csum},${ramdisk_sign_algo}"; key-name-hint = "${ramdisk_sign_keyname}"; }; @@ -312,8 +355,9 @@ EOF # $2 ... Linux kernel ID # $3 ... DTB image name # $4 ... ramdisk ID -# $5 ... config ID -# $6 ... default flag +# $5 ... u-boot script ID +# $6 ... config ID +# $7 ... default flag fitimage_emit_section_config() { conf_csum="${FIT_HASH_ALG}" @@ -326,16 +370,18 @@ fitimage_emit_section_config() { kernel_id="${2}" dtb_image="${3}" ramdisk_id="${4}" - config_id="${5}" - default_flag="${6}" + bootscr_id="${5}" + config_id="${6}" + default_flag="${7}" # Test if we have any DTBs at all sep="" conf_desc="" - conf_node="conf@" + conf_node="conf-" kernel_line="" fdt_line="" ramdisk_line="" + bootscr_line="" setup_line="" default_line="" @@ -350,33 +396,39 @@ fitimage_emit_section_config() { if [ -n "${kernel_id}" ]; then conf_desc="Linux kernel" sep=", " - kernel_line="kernel = \"kernel@${kernel_id}\";" + kernel_line="kernel = \"kernel-${kernel_id}\";" fi if [ -n "${dtb_image}" ]; then conf_desc="${conf_desc}${sep}FDT blob" sep=", " - fdt_line="fdt = \"fdt@${dtb_image}\";" + fdt_line="fdt = \"fdt-${dtb_image}\";" fi if [ -n "${ramdisk_id}" ]; then conf_desc="${conf_desc}${sep}ramdisk" sep=", " - ramdisk_line="ramdisk = \"ramdisk@${ramdisk_id}\";" + ramdisk_line="ramdisk = \"ramdisk-${ramdisk_id}\";" + fi + + if [ -n "${bootscr_id}" ]; then + conf_desc="${conf_desc}${sep}u-boot script" + sep=", " + bootscr_line="bootscr = \"bootscr@${bootscr_id}\";" fi if [ -n "${config_id}" ]; then conf_desc="${conf_desc}${sep}setup" - setup_line="setup = \"setup@${config_id}\";" + setup_line="setup = \"setup-${config_id}\";" fi 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 "${dtb_image}" ]; then - default_line="default = \"conf@${dtb_image}\";" + default_line="default = \"conf-${dtb_image}\";" else - default_line="default = \"conf@${kernel_id}\";" + default_line="default = \"conf-${kernel_id}\";" fi fi @@ -387,8 +439,9 @@ fitimage_emit_section_config() { ${kernel_line} ${fdt_line} ${ramdisk_line} + ${bootscr_line} ${setup_line} - hash@1 { + hash-1 { algo = "${conf_csum}"; }; EOF @@ -413,6 +466,11 @@ EOF sep=", " fi + if [ -n "${bootscr_id}" ]; then + sign_line="${sign_line}${sep}\"bootscr\"" + sep=", " + fi + if [ -n "${config_id}" ]; then sign_line="${sign_line}${sep}\"setup\"" fi @@ -420,7 +478,7 @@ EOF sign_line="${sign_line};" cat << EOF >> ${its_file} - signature@1 { + signature-1 { algo = "${conf_csum},${conf_sign_algo}"; key-name-hint = "${conf_sign_keyname}"; ${sign_line} @@ -445,6 +503,7 @@ fitimage_assemble() { DTBS="" ramdiskcount=${3} setupcount="" + bootscr_id="" rm -f ${1} arch/${ARCH}/boot/${2} fitimage_emit_fit_header ${1} @@ -455,7 +514,22 @@ fitimage_assemble() { fitimage_emit_section_maint ${1} imagestart uboot_prep_kimage - fitimage_emit_section_kernel ${1} "${kernelcount}" linux.bin "${linux_comp}" + + if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then + initramfs_bundle_path="arch/"${UBOOT_ARCH}"/boot/"${KERNEL_IMAGETYPE_REPLACEMENT}".initramfs" + if [ -e "${initramfs_bundle_path}" ]; then + + # + # Include the kernel/rootfs bundle. + # + + fitimage_emit_section_kernel ${1} "${kernelcount}" "${initramfs_bundle_path}" "${linux_comp}" + else + bbwarn "${initramfs_bundle_path} not found." + fi + else + fitimage_emit_section_kernel ${1} "${kernelcount}" linux.bin "${linux_comp}" + fi # # Step 2: Prepare a DTB image section @@ -489,7 +563,21 @@ fitimage_assemble() { fi # - # Step 3: Prepare a setup section. (For x86) + # Step 3: Prepare a u-boot script section + # + + if [ -n "${UBOOT_ENV}" ] && [ -d "${STAGING_DIR_HOST}/boot" ]; then + if [ -e "${STAGING_DIR_HOST}/boot/${UBOOT_ENV_BINARY}" ]; then + cp ${STAGING_DIR_HOST}/boot/${UBOOT_ENV_BINARY} ${B} + bootscr_id="${UBOOT_ENV_BINARY}" + fitimage_emit_section_boot_script ${1} "${bootscr_id}" ${UBOOT_ENV_BINARY} + else + bbwarn "${STAGING_DIR_HOST}/boot/${UBOOT_ENV_BINARY} not found." + fi + fi + + # + # Step 4: Prepare a setup section. (For x86) # if [ -e arch/${ARCH}/boot/setup.bin ]; then setupcount=1 @@ -497,9 +585,9 @@ fitimage_assemble() { fi # - # Step 4: Prepare a ramdisk section. + # Step 5: Prepare a ramdisk section. # - if [ "x${ramdiskcount}" = "x1" ] ; then + if [ "x${ramdiskcount}" = "x1" ] && [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then # Find and use the first initramfs image archive type we find for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.gz ext2.gz cpio; do initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.${img}" @@ -520,13 +608,15 @@ fitimage_assemble() { fi # - # Step 5: Prepare a configurations section + # Step 6: Prepare a configurations section # fitimage_emit_section_maint ${1} confstart # kernel-fitimage.bbclass currently only supports a single kernel (no less or # more) to be added to the FIT image along with 0 or more device trees and # 0 or 1 ramdisk. + # It is also possible to include an initramfs bundle (kernel and rootfs in one binary) + # When the initramfs bundle is used ramdisk is disabled. # If a device tree is to be part of the FIT image, then select # the default configuration to be used is based on the dtbcount. If there is # no dtb present than select the default configuation to be based on @@ -536,15 +626,15 @@ fitimage_assemble() { for DTB in ${DTBS}; do dtb_ext=${DTB##*.} if [ "${dtb_ext}" = "dtbo" ]; then - fitimage_emit_section_config ${1} "" "${DTB}" "" "" "`expr ${i} = ${dtbcount}`" + fitimage_emit_section_config ${1} "" "${DTB}" "" "${bootscr_id}" "" "`expr ${i} = ${dtbcount}`" else - fitimage_emit_section_config ${1} "${kernelcount}" "${DTB}" "${ramdiskcount}" "${setupcount}" "`expr ${i} = ${dtbcount}`" + fitimage_emit_section_config ${1} "${kernelcount}" "${DTB}" "${ramdiskcount}" "${bootscr_id}" "${setupcount}" "`expr ${i} = ${dtbcount}`" fi i=`expr ${i} + 1` done else defaultconfigcount=1 - fitimage_emit_section_config ${1} "${kernelcount}" "" "${ramdiskcount}" "${setupcount}" "${defaultconfigcount}" + fitimage_emit_section_config ${1} "${kernelcount}" "" "${ramdiskcount}" "${bootscr_id}" "${setupcount}" "${defaultconfigcount}" fi fitimage_emit_section_maint ${1} sectend @@ -552,7 +642,7 @@ fitimage_assemble() { fitimage_emit_section_maint ${1} fitend # - # Step 6: Assemble the image + # Step 7: Assemble the image # ${UBOOT_MKIMAGE} \ ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ @@ -560,7 +650,7 @@ fitimage_assemble() { arch/${ARCH}/boot/${2} # - # Step 7: Sign the image and add public key to U-Boot dtb + # Step 8: Sign the image and add public key to U-Boot dtb # if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then add_key_to_u_boot="" @@ -592,7 +682,11 @@ do_assemble_fitimage_initramfs() { if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage" && \ test -n "${INITRAMFS_IMAGE}" ; then cd ${B} - fitimage_assemble fit-image-${INITRAMFS_IMAGE}.its fitImage-${INITRAMFS_IMAGE} 1 + if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then + fitimage_assemble fit-image-${INITRAMFS_IMAGE}.its fitImage "" + else + fitimage_assemble fit-image-${INITRAMFS_IMAGE}.its fitImage-${INITRAMFS_IMAGE} 1 + fi fi } @@ -631,22 +725,27 @@ kernel_do_deploy[vardepsexclude] = "DATETIME" kernel_do_deploy_append() { # Update deploy directory if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then - echo "Copying fit-image.its source file..." - install -m 0644 ${B}/fit-image.its "$deployDir/fitImage-its-${KERNEL_FIT_NAME}.its" - ln -snf fitImage-its-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${KERNEL_FIT_LINK_NAME}" - echo "Copying linux.bin file..." - install -m 0644 ${B}/linux.bin $deployDir/fitImage-linux.bin-${KERNEL_FIT_NAME}.bin - ln -snf fitImage-linux.bin-${KERNEL_FIT_NAME}.bin "$deployDir/fitImage-linux.bin-${KERNEL_FIT_LINK_NAME}" + if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then + echo "Copying fit-image.its source file..." + install -m 0644 ${B}/fit-image.its "$deployDir/fitImage-its-${KERNEL_FIT_NAME}.its" + ln -snf fitImage-its-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${KERNEL_FIT_LINK_NAME}" + + echo "Copying linux.bin file..." + install -m 0644 ${B}/linux.bin $deployDir/fitImage-linux.bin-${KERNEL_FIT_NAME}.bin + ln -snf fitImage-linux.bin-${KERNEL_FIT_NAME}.bin "$deployDir/fitImage-linux.bin-${KERNEL_FIT_LINK_NAME}" + fi if [ -n "${INITRAMFS_IMAGE}" ]; then echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..." install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its" ln -snf fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}" - echo "Copying fitImage-${INITRAMFS_IMAGE} file..." - install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin" - ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}" + if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then + echo "Copying fitImage-${INITRAMFS_IMAGE} file..." + install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin" + ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}" + fi fi if [ "${UBOOT_SIGN_ENABLE}" = "1" -a -n "${UBOOT_DTB_BINARY}" ] ; then # UBOOT_DTB_IMAGE is a realfile, but we can't use @@ -656,3 +755,18 @@ kernel_do_deploy_append() { fi fi } + +# The function below performs the following in case of initramfs bundles: +# - Removes do_assemble_fitimage. FIT generation is done through +# do_assemble_fitimage_initramfs. do_assemble_fitimage is not needed +# and should not be part of the tasks to be executed. +# - Since do_generate_rsa_keys is inserted by default +# between do_compile and do_assemble_fitimage, this is +# not suitable in case of initramfs bundles. do_generate_rsa_keys +# should be between do_bundle_initramfs and do_assemble_fitimage_initramfs. +python () { + if d.getVar('INITRAMFS_IMAGE_BUNDLE') == "1": + bb.build.deltask('do_assemble_fitimage', d) + bb.build.deltask('generate_rsa_keys', d) + bb.build.addtask('generate_rsa_keys', 'do_assemble_fitimage_initramfs', 'do_bundle_initramfs', d) +}
\ No newline at end of file diff --git a/poky/meta/classes/kernel.bbclass b/poky/meta/classes/kernel.bbclass index 2f1006ddf..8693ab86b 100644 --- a/poky/meta/classes/kernel.bbclass +++ b/poky/meta/classes/kernel.bbclass @@ -415,9 +415,23 @@ kernel_do_install() { # install -d ${D}/${KERNEL_IMAGEDEST} install -d ${D}/boot + + # + # When including an initramfs bundle inside a FIT image, the fitImage is created after the install task + # by do_assemble_fitimage_initramfs. + # This happens after the generation of the initramfs bundle (done by do_bundle_initramfs). + # So, at the level of the install task we should not try to install the fitImage. fitImage is still not + # generated yet. + # After the generation of the fitImage, the deploy task copies the fitImage from the build directory to + # the deploy folder. + # + for imageType in ${KERNEL_IMAGETYPES} ; do - install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType ${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION} + if [ $imageType != "fitImage" ] || [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ] ; then + install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType ${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION} + fi done + install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} @@ -745,7 +759,7 @@ kernel_do_deploy() { fi if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then - for imageType in ${KERNEL_IMAGETYPES} ; do + for imageType in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do if [ "$imageType" = "fitImage" ] ; then continue fi diff --git a/poky/meta/classes/license.bbclass b/poky/meta/classes/license.bbclass index dc9111834..bcea0b3cb 100644 --- a/poky/meta/classes/license.bbclass +++ b/poky/meta/classes/license.bbclass @@ -252,16 +252,9 @@ def return_spdx(d, license): def canonical_license(d, license): """ Return the canonical (SPDX) form of the license if available (so GPLv3 - becomes GPL-3.0), for the license named 'X+', return canonical form of - 'X' if available and the tailing '+' (so GPLv3+ becomes GPL-3.0+), - or the passed license if there is no canonical form. + becomes GPL-3.0) or the passed license if there is no canonical form. """ - lic = d.getVarFlag('SPDXLICENSEMAP', license) or "" - if not lic and license.endswith('+'): - lic = d.getVarFlag('SPDXLICENSEMAP', license.rstrip('+')) - if lic: - lic += '+' - return lic or license + return d.getVarFlag('SPDXLICENSEMAP', license) or license def available_licenses(d): """ @@ -288,6 +281,12 @@ def expand_wildcard_licenses(d, wildcard_licenses): wildcards from SPDXLICENSEMAP flags and AVAILABLE_LICENSES. """ import fnmatch + + # Assume if we're passed "GPLv3" or "*GPLv3" it means -or-later as well + for lic in wildcard_licenses[:]: + if not lic.endswith(("-or-later", "-only", "*")): + wildcard_licenses.append(lic + "+") + licenses = wildcard_licenses[:] spdxmapkeys = d.getVarFlags('SPDXLICENSEMAP').keys() for wld_lic in wildcard_licenses: diff --git a/poky/meta/classes/license_image.bbclass b/poky/meta/classes/license_image.bbclass index 119c8dfc8..c96b032eb 100644 --- a/poky/meta/classes/license_image.bbclass +++ b/poky/meta/classes/license_image.bbclass @@ -40,7 +40,6 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): import stat bad_licenses = (d.getVar("INCOMPATIBLE_LICENSE") or "").split() - bad_licenses = [canonical_license(d, l) for l in bad_licenses] bad_licenses = expand_wildcard_licenses(d, bad_licenses) whitelist = [] @@ -210,7 +209,8 @@ def license_deployed_manifest(d): os.unlink(lic_manifest_symlink_dir) # create the image dir symlink - os.symlink(lic_manifest_dir, lic_manifest_symlink_dir) + if lic_manifest_dir != lic_manifest_symlink_dir: + os.symlink(lic_manifest_dir, lic_manifest_symlink_dir) def get_deployed_dependencies(d): """ @@ -220,9 +220,10 @@ def get_deployed_dependencies(d): deploy = {} # Get all the dependencies for the current task (rootfs). taskdata = d.getVar("BB_TASKDEPDATA", False) + pn = d.getVar("PN", True) depends = list(set([dep[0] for dep in list(taskdata.values()) - if not dep[0].endswith("-native")])) + if not dep[0].endswith("-native") and not dep[0] == pn])) # To verify what was deployed it checks the rootfs dependencies against # the SSTATE_MANIFESTS for "deploy" task. diff --git a/poky/meta/classes/linuxloader.bbclass b/poky/meta/classes/linuxloader.bbclass index b161c51a5..30925ac87 100644 --- a/poky/meta/classes/linuxloader.bbclass +++ b/poky/meta/classes/linuxloader.bbclass @@ -9,8 +9,8 @@ def get_musl_loader_arch(d): ldso_arch = "mips${ABIEXTENSION}${MIPSPKGSFX_BYTE}${MIPSPKGSFX_R6}${MIPSPKGSFX_ENDIAN}${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}" elif targetarch == "powerpc": ldso_arch = "powerpc${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}" - elif targetarch == "powerpc64": - ldso_arch = "powerpc64" + elif targetarch.startswith("powerpc64"): + ldso_arch = "powerpc64${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '', 'le', d)}" elif targetarch == "x86_64": ldso_arch = "x86_64" elif re.search("i.86", targetarch): diff --git a/poky/meta/classes/meson.bbclass b/poky/meta/classes/meson.bbclass index 83aa854b7..a7644e70c 100644 --- a/poky/meta/classes/meson.bbclass +++ b/poky/meta/classes/meson.bbclass @@ -99,6 +99,8 @@ readelf = ${@meson_array('READELF', d)} pkgconfig = 'pkg-config' llvm-config = 'llvm-config${LLVMVERSION}' cups-config = 'cups-config' +g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper' +g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper' [properties] needs_exe_wrapper = true diff --git a/poky/meta/classes/native.bbclass b/poky/meta/classes/native.bbclass index 08106e345..a0838e41b 100644 --- a/poky/meta/classes/native.bbclass +++ b/poky/meta/classes/native.bbclass @@ -5,20 +5,12 @@ inherit relocatable # no need for them to be a direct target of 'world' EXCLUDE_FROM_WORLD = "1" -PACKAGES = "" -PACKAGES_class-native = "" -PACKAGES_DYNAMIC = "" -PACKAGES_DYNAMIC_class-native = "" PACKAGE_ARCH = "${BUILD_ARCH}" # used by cmake class OECMAKE_RPATH = "${libdir}" OECMAKE_RPATH_class-native = "${libdir}" -# When this class has packaging enabled, setting -# RPROVIDES becomes unnecessary. -RPROVIDES = "${PN}" - TARGET_ARCH = "${BUILD_ARCH}" TARGET_OS = "${BUILD_OS}" TARGET_VENDOR = "${BUILD_VENDOR}" @@ -138,7 +130,7 @@ python native_virtclass_handler () { if "native" not in classextend: return - def map_dependencies(varname, d, suffix = ""): + def map_dependencies(varname, d, suffix = "", selfref=True): if suffix: varname = varname + "_" + suffix deps = d.getVar(varname) @@ -148,22 +140,25 @@ python native_virtclass_handler () { newdeps = [] for dep in deps: if dep == pn: - continue + if not selfref: + continue + newdeps.append(dep) elif "-cross-" in dep: newdeps.append(dep.replace("-cross", "-native")) elif not dep.endswith("-native"): - newdeps.append(dep + "-native") + newdeps.append(dep.replace("-native", "") + "-native") else: newdeps.append(dep) - d.setVar(varname, " ".join(newdeps)) + d.setVar(varname, " ".join(newdeps), parsing=True) - map_dependencies("DEPENDS", e.data) - for pkg in [e.data.getVar("PN"), "", "${PN}"]: + map_dependencies("DEPENDS", e.data, selfref=False) + for pkg in e.data.getVar("PACKAGES", False).split(): map_dependencies("RDEPENDS", e.data, pkg) map_dependencies("RRECOMMENDS", e.data, pkg) map_dependencies("RSUGGESTS", e.data, pkg) map_dependencies("RPROVIDES", e.data, pkg) map_dependencies("RREPLACES", e.data, pkg) + map_dependencies("PACKAGES", e.data) provides = e.data.getVar("PROVIDES") nprovides = [] diff --git a/poky/meta/classes/npm.bbclass b/poky/meta/classes/npm.bbclass index 068032a1e..55a6985fb 100644 --- a/poky/meta/classes/npm.bbclass +++ b/poky/meta/classes/npm.bbclass @@ -17,8 +17,10 @@ # NPM_INSTALL_DEV: # Set to 1 to also install devDependencies. +inherit python3native + DEPENDS_prepend = "nodejs-native " -RDEPENDS_${PN}_prepend = "nodejs " +RDEPENDS_${PN}_append_class-target = " nodejs" NPM_INSTALL_DEV ?= "0" @@ -130,11 +132,17 @@ python npm_do_configure() { cached_manifest.pop("dependencies", None) cached_manifest.pop("devDependencies", None) - with open(orig_shrinkwrap_file, "r") as f: - orig_shrinkwrap = json.load(f) + has_shrinkwrap_file = True + + try: + with open(orig_shrinkwrap_file, "r") as f: + orig_shrinkwrap = json.load(f) + except IOError: + has_shrinkwrap_file = False - cached_shrinkwrap = copy.deepcopy(orig_shrinkwrap) - cached_shrinkwrap.pop("dependencies", None) + if has_shrinkwrap_file: + cached_shrinkwrap = copy.deepcopy(orig_shrinkwrap) + cached_shrinkwrap.pop("dependencies", None) # Manage the dependencies progress = OutOfProgressHandler(d, r"^(\d+)/(\d+)$") @@ -165,8 +173,10 @@ python npm_do_configure() { progress.write("%d/%d" % (progress_done, progress_total)) dev = bb.utils.to_boolean(d.getVar("NPM_INSTALL_DEV"), False) - foreach_dependencies(orig_shrinkwrap, _count_dependency, dev) - foreach_dependencies(orig_shrinkwrap, _cache_dependency, dev) + + if has_shrinkwrap_file: + foreach_dependencies(orig_shrinkwrap, _count_dependency, dev) + foreach_dependencies(orig_shrinkwrap, _cache_dependency, dev) # Configure the main package with tempfile.TemporaryDirectory() as tmpdir: @@ -181,16 +191,19 @@ python npm_do_configure() { cached_manifest[depkey] = {} cached_manifest[depkey][name] = version - _update_manifest("dependencies") + if has_shrinkwrap_file: + _update_manifest("dependencies") if dev: - _update_manifest("devDependencies") + if has_shrinkwrap_file: + _update_manifest("devDependencies") with open(cached_manifest_file, "w") as f: json.dump(cached_manifest, f, indent=2) - with open(cached_shrinkwrap_file, "w") as f: - json.dump(cached_shrinkwrap, f, indent=2) + if has_shrinkwrap_file: + with open(cached_shrinkwrap_file, "w") as f: + json.dump(cached_shrinkwrap, f, indent=2) } python npm_do_compile() { @@ -237,9 +250,7 @@ python npm_do_compile() { sysroot = d.getVar("RECIPE_SYSROOT_NATIVE") nodedir = os.path.join(sysroot, d.getVar("prefix_native").strip("/")) configs.append(("nodedir", nodedir)) - bindir = os.path.join(sysroot, d.getVar("bindir_native").strip("/")) - pythondir = os.path.join(bindir, "python-native", "python") - configs.append(("python", pythondir)) + configs.append(("python", d.getVar("PYTHON"))) # Add node-pre-gyp configuration args.append(("target_arch", d.getVar("NPM_ARCH"))) diff --git a/poky/meta/classes/package.bbclass b/poky/meta/classes/package.bbclass index 247bdc7bb..e3f0a7060 100644 --- a/poky/meta/classes/package.bbclass +++ b/poky/meta/classes/package.bbclass @@ -807,10 +807,16 @@ python package_do_split_locales() { python perform_packagecopy () { import subprocess + import shutil dest = d.getVar('D') dvar = d.getVar('PKGD') + # Remove ${D}/sysroot-only if present + sysroot_only = os.path.join(dest, 'sysroot-only') + if cpath.exists(sysroot_only) and cpath.isdir(sysroot_only): + shutil.rmtree(sysroot_only) + # Start by package population by taking a copy of the installed # files to operate on # Preserve sparse files and hard links @@ -1704,7 +1710,7 @@ if [ x"$D" = "x" ]; then fi } -RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps" +RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps --define '__font_provides %{nil}'" # Collect perfile run-time dependency metadata # Output: @@ -2446,6 +2452,7 @@ python do_packagedata () { bb.build.exec_func("packagedata_translate_pr_autoinc", d) } +do_packagedata[cleandirs] += "${WORKDIR}/pkgdata-pdata-input" # Translate the EXTENDPRAUTO and AUTOINC to the final values packagedata_translate_pr_autoinc() { diff --git a/poky/meta/classes/package_deb.bbclass b/poky/meta/classes/package_deb.bbclass index cb723fc1d..b3d8ce330 100644 --- a/poky/meta/classes/package_deb.bbclass +++ b/poky/meta/classes/package_deb.bbclass @@ -314,7 +314,6 @@ python do_package_write_deb () { } do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}" do_package_write_deb[cleandirs] = "${PKGWRITEDIRDEB}" -do_package_write_deb[umask] = "022" do_package_write_deb[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" addtask package_write_deb after do_packagedata do_package diff --git a/poky/meta/classes/package_ipk.bbclass b/poky/meta/classes/package_ipk.bbclass index 79cb36c51..600b3ac90 100644 --- a/poky/meta/classes/package_ipk.bbclass +++ b/poky/meta/classes/package_ipk.bbclass @@ -4,6 +4,7 @@ IMAGE_PKGTYPE ?= "ipk" IPKGCONF_TARGET = "${WORKDIR}/opkg.conf" IPKGCONF_SDK = "${WORKDIR}/opkg-sdk.conf" +IPKGCONF_SDK_TARGET = "${WORKDIR}/opkg-sdk-target.conf" PKGWRITEDIRIPK = "${WORKDIR}/deploy-ipks" @@ -272,7 +273,6 @@ python do_package_write_ipk () { } do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}" do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}" -do_package_write_ipk[umask] = "022" do_package_write_ipk[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" addtask package_write_ipk after do_packagedata do_package diff --git a/poky/meta/classes/package_rpm.bbclass b/poky/meta/classes/package_rpm.bbclass index 53b4700cd..84a9a6dd1 100644 --- a/poky/meta/classes/package_rpm.bbclass +++ b/poky/meta/classes/package_rpm.bbclass @@ -300,13 +300,13 @@ python write_specfile () { srccustomtagschunk = get_package_additional_metadata("rpm", localdata) srcdepends = d.getVar('DEPENDS') - srcrdepends = [] - srcrrecommends = [] - srcrsuggests = [] - srcrprovides = [] - srcrreplaces = [] - srcrconflicts = [] - srcrobsoletes = [] + srcrdepends = "" + srcrrecommends = "" + srcrsuggests = "" + srcrprovides = "" + srcrreplaces = "" + srcrconflicts = "" + srcrobsoletes = "" srcrpreinst = [] srcrpostinst = [] @@ -365,13 +365,13 @@ python write_specfile () { # Map the dependencies into their final form mapping_rename_hook(localdata) - splitrdepends = localdata.getVar('RDEPENDS') - splitrrecommends = localdata.getVar('RRECOMMENDS') - splitrsuggests = localdata.getVar('RSUGGESTS') - splitrprovides = localdata.getVar('RPROVIDES') - splitrreplaces = localdata.getVar('RREPLACES') - splitrconflicts = localdata.getVar('RCONFLICTS') - splitrobsoletes = [] + splitrdepends = localdata.getVar('RDEPENDS') or "" + splitrrecommends = localdata.getVar('RRECOMMENDS') or "" + splitrsuggests = localdata.getVar('RSUGGESTS') or "" + splitrprovides = localdata.getVar('RPROVIDES') or "" + splitrreplaces = localdata.getVar('RREPLACES') or "" + splitrconflicts = localdata.getVar('RCONFLICTS') or "" + splitrobsoletes = "" splitrpreinst = localdata.getVar('pkg_preinst') splitrpostinst = localdata.getVar('pkg_postinst') @@ -439,9 +439,9 @@ python write_specfile () { spec_preamble_bottom.append(splitcustomtagschunk) # Replaces == Obsoletes && Provides - robsoletes = bb.utils.explode_dep_versions2(splitrobsoletes or "") - rprovides = bb.utils.explode_dep_versions2(splitrprovides or "") - rreplaces = bb.utils.explode_dep_versions2(splitrreplaces or "") + robsoletes = bb.utils.explode_dep_versions2(splitrobsoletes) + rprovides = bb.utils.explode_dep_versions2(splitrprovides) + rreplaces = bb.utils.explode_dep_versions2(splitrreplaces) for dep in rreplaces: if not dep in robsoletes: robsoletes[dep] = rreplaces[dep] @@ -533,9 +533,9 @@ python write_specfile () { tail_source(d) # Replaces == Obsoletes && Provides - robsoletes = bb.utils.explode_dep_versions2(srcrobsoletes or "") - rprovides = bb.utils.explode_dep_versions2(srcrprovides or "") - rreplaces = bb.utils.explode_dep_versions2(srcrreplaces or "") + robsoletes = bb.utils.explode_dep_versions2(srcrobsoletes) + rprovides = bb.utils.explode_dep_versions2(srcrprovides) + rreplaces = bb.utils.explode_dep_versions2(srcrreplaces) for dep in rreplaces: if not dep in robsoletes: robsoletes[dep] = rreplaces[dep] @@ -687,7 +687,9 @@ python do_package_rpm () { cmd = cmd + " --define '_binary_payload w6T.xzdio'" cmd = cmd + " --define '_source_payload w6T.xzdio'" cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'" + cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" cmd = cmd + " --define '_buildhost reproducible'" + cmd = cmd + " --define '__font_provides %{nil}'" if perfiledeps: cmd = cmd + " --define '__find_requires " + outdepends + "'" cmd = cmd + " --define '__find_provides " + outprovides + "'" @@ -745,7 +747,6 @@ python do_package_write_rpm () { do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}" do_package_write_rpm[cleandirs] = "${PKGWRITEDIRRPM}" -do_package_write_rpm[umask] = "022" do_package_write_rpm[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" addtask package_write_rpm after do_packagedata do_package diff --git a/poky/meta/classes/patch.bbclass b/poky/meta/classes/patch.bbclass index 25ec089ae..cd491a563 100644 --- a/poky/meta/classes/patch.bbclass +++ b/poky/meta/classes/patch.bbclass @@ -160,7 +160,6 @@ python patch_do_patch() { patch_do_patch[vardepsexclude] = "PATCHRESOLVE" addtask patch after do_unpack -do_patch[umask] = "022" do_patch[dirs] = "${WORKDIR}" do_patch[depends] = "${PATCHDEPENDENCY}" diff --git a/poky/meta/classes/populate_sdk_base.bbclass b/poky/meta/classes/populate_sdk_base.bbclass index 4db0511db..c8a7084d3 100644 --- a/poky/meta/classes/populate_sdk_base.bbclass +++ b/poky/meta/classes/populate_sdk_base.bbclass @@ -178,7 +178,7 @@ do_populate_sdk[sstate-inputdirs] = "${SDKDEPLOYDIR}" do_populate_sdk[sstate-outputdirs] = "${SDK_DEPLOY}" do_populate_sdk[stamp-extra-info] = "${MACHINE_ARCH}${SDKMACHINE}" -PSEUDO_IGNORE_PATHS .= ",${SDKDEPLOYDIR}" +PSEUDO_IGNORE_PATHS .= ",${SDKDEPLOYDIR},${WORKDIR}/oe-sdk-repo,${WORKDIR}/sstate-build-populate_sdk" fakeroot create_sdk_files() { cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/ diff --git a/poky/meta/classes/report-error.bbclass b/poky/meta/classes/report-error.bbclass index 1a12db120..9cb6b0bd3 100644 --- a/poky/meta/classes/report-error.bbclass +++ b/poky/meta/classes/report-error.bbclass @@ -6,6 +6,8 @@ # # Licensed under the MIT license, see COPYING.MIT for details +inherit base + ERR_REPORT_DIR ?= "${LOG_DIR}/error-report" def errorreport_getdata(e): @@ -64,6 +66,8 @@ python errorreport_handler () { data['failures'] = [] data['component'] = " ".join(e.getPkgs()) data['branch_commit'] = str(base_detect_branch(e.data)) + ": " + str(base_detect_revision(e.data)) + data['bitbake_version'] = e.data.getVar("BB_VERSION") + data['layer_version'] = get_layers_branch_rev(e.data) data['local_conf'] = get_conf_data(e, 'local.conf') data['auto_conf'] = get_conf_data(e, 'auto.conf') lock = bb.utils.lockfile(datafile + '.lock') diff --git a/poky/meta/classes/reproducible_build.bbclass b/poky/meta/classes/reproducible_build.bbclass index 2f3bd90b0..f06e00d70 100644 --- a/poky/meta/classes/reproducible_build.bbclass +++ b/poky/meta/classes/reproducible_build.bbclass @@ -37,10 +37,13 @@ BUILD_REPRODUCIBLE_BINARIES ??= '1' inherit ${@oe.utils.ifelse(d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1', 'reproducible_build_simple', '')} -SDE_DIR ="${WORKDIR}/source-date-epoch" +SDE_DIR = "${WORKDIR}/source-date-epoch" SDE_FILE = "${SDE_DIR}/__source_date_epoch.txt" SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch" +# A SOURCE_DATE_EPOCH of '0' might be misinterpreted as no SDE +export SOURCE_DATE_EPOCH_FALLBACK ??= "1302044400" + SSTATETASKS += "do_deploy_source_date_epoch" do_deploy_source_date_epoch () { @@ -93,15 +96,19 @@ def get_source_date_epoch_value(d): return cached epochfile = d.getVar('SDE_FILE') - source_date_epoch = 0 + source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK')) if os.path.isfile(epochfile): with open(epochfile, 'r') as f: s = f.read() try: source_date_epoch = int(s) + # workaround for old sstate with SDE_FILE content being 0 - use SOURCE_DATE_EPOCH_FALLBACK + if source_date_epoch == 0 : + source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK')) + bb.warn("SOURCE_DATE_EPOCH value from sstate '%s' is deprecated/invalid. Reverting to SOURCE_DATE_EPOCH_FALLBACK '%s'" % (s, source_date_epoch)) except ValueError: - bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to 0" % s) - source_date_epoch = 0 + bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to SOURCE_DATE_EPOCH_FALLBACK" % s) + source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK')) bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) else: bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) diff --git a/poky/meta/classes/rootfs_deb.bbclass b/poky/meta/classes/rootfs_deb.bbclass index ef616da22..0469ba705 100644 --- a/poky/meta/classes/rootfs_deb.bbclass +++ b/poky/meta/classes/rootfs_deb.bbclass @@ -32,4 +32,8 @@ python () { d.setVar('DEB_SDK_ARCH', 'amd64') elif darch == "arm": d.setVar('DEB_SDK_ARCH', 'armel') + elif darch == "aarch64": + d.setVar('DEB_SDK_ARCH', 'arm64') + else: + bb.fatal("Unhandled SDK_ARCH %s" % darch) } diff --git a/poky/meta/classes/rootfs_ipk.bbclass b/poky/meta/classes/rootfs_ipk.bbclass index f1e021973..245c256a6 100644 --- a/poky/meta/classes/rootfs_ipk.bbclass +++ b/poky/meta/classes/rootfs_ipk.bbclass @@ -14,8 +14,8 @@ do_rootfs[recrdeptask] += "do_package_write_ipk do_package_qa" do_rootfs[vardeps] += "PACKAGE_FEED_URIS PACKAGE_FEED_BASE_PATHS PACKAGE_FEED_ARCHS" do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" -do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" -do_populate_sdk_ext[lockfiles] += "${WORKDIR}/ipk.lock" +do_populate_sdk[lockfiles] += "${WORKDIR}/sdk-ipk.lock" +do_populate_sdk_ext[lockfiles] += "${WORKDIR}/sdk-ipk.lock" OPKG_PREPROCESS_COMMANDS = "" diff --git a/poky/meta/classes/sanity.bbclass b/poky/meta/classes/sanity.bbclass index d134b40a8..485173ab4 100644 --- a/poky/meta/classes/sanity.bbclass +++ b/poky/meta/classes/sanity.bbclass @@ -703,6 +703,23 @@ def check_sanity_version_change(status, d): if (tmpdirmode & stat.S_ISUID): status.addresult("TMPDIR is setuid, please don't build in a setuid directory") + # Check that a user isn't building in a path in PSEUDO_IGNORE_PATHS + pseudoignorepaths = d.getVar('PSEUDO_IGNORE_PATHS', expand=True).split(",") + workdir = d.getVar('WORKDIR', expand=True) + for i in pseudoignorepaths: + if i and workdir.startswith(i): + status.addresult("You are building in a path included in PSEUDO_IGNORE_PATHS " + str(i) + " please locate the build outside this path.\n") + + # Check if PSEUDO_IGNORE_PATHS and and paths under pseudo control overlap + pseudoignorepaths = d.getVar('PSEUDO_IGNORE_PATHS', expand=True).split(",") + pseudo_control_dir = "${D},${PKGD},${PKGDEST},${IMAGEROOTFS},${SDK_OUTPUT}" + pseudocontroldir = d.expand(pseudo_control_dir).split(",") + for i in pseudoignorepaths: + for j in pseudocontroldir: + if i and j: + if j.startswith(i): + status.addresult("A path included in PSEUDO_IGNORE_PATHS " + str(i) + " and the path " + str(j) + " overlap and this will break pseudo permission and ownership tracking. Please set the path " + str(j) + " to a different directory which does not overlap with pseudo controlled directories. \n") + # Some third-party software apparently relies on chmod etc. being suid root (!!) import stat suid_check_bins = "chown chmod mknod".split() @@ -787,6 +804,11 @@ def check_sanity_everybuild(status, d): if "." in paths or "./" in paths or "" in paths: status.addresult("PATH contains '.', './' or '' (empty element), which will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n") + #Check if bitbake is present in PATH environment variable + bb_check = bb.utils.which(d.getVar('PATH'), 'bitbake') + if not bb_check: + bb.warn("bitbake binary is not found in PATH, did you source the script?") + # Check whether 'inherit' directive is found (used for a class to inherit) # in conf file it's supposed to be uppercase INHERIT inherit = d.getVar('inherit') diff --git a/poky/meta/classes/sstate.bbclass b/poky/meta/classes/sstate.bbclass index d08d950e7..f57916816 100644 --- a/poky/meta/classes/sstate.bbclass +++ b/poky/meta/classes/sstate.bbclass @@ -862,6 +862,8 @@ BB_HASHCHECK_FUNCTION = "sstate_checkhashes" def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, **kwargs): found = set() + foundLocal = set() + foundNet = set() missed = set() def gethash(task): @@ -894,6 +896,7 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, if os.path.exists(sstatefile): bb.debug(2, "SState: Found valid sstate file %s" % sstatefile) found.add(tid) + foundLocal.add(tid) continue else: missed.add(tid) @@ -939,6 +942,7 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, fetcher.checkstatus() bb.debug(2, "SState: Successful fetch test for %s" % srcuri) found.add(tid) + foundNet.add(tid) if tid in missed: missed.remove(tid) except: @@ -1000,7 +1004,7 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, match = 0 if total: match = len(found) / total * 100 - bb.plain("Sstate summary: Wanted %d Found %d Missed %d Current %d (%d%% match, %d%% complete)" % (total, len(found), len(missed), currentcount, match, complete)) + bb.plain("Sstate summary: Wanted %d Local %d Network %d Missed %d Current %d (%d%% match, %d%% complete)" % (total, len(foundLocal), len(foundNet),len(missed), currentcount, match, complete)) if hasattr(bb.parse.siggen, "checkhashes"): bb.parse.siggen.checkhashes(sq_data, missed, found, d) diff --git a/poky/meta/classes/staging.bbclass b/poky/meta/classes/staging.bbclass index f0a619b35..806a85773 100644 --- a/poky/meta/classes/staging.bbclass +++ b/poky/meta/classes/staging.bbclass @@ -5,6 +5,7 @@ SYSROOT_DIRS = " \ ${base_libdir} \ ${nonarch_base_libdir} \ ${datadir} \ + /sysroot-only \ " # These directories are also staged in the sysroot when they contain files that @@ -27,11 +28,15 @@ SYSROOT_DIRS_BLACKLIST = " \ ${mandir} \ ${docdir} \ ${infodir} \ + ${datadir}/X11/locale \ ${datadir}/applications \ + ${datadir}/bash-completion \ ${datadir}/fonts \ ${datadir}/gtk-doc/html \ + ${datadir}/installed-tests \ ${datadir}/locale \ ${datadir}/pixmaps \ + ${datadir}/terminfo \ ${libdir}/${BPN}/ptest \ " @@ -85,7 +90,6 @@ python sysroot_strip () { } do_populate_sysroot[dirs] = "${SYSROOT_DESTDIR}" -do_populate_sysroot[umask] = "022" addtask populate_sysroot after do_install diff --git a/poky/meta/classes/systemd.bbclass b/poky/meta/classes/systemd.bbclass index 9ec465c75..db5d10954 100644 --- a/poky/meta/classes/systemd.bbclass +++ b/poky/meta/classes/systemd.bbclass @@ -174,7 +174,8 @@ python systemd_populate_packages() { if path_found != '': systemd_add_files_and_parse(pkg_systemd, path_found, service, keys) else: - bb.fatal("SYSTEMD_SERVICE_%s value %s does not exist" % (pkg_systemd, service)) + bb.fatal("Didn't find service unit '{0}', specified in SYSTEMD_SERVICE_{1}. {2}".format( + service, pkg_systemd, "Also looked for service unit '{0}'.".format(base) if base is not None else "")) def systemd_create_presets(pkg, action): presetf = oe.path.join(d.getVar("PKGD"), d.getVar("systemd_unitdir"), "system-preset/98-%s.preset" % pkg) diff --git a/poky/meta/conf/abi_version.conf b/poky/meta/conf/abi_version.conf index 251d43bb2..35faef9a3 100644 --- a/poky/meta/conf/abi_version.conf +++ b/poky/meta/conf/abi_version.conf @@ -12,4 +12,4 @@ OELAYOUT_ABI = "14" # a reset of the equivalence, for example when reproducibility issues break the # existing match data. Distros can also append to this value for the same effect. # -HASHEQUIV_HASH_VERSION = "4" +HASHEQUIV_HASH_VERSION = "5" diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index be94b78eb..ecd4d1638 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -10,8 +10,8 @@ baselib = "${BASELIB}" baselib[vardepvalue] = "${baselib}" BASELIB = "lib" -BASELIB_powerpc64 = "lib64" -BASELIB_powerpc64le = "lib64" +BASELIB_libc-glibc_powerpc64 = "lib64" +BASELIB_libc-glibc_powerpc64le = "lib64" # Path prefixes export base_prefix = "" @@ -272,10 +272,8 @@ DEPCHAIN_PRE = "" DEPCHAIN_POST = "-dev -dbg" DEPENDS = "" -RDEPENDS = "" PROVIDES = "" PROVIDES_prepend = "${PN} " -RPROVIDES = "" MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives" @@ -498,7 +496,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 ccache gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo" +HOSTTOOLS_NONFATAL += "aws 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,7 +683,10 @@ 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/,/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}" +PSEUDO_IGNORE_PATHS = "/usr/,/etc/,/lib,/dev/,/run/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR}" +PSEUDO_IGNORE_PATHS .= ",${TMPDIR}/sstate-control,${TMPDIR}/buildstats,${TMPDIR}/sysroots-components,${TMPDIR}/pkgdata" +PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/deploy-,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/pkgdata-sysroot" +PSEUDO_IGNORE_PATHS .= ",${DEPLOY_DIR},${BUILDHISTORY_DIR},${TOPDIR}/cache,${COREBASE}/scripts,${CCACHE_DIR}" export PSEUDO_DISABLED = "1" #export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}" @@ -696,6 +697,7 @@ 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=${@oe.path.canonicalize(d.getVar('PSEUDO_IGNORE_PATHS'))} PSEUDO_DISABLED=0" FAKEROOTNOENV = "PSEUDO_UNLOAD=1" FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" +FAKEROOTLOGS = "${WORKDIR}/pseudo/pseudo.log" PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" ################################################################## @@ -870,6 +872,9 @@ SHELL[unexport] = "1" # Used by canadian-cross to handle string conversions on TARGET_ARCH where needed TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH').replace("_", "-")}" +# Set a default umask to use for tasks for determinism +BB_DEFAULT_UMASK = "022" + # Complete output from bitbake BB_CONSOLELOG ?= "${LOG_DIR}/cooker/${MACHINE}/${DATETIME}.log" diff --git a/poky/meta/conf/distro/include/default-versions.inc b/poky/meta/conf/distro/include/default-versions.inc index a6f331350..5e6fd8a26 100644 --- a/poky/meta/conf/distro/include/default-versions.inc +++ b/poky/meta/conf/distro/include/default-versions.inc @@ -2,3 +2,4 @@ # Default preferred versions # +PREFERRED_VERSION_adwaita-icon-theme ?= "3.34.3" diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index b0ddfb89a..9093f2d7f 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -85,8 +85,8 @@ RECIPE_MAINTAINER_pn-builder = "Richard Purdie <richard.purdie@linuxfoundation.o RECIPE_MAINTAINER_pn-buildtools-extended-tarball = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-buildtools-tarball = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-busybox = "Andrej Valek <andrej.valek@siemens.com>" -RECIPE_MAINTAINER_pn-busybox-inittab = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-bzip2 = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-busybox-inittab = "Denys Dmytriyenko <denis@denix.org>" +RECIPE_MAINTAINER_pn-bzip2 = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-ca-certificates = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-cairo = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -122,7 +122,7 @@ RECIPE_MAINTAINER_pn-core-image-sato-dev = "Richard Purdie <richard.purdie@linux RECIPE_MAINTAINER_pn-core-image-sato-ptest-fast = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-core-image-sato-sdk-ptest = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-coreutils = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-cpio = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-cpio = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-cracklib = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-createrepo-c = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-cronie = "Anuj Mittal <anuj.mittal@intel.com>" @@ -232,7 +232,7 @@ RECIPE_MAINTAINER_pn-gobject-introspection = "Alexander Kanavin <alex.kanavin@gm RECIPE_MAINTAINER_pn-gperf = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-gpgme = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-gptfdisk = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-grep = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-grep = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-groff = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-grub = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-grub-bootconf = "Anuj Mittal <anuj.mittal@intel.com>" @@ -253,9 +253,9 @@ RECIPE_MAINTAINER_pn-gstreamer1.0-rtsp-server = "Anuj Mittal <anuj.mittal@intel. RECIPE_MAINTAINER_pn-gstreamer1.0-vaapi = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-gtk+3 = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-gtk-doc = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-harfbuzz = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-hdparm = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-hdparm = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-help2man = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-hicolor-icon-theme = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-hwlatdetect = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -336,6 +336,7 @@ RECIPE_MAINTAINER_pn-libgcc = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libgcc-initial = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libgcrypt = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-libgfortran = "Khem Raj <raj.khem@gmail.com>" +RECIPE_MAINTAINER_pn-libgit2 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libgloss = "Alejandro Hernandez <aehs29@gmail.com>" RECIPE_MAINTAINER_pn-libglu = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libgpg-error = "Hongxu Jia <hongxu.jia@windriver.com>" @@ -349,6 +350,7 @@ RECIPE_MAINTAINER_pn-libinput = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libksba = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton <ross.burton@arm.com>" +RECIPE_MAINTAINER_pn-libmd = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <timothy.t.orling@linux.intel.com>" @@ -381,6 +383,7 @@ RECIPE_MAINTAINER_pn-libsm = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libsndfile1 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libsolv = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libsoup-2.4 = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-libssh2 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libssp-nonshared = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libtasn1 = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libtest-needs-perl = "Tim Orling <timothy.t.orling@linux.intel.com>" @@ -461,10 +464,10 @@ RECIPE_MAINTAINER_pn-ltp = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-lttng-modules = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-lttng-tools = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-lttng-ust = "Richard Purdie <richard.purdie@linuxfoundation.org>" -RECIPE_MAINTAINER_pn-lz4 = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-lzo = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-lzip = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-lzop = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-lz4 = "Denys Dmytriyenko <denis@denix.org>" +RECIPE_MAINTAINER_pn-lzo = "Denys Dmytriyenko <denis@denix.org>" +RECIPE_MAINTAINER_pn-lzip = "Denys Dmytriyenko <denis@denix.org>" +RECIPE_MAINTAINER_pn-lzop = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-m4 = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-m4-native = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-make = "Robert Yang <liezhi.yang@windriver.com>" @@ -508,7 +511,7 @@ RECIPE_MAINTAINER_pn-mpeg2dec = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-mpfr = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-mpg123 = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-msmtp = "Wang Mingyu <wangmy@cn.fujitsu.com>" -RECIPE_MAINTAINER_pn-mtd-utils = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-mtd-utils = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-mtdev = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-mtools = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-musl = "Khem Raj <raj.khem@gmail.com>" @@ -553,7 +556,7 @@ RECIPE_MAINTAINER_pn-pango = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-parted = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-patch = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-patchelf = "Richard Purdie <richard.purdie@linuxfoundation.org>" -RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <bruce.ashfield@gmail.com>" @@ -668,6 +671,7 @@ RECIPE_MAINTAINER_pn-slang = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-socat = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-speex = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-speexdsp = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-spirv-headers = "Jose Quaresma <quaresma.jose@gmail.com>" RECIPE_MAINTAINER_pn-spirv-tools = "Jose Quaresma <quaresma.jose@gmail.com>" RECIPE_MAINTAINER_pn-sqlite3 = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-squashfs-tools = "Robert Yang <liezhi.yang@windriver.com>" @@ -690,9 +694,9 @@ RECIPE_MAINTAINER_pn-systemd-conf = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-systemd-compat-units = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-systemd-serialgetty = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-systemd-systemctl-native = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-systemtap = "Victor Kamensky <kamensky@cisco.com>" -RECIPE_MAINTAINER_pn-systemtap-native = "Victor Kamensky <kamensky@cisco.com>" -RECIPE_MAINTAINER_pn-systemtap-uprobes = "Victor Kamensky <kamensky@cisco.com>" +RECIPE_MAINTAINER_pn-systemtap = "Victor Kamensky <victor.kamensky7@gmail.com>" +RECIPE_MAINTAINER_pn-systemtap-native = "Victor Kamensky <victor.kamensky7@gmail.com>" +RECIPE_MAINTAINER_pn-systemtap-uprobes = "Victor Kamensky <victor.kamensky7@gmail.com>" RECIPE_MAINTAINER_pn-sysvinit = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-sysvinit-inittab = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-taglib = "Anuj Mittal <anuj.mittal@intel.com>" @@ -714,7 +718,7 @@ RECIPE_MAINTAINER_pn-udev-extraconf = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-unfs3 = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-unifdef = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-uninative-tarball = "Richard Purdie <richard.purdie@linuxfoundation.org>" -RECIPE_MAINTAINER_pn-unzip = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-unzip = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-update-rc.d = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-usbinit = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-usbutils = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -735,12 +739,12 @@ RECIPE_MAINTAINER_pn-vulkan-tools = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-waffle = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-watchdog = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-watchdog-config = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-wayland = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-wayland-utils = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-wayland = "Denys Dmytriyenko <denis@denix.org>" +RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko <denis@denix.org>" +RECIPE_MAINTAINER_pn-wayland-utils = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-webkitgtk = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko <denis@denix.org>" +RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-wget = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-which = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-wic-tools = "Anuj Mittal <anuj.mittal@intel.com>" @@ -794,7 +798,7 @@ RECIPE_MAINTAINER_pn-xtrans = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xuser-account = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xvinfo = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-zlib = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <denis@denix.org>" +RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <denis@denix.org>" +RECIPE_MAINTAINER_pn-zlib = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-zstd = "Alexander Kanavin <alex.kanavin@gmail.com>" diff --git a/poky/meta/conf/distro/include/security_flags.inc b/poky/meta/conf/distro/include/security_flags.inc index 4e64eb99f..f996ca9be 100644 --- a/poky/meta/conf/distro/include/security_flags.inc +++ b/poky/meta/conf/distro/include/security_flags.inc @@ -10,7 +10,9 @@ GCCPIE ?= "--enable-default-pie" # _FORTIFY_SOURCE requires -O1 or higher, so disable in debug builds as they use # -O0 which then results in a compiler warning. -lcl_maybe_fortify ?= "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=2',d)}" +OPTLEVEL = "${@bb.utils.filter('SELECTED_OPTIMIZATION', '-O0 -O1 -O2 -O3 -Ofast -Og -Os -Oz -O', d)}" + +lcl_maybe_fortify ?= "${@oe.utils.conditional('OPTLEVEL','-O0','','${OPTLEVEL} -D_FORTIFY_SOURCE=2',d)}" # Error on use of format strings that represent possible security problems SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security" diff --git a/poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc index fd4d760b3..76ada982f 100644 --- a/poky/meta/conf/distro/include/tcmode-default.inc +++ b/poky/meta/conf/distro/include/tcmode-default.inc @@ -18,15 +18,15 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "10.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.35%" +BINUVERSION ?= "2.36%" GDBVERSION ?= "10.%" -GLIBCVERSION ?= "2.32" +GLIBCVERSION ?= "2.33" LINUXLIBCVERSION ?= "5.10%" -QEMUVERSION ?= "5.1%" -GOVERSION ?= "1.15%" +QEMUVERSION ?= "5.2%" +GOVERSION ?= "1.16%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump -LLVMVERSION ?= "10.0.1" +LLVMVERSION ?= "11.1.0" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" diff --git a/poky/meta/conf/distro/include/yocto-uninative.inc b/poky/meta/conf/distro/include/yocto-uninative.inc index 69b6edee5..a2a2dd18e 100644 --- a/poky/meta/conf/distro/include/yocto-uninative.inc +++ b/poky/meta/conf/distro/include/yocto-uninative.inc @@ -6,9 +6,9 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.32" +UNINATIVE_MAXGLIBCVERSION = "2.33" -UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.9/" -UNINATIVE_CHECKSUM[aarch64] ?= "9f25a667aee225b1dd65c4aea73e01983e825b1cb9b56937932a1ee328b45f81" -UNINATIVE_CHECKSUM[i686] ?= "cae5d73245d95b07cf133b780ba3f6c8d0adca3ffc4e7e7fab999961d5e24d36" -UNINATIVE_CHECKSUM[x86_64] ?= "d07916b95c419c81541a19c8ef0ed8cbd78ae18437ff28a4c8a60ef40518e423" +UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/3.0/" +UNINATIVE_CHECKSUM[aarch64] ?= "1c668909098c5b56132067adc69a249cb771f4560428e5822de903a12d97bf33" +UNINATIVE_CHECKSUM[i686] ?= "e6cc2fc056234cffa6a2ff084cce27d544ea3f487a62b5e253351cefd4421900" +UNINATIVE_CHECKSUM[x86_64] ?= "5ec5a9276046e7eceeac749a18b175667384e1f445cd4526300a41404d985a5b" diff --git a/poky/meta/conf/documentation.conf b/poky/meta/conf/documentation.conf index eee3c43ff..c5a38b076 100644 --- a/poky/meta/conf/documentation.conf +++ b/poky/meta/conf/documentation.conf @@ -123,6 +123,8 @@ CONFLICT_MACHINE_FEATURES[doc] = "When a recipe inherits the features_check clas CORE_IMAGE_EXTRA_INSTALL[doc] = "Specifies the list of packages to be added to the image. You should only set this variable in the conf/local.conf file in the Build Directory." COREBASE[doc] = "Specifies the parent directory of the OpenEmbedded Core Metadata layer (i.e. meta)." CONF_VERSION[doc] = "Tracks the version of local.conf. Increased each time build/conf/ changes incompatibly." +CVE_CHECK_LAYER_EXCLUDELIST[doc] = "Defines which layers to exclude from cve-check scanning" +CVE_CHECK_LAYER_INCLUDELIST[doc] = "Defines which layers to include during cve-check scanning" #D diff --git a/poky/meta/conf/licenses.conf b/poky/meta/conf/licenses.conf index 5b309eb38..1fe5fc6ec 100644 --- a/poky/meta/conf/licenses.conf +++ b/poky/meta/conf/licenses.conf @@ -10,27 +10,58 @@ # Any mapping to MPL/LGPL/GPL should be fixed # AGPL variations -SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0" -SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0" -SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0" +SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0-only" +SPDXLICENSEMAP[AGPL-3+] = "AGPL-3.0-or-later" +SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0-only" +SPDXLICENSEMAP[AGPLv3+] = "AGPL-3.0-or-later" +SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0-only" +SPDXLICENSEMAP[AGPLv3.0+] = "AGPL-3.0-or-later" +SPDXLICENSEMAP[AGPL-3.0] = "AGPL-3.0-only" +SPDXLICENSEMAP[AGPL-3.0+] = "AGPL-3.0-or-later" # GPL variations -SPDXLICENSEMAP[GPL-1] = "GPL-1.0" -SPDXLICENSEMAP[GPLv1] = "GPL-1.0" -SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0" -SPDXLICENSEMAP[GPL-2] = "GPL-2.0" -SPDXLICENSEMAP[GPLv2] = "GPL-2.0" -SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0" -SPDXLICENSEMAP[GPL-3] = "GPL-3.0" -SPDXLICENSEMAP[GPLv3] = "GPL-3.0" -SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0" +SPDXLICENSEMAP[GPL-1] = "GPL-1.0-only" +SPDXLICENSEMAP[GPL-1+] = "GPL-1.0-or-later" +SPDXLICENSEMAP[GPLv1] = "GPL-1.0-only" +SPDXLICENSEMAP[GPLv1+] = "GPL-1.0-or-later" +SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0-only" +SPDXLICENSEMAP[GPLv1.0+] = "GPL-1.0-or-later" +SPDXLICENSEMAP[GPL-1.0] = "GPL-1.0-only" +SPDXLICENSEMAP[GPL-1.0+] = "GPL-1.0-or-later" +SPDXLICENSEMAP[GPL-2] = "GPL-2.0-only" +SPDXLICENSEMAP[GPL-2+] = "GPL-2.0-or-later" +SPDXLICENSEMAP[GPLv2] = "GPL-2.0-only" +SPDXLICENSEMAP[GPLv2+] = "GPL-2.0-or-later" +SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0-only" +SPDXLICENSEMAP[GPLv2.0+] = "GPL-2.0-or-later" +SPDXLICENSEMAP[GPL-2.0] = "GPL-2.0-only" +SPDXLICENSEMAP[GPL-2.0+] = "GPL-2.0-or-later" +SPDXLICENSEMAP[GPL-3] = "GPL-3.0-only" +SPDXLICENSEMAP[GPL-3+] = "GPL-3.0-or-later" +SPDXLICENSEMAP[GPLv3] = "GPL-3.0-only" +SPDXLICENSEMAP[GPLv3+] = "GPL-3.0-or-later" +SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0-only" +SPDXLICENSEMAP[GPLv3.0+] = "GPL-3.0-or-later" +SPDXLICENSEMAP[GPL-3.0] = "GPL-3.0-only" +SPDXLICENSEMAP[GPL-3.0+] = "GPL-3.0-or-later" #LGPL variations -SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0" -SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0" -SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1" -SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1" -SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0" +SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0-only" +SPDXLICENSEMAP[LGPLv2+] = "LGPL-2.0-or-later" +SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0-only" +SPDXLICENSEMAP[LGPLv2.0+] = "LGPL-2.0-or-later" +SPDXLICENSEMAP[LGPL-2.0] = "LGPL-2.0-only" +SPDXLICENSEMAP[LGPL-2.0+] = "LGPL-2.0-or-later" +SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1-only" +SPDXLICENSEMAP[LGPL2.1+] = "LGPL-2.1-or-later" +SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1-only" +SPDXLICENSEMAP[LGPLv2.1+] = "LGPL-2.1-or-later" +SPDXLICENSEMAP[LGPL-2.1] = "LGPL-2.1-only" +SPDXLICENSEMAP[LGPL-2.1+] = "LGPL-2.1-or-later" +SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0-only" +SPDXLICENSEMAP[LGPLv3+] = "LGPL-3.0-or-later" +SPDXLICENSEMAP[LGPL-3.0] = "LGPL-3.0-only" +SPDXLICENSEMAP[LGPL-3.0+] = "LGPL-3.0-or-later" #MPL variations SPDXLICENSEMAP[MPL-1] = "MPL-1.0" diff --git a/poky/meta/conf/machine-sdk/ppc64le.conf b/poky/meta/conf/machine-sdk/ppc64le.conf new file mode 100644 index 000000000..0eebc5853 --- /dev/null +++ b/poky/meta/conf/machine-sdk/ppc64le.conf @@ -0,0 +1,2 @@ +SDK_ARCH = "ppc64le" +ABIEXTENSION_class-nativesdk = "" diff --git a/poky/meta/conf/machine/include/qemu.inc b/poky/meta/conf/machine/include/qemu.inc index 8dedb1a42..7d0a6fe45 100644 --- a/poky/meta/conf/machine/include/qemu.inc +++ b/poky/meta/conf/machine/include/qemu.inc @@ -21,7 +21,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" # Use a common kernel recipe for all QEMU machines PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" +EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native" # Provide the nfs server kernel module for all qemu images KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" diff --git a/poky/meta/conf/machine/include/tune-power9.inc b/poky/meta/conf/machine/include/tune-power9.inc index 81d6e8e9b..401b73744 100644 --- a/poky/meta/conf/machine/include/tune-power9.inc +++ b/poky/meta/conf/machine/include/tune-power9.inc @@ -28,8 +28,4 @@ TUNE_PKGARCH_tune-ppc64p9le = "ppc64p9le" PACKAGE_EXTRA_ARCHS_tune-ppc64p9le = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64le} ppc64p9le" # glibc configure options to get power9 specific library -GLIBC_EXTRA_OECONF_powerpc64 += "${@bb.utils.contains('TUNE_FEATURES', 'power9', '--with-cpu=power9', '', d)}" -GLIBC_EXTRA_OECONF_powerpc += "${@bb.utils.contains('TUNE_FEATURES', 'power9', '--with-cpu=power9', '', d)}" - -# QEMU usermode fails with invalid instruction error -MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "${@bb.utils.contains('TUNE_FEATURES', 'power9', ' qemu-usermode', '', d)}" +GLIBC_EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'power9', '--with-cpu=power9', '', d)}" diff --git a/poky/meta/conf/sanity.conf b/poky/meta/conf/sanity.conf index 8ae548941..ef7cee6b6 100644 --- a/poky/meta/conf/sanity.conf +++ b/poky/meta/conf/sanity.conf @@ -3,7 +3,7 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.47.0" +BB_MIN_VERSION = "1.49.2" SANITY_ABIFILE = "${TMPDIR}/abi_version" diff --git a/poky/meta/files/common-licenses/AGPL-3.0 b/poky/meta/files/common-licenses/AGPL-3.0-only index dba13ed2d..dba13ed2d 100644 --- a/poky/meta/files/common-licenses/AGPL-3.0 +++ b/poky/meta/files/common-licenses/AGPL-3.0-only diff --git a/poky/meta/files/common-licenses/AGPL-3.0-or-later b/poky/meta/files/common-licenses/AGPL-3.0-or-later new file mode 100644 index 000000000..fe0ef42ff --- /dev/null +++ b/poky/meta/files/common-licenses/AGPL-3.0-or-later @@ -0,0 +1,613 @@ +GNU AFFERO GENERAL PUBLIC LICENSE + +Version 3, 19 November 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The GNU Affero General Public License is a free, copyleft license for software +and other kinds of works, specifically designed to ensure cooperation with +the community in the case of network server software. + +The licenses for most software and other practical works are designed to take +away your freedom to share and change the works. By contrast, our General +Public Licenses are intended to guarantee your freedom to share and change +all versions of a program--to make sure it remains free software for all its +users. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom +to distribute copies of free software (and charge for them if you wish), that +you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs, and that you know you +can do these things. + +Developers that use our General Public Licenses protect your rights with two +steps: (1) assert copyright on the software, and (2) offer you this License +which gives you legal permission to copy, distribute and/or modify the software. + +A secondary benefit of defending all users' freedom is that improvements made +in alternate versions of the program, if they receive widespread use, become +available for other developers to incorporate. Many developers of free software +are heartened and encouraged by the resulting cooperation. However, in the +case of software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and letting +the public access it on a server without ever releasing its source code to +the public. + +The GNU Affero General Public License is designed specifically to ensure that, +in such cases, the modified source code becomes available to the community. +It requires the operator of a network server to provide the source code of +the modified version running there to the users of that server. Therefore, +public use of a modified version, on a publicly accessible server, gives the +public access to the source code of the modified version. + +An older license, called the Affero General Public License and published by +Affero, was designed to accomplish similar goals. This is a different license, +not a version of the Affero GPL, but Affero has released a new version of +the Affero GPL which permits relicensing under this license. + +The precise terms and conditions for copying, distribution and modification +follow. + +TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + +"Copyright" also means copyright-like laws that apply to other kinds of works, +such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this License. +Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals +or organizations. + +To "modify" a work means to copy from or adapt all or part of the work in +a fashion requiring copyright permission, other than the making of an exact +copy. The resulting work is called a "modified version" of the earlier work +or a work "based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based on the +Program. + +To "propagate" a work means to do anything with it that, without permission, +would make you directly or secondarily liable for infringement under applicable +copyright law, except executing it on a computer or modifying a private copy. +Propagation includes copying, distribution (with or without modification), +making available to the public, and in some countries other activities as +well. + +To "convey" a work means any kind of propagation that enables other parties +to make or receive copies. Mere interaction with a user through a computer +network, with no transfer of a copy, is not conveying. + +An interactive user interface displays "Appropriate Legal Notices" to the +extent that it includes a convenient and prominently visible feature that +(1) displays an appropriate copyright notice, and (2) tells the user that +there is no warranty for the work (except to the extent that warranties are +provided), that licensees may convey the work under this License, and how +to view a copy of this License. If the interface presents a list of user commands +or options, such as a menu, a prominent item in the list meets this criterion. + + 1. Source Code. + +The "source code" for a work means the preferred form of the work for making +modifications to it. "Object code" means any non-source form of a work. + +A "Standard Interface" means an interface that either is an official standard +defined by a recognized standards body, or, in the case of interfaces specified +for a particular programming language, one that is widely used among developers +working in that language. + +The "System Libraries" of an executable work include anything, other than +the work as a whole, that (a) is included in the normal form of packaging +a Major Component, but which is not part of that Major Component, and (b) +serves only to enable use of the work with that Major Component, or to implement +a Standard Interface for which an implementation is available to the public +in source code form. A "Major Component", in this context, means a major essential +component (kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to produce +the work, or an object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all the source +code needed to generate, install, and (for an executable work) run the object +code and to modify the work, including scripts to control those activities. +However, it does not include the work's System Libraries, or general-purpose +tools or generally available free programs which are used unmodified in performing +those activities but which are not part of the work. For example, Corresponding +Source includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically linked +subprograms that the work is specifically designed to require, such as by +intimate data communication or control flow between those + + subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate +automatically from other parts of the Corresponding Source. + + The Corresponding Source for a work in source code form is that same work. + + 2. Basic Permissions. + +All rights granted under this License are granted for the term of copyright +on the Program, and are irrevocable provided the stated conditions are met. +This License explicitly affirms your unlimited permission to run the unmodified +Program. The output from running a covered work is covered by this License +only if the output, given its content, constitutes a covered work. This License +acknowledges your rights of fair use or other equivalent, as provided by copyright +law. + +You may make, run and propagate covered works that you do not convey, without +conditions so long as your license otherwise remains in force. You may convey +covered works to others for the sole purpose of having them make modifications +exclusively for you, or provide you with facilities for running those works, +provided that you comply with the terms of this License in conveying all material +for which you do not control copyright. Those thus making or running the covered +works for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of your copyrighted +material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions +stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + +No covered work shall be deemed part of an effective technological measure +under any applicable law fulfilling obligations under article 11 of the WIPO +copyright treaty adopted on 20 December 1996, or similar laws prohibiting +or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention +of technological measures to the extent such circumvention is effected by +exercising rights under this License with respect to the covered work, and +you disclaim any intention to limit operation or modification of the work +as a means of enforcing, against the work's users, your or third parties' +legal rights to forbid circumvention of technological measures. + + 4. Conveying Verbatim Copies. + +You may convey verbatim copies of the Program's source code as you receive +it, in any medium, provided that you conspicuously and appropriately publish +on each copy an appropriate copyright notice; keep intact all notices stating +that this License and any non-permissive terms added in accord with section +7 apply to the code; keep intact all notices of the absence of any warranty; +and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you +may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + +You may convey a work based on the Program, or the modifications to produce +it from the Program, in the form of source code under the terms of section +4, provided that you also meet all of these conditions: + +a) The work must carry prominent notices stating that you modified it, and +giving a relevant date. + +b) The work must carry prominent notices stating that it is released under +this License and any conditions added under section 7. This requirement modifies +the requirement in section 4 to "keep intact all notices". + +c) You must license the entire work, as a whole, under this License to anyone +who comes into possession of a copy. This License will therefore apply, along +with any applicable section 7 additional terms, to the whole of the work, +and all its parts, regardless of how they are packaged. This License gives +no permission to license the work in any other way, but it does not invalidate +such permission if you have separately received it. + +d) If the work has interactive user interfaces, each must display Appropriate +Legal Notices; however, if the Program has interactive interfaces that do +not display Appropriate Legal Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, +which are not by their nature extensions of the covered work, and which are +not combined with it such as to form a larger program, in or on a volume of +a storage or distribution medium, is called an "aggregate" if the compilation +and its resulting copyright are not used to limit the access or legal rights +of the compilation's users beyond what the individual works permit. Inclusion +of a covered work in an aggregate does not cause this License to apply to +the other parts of the aggregate. + + 6. Conveying Non-Source Forms. + +You may convey a covered work in object code form under the terms of sections +4 and 5, provided that you also convey the machine-readable Corresponding +Source under the terms of this License, in one of these ways: + +a) Convey the object code in, or embodied in, a physical product (including +a physical distribution medium), accompanied by the Corresponding Source fixed +on a durable physical medium customarily used for software interchange. + +b) Convey the object code in, or embodied in, a physical product (including +a physical distribution medium), accompanied by a written offer, valid for +at least three years and valid for as long as you offer spare parts or customer +support for that product model, to give anyone who possesses the object code +either (1) a copy of the Corresponding Source for all the software in the +product that is covered by this License, on a durable physical medium customarily +used for software interchange, for a price no more than your reasonable cost +of physically performing this conveying of source, or (2) access to copy the +Corresponding Source from a network server at no charge. + +c) Convey individual copies of the object code with a copy of the written +offer to provide the Corresponding Source. This alternative is allowed only +occasionally and noncommercially, and only if you received the object code +with such an offer, in accord with subsection 6b. + +d) Convey the object code by offering access from a designated place (gratis +or for a charge), and offer equivalent access to the Corresponding Source +in the same way through the same place at no further charge. You need not +require recipients to copy the Corresponding Source along with the object +code. If the place to copy the object code is a network server, the Corresponding +Source may be on a different server (operated by you or a third party) that +supports equivalent copying facilities, provided you maintain clear directions +next to the object code saying where to find the Corresponding Source. Regardless +of what server hosts the Corresponding Source, you remain obligated to ensure +that it is available for as long as needed to satisfy these requirements. + +e) Convey the object code using peer-to-peer transmission, provided you inform +other peers where the object code and Corresponding Source of the work are +being offered to the general public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded from +the Corresponding Source as a System Library, need not be included in conveying +the object code work. + +A "User Product" is either (1) a "consumer product", which means any tangible +personal property which is normally used for personal, family, or household +purposes, or (2) anything designed or sold for incorporation into a dwelling. +In determining whether a product is a consumer product, doubtful cases shall +be resolved in favor of coverage. For a particular product received by a particular +user, "normally used" refers to a typical or common use of that class of product, +regardless of the status of the particular user or of the way in which the +particular user actually uses, or expects or is expected to use, the product. +A product is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent the +only significant mode of use of the product. + +"Installation Information" for a User Product means any methods, procedures, +authorization keys, or other information required to install and execute modified +versions of a covered work in that User Product from a modified version of +its Corresponding Source. The information must suffice to ensure that the +continued functioning of the modified object code is in no case prevented +or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically +for use in, a User Product, and the conveying occurs as part of a transaction +in which the right of possession and use of the User Product is transferred +to the recipient in perpetuity or for a fixed term (regardless of how the +transaction is characterized), the Corresponding Source conveyed under this +section must be accompanied by the Installation Information. But this requirement +does not apply if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has been installed +in ROM). + +The requirement to provide Installation Information does not include a requirement +to continue to provide support service, warranty, or updates for a work that +has been modified or installed by the recipient, or for the User Product in +which it has been modified or installed. Access to a network may be denied +when the modification itself materially and adversely affects the operation +of the network or violates the rules and protocols for communication across +the network. + +Corresponding Source conveyed, and Installation Information provided, in accord +with this section must be in a format that is publicly documented (and with +an implementation available to the public in source code form), and must require +no special password or key for unpacking, reading or copying. + + 7. Additional Terms. + +"Additional permissions" are terms that supplement the terms of this License +by making exceptions from one or more of its conditions. Additional permissions +that are applicable to the entire Program shall be treated as though they +were included in this License, to the extent that they are valid under applicable +law. If additional permissions apply only to part of the Program, that part +may be used separately under those permissions, but the entire Program remains +governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any +additional permissions from that copy, or from any part of it. (Additional +permissions may be written to require their own removal in certain cases when +you modify the work.) You may place additional permissions on material, added +by you to a covered work, for which you have or can give appropriate copyright +permission. + +Notwithstanding any other provision of this License, for material you add +to a covered work, you may (if authorized by the copyright holders of that +material) supplement the terms of this License with terms: + +a) Disclaiming warranty or limiting liability differently from the terms of +sections 15 and 16 of this License; or + +b) Requiring preservation of specified reasonable legal notices or author +attributions in that material or in the Appropriate Legal Notices displayed +by works containing it; or + +c) Prohibiting misrepresentation of the origin of that material, or requiring +that modified versions of such material be marked in reasonable ways as different +from the original version; or + +d) Limiting the use for publicity purposes of names of licensors or authors +of the material; or + +e) Declining to grant rights under trademark law for use of some trade names, +trademarks, or service marks; or + +f) Requiring indemnification of licensors and authors of that material by +anyone who conveys the material (or modified versions of it) with contractual +assumptions of liability to the recipient, for any liability that these contractual +assumptions directly impose on those licensors and authors. + +All other non-permissive additional terms are considered "further restrictions" +within the meaning of section 10. If the Program as you received it, or any +part of it, contains a notice stating that it is governed by this License +along with a term that is a further restriction, you may remove that term. +If a license document contains a further restriction but permits relicensing +or conveying under this License, you may add to a covered work material governed +by the terms of that license document, provided that the further restriction +does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, +in the relevant source files, a statement of the additional terms that apply +to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form +of a separately written license, or stated as exceptions; the above requirements +apply either way. + + 8. Termination. + +You may not propagate or modify a covered work except as expressly provided +under this License. Any attempt otherwise to propagate or modify it is void, +and will automatically terminate your rights under this License (including +any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from +a particular copyright holder is reinstated (a) provisionally, unless and +until the copyright holder explicitly and finally terminates your license, +and (b) permanently, if the copyright holder fails to notify you of the violation +by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently +if the copyright holder notifies you of the violation by some reasonable means, +this is the first time you have received notice of violation of this License +(for any work) from that copyright holder, and you cure the violation prior +to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses +of parties who have received copies or rights from you under this License. +If your rights have been terminated and not permanently reinstated, you do +not qualify to receive new licenses for the same material under section 10. + + 9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run a copy +of the Program. Ancillary propagation of a covered work occurring solely as +a consequence of using peer-to-peer transmission to receive a copy likewise +does not require acceptance. However, nothing other than this License grants +you permission to propagate or modify any covered work. These actions infringe +copyright if you do not accept this License. Therefore, by modifying or propagating +a covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically receives +a license from the original licensors, to run, modify and propagate that work, +subject to this License. You are not responsible for enforcing compliance +by third parties with this License. + +An "entity transaction" is a transaction transferring control of an organization, +or substantially all assets of one, or subdividing an organization, or merging +organizations. If propagation of a covered work results from an entity transaction, +each party to that transaction who receives a copy of the work also receives +whatever licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the Corresponding +Source of the work from the predecessor in interest, if the predecessor has +it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights +granted or affirmed under this License. For example, you may not impose a +license fee, royalty, or other charge for exercise of rights granted under +this License, and you may not initiate litigation (including a cross-claim +or counterclaim in a lawsuit) alleging that any patent claim is infringed +by making, using, selling, offering for sale, or importing the Program or +any portion of it. + + 11. Patents. + +A "contributor" is a copyright holder who authorizes use under this License +of the Program or a work on which the Program is based. The work thus licensed +is called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims owned or controlled +by the contributor, whether already acquired or hereafter acquired, that would +be infringed by some manner, permitted by this License, of making, using, +or selling its contributor version, but do not include claims that would be +infringed only as a consequence of further modification of the contributor +version. For purposes of this definition, "control" includes the right to +grant patent sublicenses in a manner consistent with the requirements of this +License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent +license under the contributor's essential patent claims, to make, use, sell, +offer for sale, import and otherwise run, modify and propagate the contents +of its contributor version. + +In the following three paragraphs, a "patent license" is any express agreement +or commitment, however denominated, not to enforce a patent (such as an express +permission to practice a patent or covenant not to sue for patent infringement). +To "grant" such a patent license to a party means to make such an agreement +or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the +Corresponding Source of the work is not available for anyone to copy, free +of charge and under the terms of this License, through a publicly available +network server or other readily accessible means, then you must either (1) +cause the Corresponding Source to be so available, or (2) arrange to deprive +yourself of the benefit of the patent license for this particular work, or +(3) arrange, in a manner consistent with the requirements of this License, +to extend the patent + +license to downstream recipients. "Knowingly relying" means you have actual +knowledge that, but for the patent license, your conveying the covered work +in a country, or your recipient's use of the covered work in a country, would +infringe one or more identifiable patents in that country that you have reason +to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, +you convey, or propagate by procuring conveyance of, a covered work, and grant +a patent license to some of the parties receiving the covered work authorizing +them to use, propagate, modify or convey a specific copy of the covered work, +then the patent license you grant is automatically extended to all recipients +of the covered work and works based on it. + +A patent license is "discriminatory" if it does not include within the scope +of its coverage, prohibits the exercise of, or is conditioned on the non-exercise +of one or more of the rights that are specifically granted under this License. +You may not convey a covered work if you are a party to an arrangement with +a third party that is in the business of distributing software, under which +you make payment to the third party based on the extent of your activity of +conveying the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory patent +license (a) in connection with copies of the covered work conveyed by you +(or copies made from those copies), or (b) primarily for and in connection +with specific products or compilations that contain the covered work, unless +you entered into that arrangement, or that patent license was granted, prior +to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied +license or other defenses to infringement that may otherwise be available +to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or otherwise) +that contradict the conditions of this License, they do not excuse you from +the conditions of this License. If you cannot convey a covered work so as +to satisfy simultaneously your obligations under this License and any other +pertinent obligations, then as a consequence you may + +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey the +Program, the only way you could satisfy both those terms and this License +would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + +Notwithstanding any other provision of this License, if you modify the Program, +your modified version must prominently offer all users interacting with it +remotely through a computer network (if your version supports such interaction) +an opportunity to receive the Corresponding Source of your version by providing +access to the Corresponding Source from a network server at no charge, through +some standard or customary means of facilitating copying of software. This +Corresponding Source shall include the Corresponding Source for any work covered +by version 3 of the GNU General Public License that is incorporated pursuant +to the following paragraph. + +Notwithstanding any other provision of this License, you have permission to +link or combine any covered work with a work licensed under version 3 of the +GNU General Public License into a single combined work, and to convey the +resulting work. The terms of this License will continue to apply to the part +which is the covered work, but the work with which it is combined will remain +governed by version 3 of the GNU General Public License. + + 14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions of the +GNU Affero General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to address +new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +that a certain numbered version of the GNU Affero General Public License "or +any later version" applies to it, you have the option of following the terms +and conditions either of that numbered version or of any later version published +by the Free Software Foundation. If the Program does not specify a version +number of the GNU Affero General Public License, you may choose any version +ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of +the GNU Affero General Public License can be used, that proxy's public statement +of acceptance of a version permanently authorizes you to choose that version +for the Program. + +Later license versions may give you additional or different permissions. However, +no additional obligations are imposed on any author or copyright holder as +a result of your choosing to follow a later version. + + 15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE +LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER +EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM +PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + + 16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL +ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM +AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, +INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO +USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED +INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER +PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided above cannot +be given local legal effect according to their terms, reviewing courts shall +apply local law that most closely approximates an absolute waiver of all civil +liability in connection with the Program, unless a warranty or assumption +of liability accompanies a copy of the Program in return for a fee. END OF +TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible +use to the public, the best way to achieve this is to make it free software +which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach +them to the start of each source file to most effectively state the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + +<one line to give the program's name and a brief idea of what it does.> + +Copyright (C) <year> <name of author> + +This program is free software: you can redistribute it and/or modify it under +the terms of the GNU Affero General Public License as published by the Free +Software Foundation, either version 3 of the License, or (at your option) +any later version. + +This program 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 Affero General Public License for more +details. + +You should have received a copy of the GNU Affero General Public License along +with this program. If not, see <https://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + +If your software can interact with users remotely through a computer network, +you should also make sure that it provides a way for users to get its source. +For example, if your program is a web application, its interface could display +a "Source" link that leads users to an archive of the code. There are many +ways you could offer source, and different solutions will be better for different +programs; see section 13 for the specific requirements. + +You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. For +more information on this, and how to apply and follow the GNU AGPL, see <https://www.gnu.org/licenses/>. diff --git a/poky/meta/files/common-licenses/BSD-3-Clause-Clear b/poky/meta/files/common-licenses/BSD-3-Clause-Clear new file mode 100644 index 000000000..c6e95da6a --- /dev/null +++ b/poky/meta/files/common-licenses/BSD-3-Clause-Clear @@ -0,0 +1,32 @@ +The Clear BSD License + +Copyright (c) [xxxx]-[xxxx] [Owner Organization] +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted (subject to the limitations in the disclaimer +below) provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of [Owner Organization] nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY +THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/poky/meta/files/common-licenses/GPL-1.0 b/poky/meta/files/common-licenses/GPL-1.0-only index 9d4ef93ae..9d4ef93ae 100644 --- a/poky/meta/files/common-licenses/GPL-1.0 +++ b/poky/meta/files/common-licenses/GPL-1.0-only diff --git a/poky/meta/files/common-licenses/GPL-1.0-or-later b/poky/meta/files/common-licenses/GPL-1.0-or-later new file mode 100644 index 000000000..b616110c7 --- /dev/null +++ b/poky/meta/files/common-licenses/GPL-1.0-or-later @@ -0,0 +1,232 @@ +GNU GENERAL PUBLIC LICENSE + +Version 1, February 1989 + +Copyright (C) 1989 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor, +Boston, MA 02110-1301 USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The license agreements of most software companies try to keep users at the +mercy of those companies. By contrast, our General Public License is intended +to guarantee your freedom to share and change free software--to make sure +the software is free for all its users. The General Public License applies +to the Free Software Foundation's software and to any other program whose +authors commit to using it. You can use it for your programs, too. + +When we speak of free software, we are referring to freedom, not price. Specifically, +the General Public License is designed to make sure that you have the freedom +to give away or sell copies of free software, that you receive source code +or can get it if you want it, that you can change the software or use pieces +of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to +deny you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of +the software, or if you modify it. + +For example, if you distribute copies of a such a program, whether gratis +or for a fee, you must give the recipients all the rights that you have. You +must make sure that they, too, receive or can get the source code. And you +must tell them their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If +the software is modified by someone else and passed on, we want its recipients +to know that what they have is not the original, so that any problems introduced +by others will not reflect on the original authors' reputations. + +The precise terms and conditions for copying, distribution and modification +follow. + +GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION +AND MODIFICATION + +0. This License Agreement applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed under +the terms of this General Public License. The "Program", below, refers to +any such program or work, and a "work based on the Program" means either the +Program or any work containing the Program or a portion of it, either verbatim +or with modifications. Each licensee is addressed as "you". + +1. You may copy and distribute verbatim copies of the Program's source code +as you receive it, in any medium, provided that you conspicuously and appropriately +publish on each copy an appropriate copyright notice and disclaimer of warranty; +keep intact all the notices that refer to this General Public License and +to the absence of any warranty; and give any other recipients of the Program +a copy of this General Public License along with the Program. You may charge +a fee for the physical act of transferring a copy. + +2. You may modify your copy or copies of the Program or any portion of it, +and copy and distribute such modifications under the terms of Paragraph 1 +above, provided that you also do the following: + +a) cause the modified files to carry prominent notices stating that you changed +the files and the date of any change; and + +b) cause the whole of any work that you distribute or publish, that in whole +or in part contains the Program or any part thereof, either with or without +modifications, to be licensed at no charge to all third parties under the +terms of this General Public License (except that you may choose to grant +warranty protection to some or all third parties, at your option). + +c) If the modified program normally reads commands interactively when run, +you must cause it, when started running for such interactive use in the simplest +and most usual way, to print or display an announcement including an appropriate +copyright notice and a notice that there is no warranty (or else, saying that +you provide a warranty) and that users may redistribute the program under +these conditions, and telling the user how to view a copy of this General +Public License. + +d) You may charge a fee for the physical act of transferring a copy, and you +may at your option offer warranty protection in exchange for a fee. + +Mere aggregation of another independent work with the Program (or its derivative) +on a volume of a storage or distribution medium does not bring the other work +under the scope of these terms. + +3. You may copy and distribute the Program (or a portion or derivative of +it, under Paragraph 2) in object code or executable form under the terms of +Paragraphs 1 and 2 above provided that you also do one of the following: + +a) accompany it with the complete corresponding machine-readable source code, +which must be distributed under the terms of Paragraphs 1 and 2 above; or, + +b) accompany it with a written offer, valid for at least three years, to give +any third party free (except for a nominal charge for the cost of distribution) +a complete machine-readable copy of the corresponding source code, to be distributed +under the terms of Paragraphs 1 and 2 above; or, + +c) accompany it with the information you received as to where the corresponding +source code may be obtained. (This alternative is allowed only for noncommercial +distribution and only if you received the program in object code or executable +form alone.) + +Source code for a work means the preferred form of the work for making modifications +to it. For an executable file, complete source code means all the source code +for all modules it contains; but, as a special exception, it need not include +source code for modules which are standard libraries that accompany the operating +system on which the executable file runs, or for standard header files or +definitions files that accompany that operating system. + +4. You may not copy, modify, sublicense, distribute or transfer the Program +except as expressly provided under this General Public License. Any attempt +otherwise to copy, modify, sublicense, distribute or transfer the Program +is void, and will automatically terminate your rights to use the Program under +this License. However, parties who have received copies, or rights to use +copies, from you under this General Public License will not have their licenses +terminated so long as such parties remain in full compliance. + +5. By copying, distributing or modifying the Program (or any work based on +the Program) you indicate your acceptance of this license to do so, and all +its terms and conditions. + +6. Each time you redistribute the Program (or any work based on the Program), +the recipient automatically receives a license from the original licensor +to copy, distribute or modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the recipients' exercise of +the rights granted herein. + +7. The Free Software Foundation may publish revised and/or new versions of +the General Public License from time to time. Such new versions will be similar +in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of the license which applies to it and "any later version", +you have the option of following the terms and conditions either of that version +or of any later version published by the Free Software Foundation. If the +Program does not specify a version number of the license, you may choose any +version ever published by the Free Software Foundation. + +8. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing and reuse +of software generally. + + + + NO WARRANTY 9. + +BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE +PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE +OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE +OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA +OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES +OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +END OF TERMS AND CONDITIONS + +Appendix: How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible +use to humanity, the best way to achieve this is to make it free software +which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach +them to the start of each source file to most effectively convey the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + +<one line to give the program's name and a brief idea of what it does.> + +Copyright (C) 19yy <name of author> + +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 Free Software +Foundation; either version 1, or (at your option) any later version. + +This program 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 General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 675 Mass +Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when +it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) 19xx name of author Gnomovision comes +with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, +and you are welcome to redistribute it under certain conditions; type `show +c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may be +called something other than `show w' and `show c'; they could even be mouse-clicks +or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, +if any, to sign a "copyright disclaimer" for the program, if necessary. Here +a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' +(a program to direct compilers to make passes at assemblers) written by James +Hacker. + +<signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice + +That's all there is to it! diff --git a/poky/meta/files/common-licenses/GPL-2.0 b/poky/meta/files/common-licenses/GPL-2.0-only index 7f5abbce2..7f5abbce2 100644 --- a/poky/meta/files/common-licenses/GPL-2.0 +++ b/poky/meta/files/common-licenses/GPL-2.0-only diff --git a/poky/meta/files/common-licenses/GPL-2.0-or-later b/poky/meta/files/common-licenses/GPL-2.0-or-later new file mode 100644 index 000000000..1d80ac365 --- /dev/null +++ b/poky/meta/files/common-licenses/GPL-2.0-or-later @@ -0,0 +1,319 @@ +GNU GENERAL PUBLIC LICENSE + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. + +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to +most of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software +is covered by the GNU Lesser General Public License instead.) You can apply +it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom +to distribute copies of free software (and charge for this service if you +wish), that you receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free programs; and that +you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to +deny you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of +the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or +for a fee, you must give the recipients all the rights that you have. You +must make sure that they, too, receive or can get the source code. And you +must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If +the software is modified by someone else and passed on, we want its recipients +to know that what they have is not the original, so that any problems introduced +by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms +of this General Public License. The "Program", below, refers to any such program +or work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or translated +into another language. (Hereinafter, translation is included without limitation +in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered +by this License; they are outside its scope. The act of running the Program +is not restricted, and the output from the Program is covered only if its +contents constitute a work based on the Program (independent of having been +made by running the Program). Whether that is true depends on what the Program +does. + +1. You may copy and distribute verbatim copies of the Program's source code +as you receive it, in any medium, provided that you conspicuously and appropriately +publish on each copy an appropriate copyright notice and disclaimer of warranty; +keep intact all the notices that refer to this License and to the absence +of any warranty; and give any other recipients of the Program a copy of this +License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you +may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such modifications +or work under the terms of Section 1 above, provided that you also meet all +of these conditions: + +a) You must cause the modified files to carry prominent notices stating that +you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or +in part contains or is derived from the Program or any part thereof, to be +licensed as a whole at no charge to all third parties under the terms of this +License. + +c) If the modified program normally reads commands interactively when run, +you must cause it, when started running for such interactive use in the most +ordinary way, to print or display an announcement including an appropriate +copyright notice and a notice that there is no warranty (or else, saying that +you provide a warranty) and that users may redistribute the program under +these conditions, and telling the user how to view a copy of this License. +(Exception: if the Program itself is interactive but does not normally print +such an announcement, your work based on the Program is not required to print +an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, +and its terms, do not apply to those sections when you distribute them as +separate works. But when you distribute the same sections as part of a whole +which is a work based on the Program, the distribution of the whole must be +on the terms of this License, whose permissions for other licensees extend +to the entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise +the right to control the distribution of derivative or collective works based +on the Program. + +In addition, mere aggregation of another work not based on the Program with +the Program (or with a work based on the Program) on a volume of a storage +or distribution medium does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based on it, under Section +2) in object code or executable form under the terms of Sections 1 and 2 above +provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, +which must be distributed under the terms of Sections 1 and 2 above on a medium +customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give +any third party, for a charge no more than your cost of physically performing +source distribution, a complete machine-readable copy of the corresponding +source code, to be distributed under the terms of Sections 1 and 2 above on +a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute +corresponding source code. (This alternative is allowed only for noncommercial +distribution and only if you received the program in object code or executable +form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all +the source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code distributed +need not include anything that is normally distributed (in either source or +binary form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component itself +accompanies the executable. + +If distribution of executable or object code is made by offering access to +copy from a designated place, then offering equivalent access to copy the +source code from the same place counts as distribution of the source code, +even though third parties are not compelled to copy the source along with +the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except +as expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses terminated +so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed +it. However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or distributing the Program +(or any work based on the Program), you indicate your acceptance of this License +to do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), +the recipient automatically receives a license from the original licensor +to copy, distribute or modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the recipients' exercise of +the rights granted herein. You are not responsible for enforcing compliance +by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement +or for any other reason (not limited to patent issues), conditions are imposed +on you (whether by court order, agreement or otherwise) that contradict the +conditions of this License, they do not excuse you from the conditions of +this License. If you cannot distribute so as to satisfy simultaneously your +obligations under this License and any other pertinent obligations, then as +a consequence you may not distribute the Program at all. For example, if a +patent license would not permit royalty-free redistribution of the Program +by all those who receive copies directly or indirectly through you, then the +only way you could satisfy both it and this License would be to refrain entirely +from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents +or other property right claims or to contest validity of any such claims; +this section has the sole purpose of protecting the integrity of the free +software distribution system, which is implemented by public license practices. +Many people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose +that choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit geographical +distribution limitation excluding those countries, so that distribution is +permitted only in or among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of +the General Public License from time to time. Such new versions will be similar +in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that version +or of any later version published by the Free Software Foundation. If the +Program does not specify a version number of this License, you may choose +any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing and reuse +of software generally. + + NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE +OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE +OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA +OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES +OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible +use to the public, the best way to achieve this is to make it free software +which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach +them to the start of each source file to most effectively convey the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + +<one line to give the program's name and an idea of what it does.> + +Copyright (C) <yyyy> <name of author> + +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 Free Software +Foundation; either version 2 of the License, or (at your option) any later +version. + +This program 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 General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +Street, Fifth Floor, Boston, MA 02110-1301, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when +it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author Gnomovision comes +with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, +and you are welcome to redistribute it under certain conditions; type `show +c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may be +called something other than `show w' and `show c'; they could even be mouse-clicks +or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, +if any, to sign a "copyright disclaimer" for the program, if necessary. Here +is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' +(which makes passes at compilers) written by James Hacker. + +<signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General +Public License does not permit incorporating your program into proprietary +programs. If your program is a subroutine library, you may consider it more +useful to permit linking proprietary applications with the library. If this +is what you want to do, use the GNU Lesser General Public License instead +of this License. diff --git a/poky/meta/files/common-licenses/GPL-3-with-bison-exception b/poky/meta/files/common-licenses/GPL-3-with-bison-exception new file mode 100644 index 000000000..d48c6241a --- /dev/null +++ b/poky/meta/files/common-licenses/GPL-3-with-bison-exception @@ -0,0 +1,7 @@ + +insert GPL v3 text here + +Bison Exception +As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn`t itself a parser generator using the skeleton or a modified version thereof as a parser skeleton. Alternatively, if you modify or redistribute the parser skeleton itself, you may (at your option) remove this special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. +This special exception was added by the Free Software Foundation in version 2.2 of Bison. + diff --git a/poky/meta/files/common-licenses/GPL-3.0 b/poky/meta/files/common-licenses/GPL-3.0-only index e0665a64a..e0665a64a 100644 --- a/poky/meta/files/common-licenses/GPL-3.0 +++ b/poky/meta/files/common-licenses/GPL-3.0-only diff --git a/poky/meta/files/common-licenses/GPL-3.0-or-later b/poky/meta/files/common-licenses/GPL-3.0-or-later new file mode 100644 index 000000000..e142a525b --- /dev/null +++ b/poky/meta/files/common-licenses/GPL-3.0-or-later @@ -0,0 +1,625 @@ +GNU GENERAL PUBLIC LICENSE + +Version 3, 29 June 2007 + +Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/> + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The GNU General Public License is a free, copyleft license for software and +other kinds of works. + +The licenses for most software and other practical works are designed to take +away your freedom to share and change the works. By contrast, the GNU General +Public License is intended to guarantee your freedom to share and change all +versions of a program--to make sure it remains free software for all its users. +We, the Free Software Foundation, use the GNU General Public License for most +of our software; it applies also to any other work released this way by its +authors. You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom +to distribute copies of free software (and charge for them if you wish), that +you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs, and that you know you +can do these things. + +To protect your rights, we need to prevent others from denying you these rights +or asking you to surrender the rights. Therefore, you have certain responsibilities +if you distribute copies of the software, or if you modify it: responsibilities +to respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or +for a fee, you must pass on to the recipients the same freedoms that you received. +You must make sure that they, too, receive or can get the source code. And +you must show them these terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert +copyright on the software, and (2) offer you this License giving you legal +permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that +there is no warranty for this free software. For both users' and authors' +sake, the GPL requires that modified versions be marked as changed, so that +their problems will not be attributed erroneously to authors of previous versions. + +Some devices are designed to deny users access to install or run modified +versions of the software inside them, although the manufacturer can do so. +This is fundamentally incompatible with the aim of protecting users' freedom +to change the software. The systematic pattern of such abuse occurs in the +area of products for individuals to use, which is precisely where it is most +unacceptable. Therefore, we have designed this version of the GPL to prohibit +the practice for those products. If such problems arise substantially in other +domains, we stand ready to extend this provision to those domains in future +versions of the GPL, as needed to protect the freedom of users. + +Finally, every program is threatened constantly by software patents. States +should not allow patents to restrict development and use of software on general-purpose +computers, but in those that do, we wish to avoid the special danger that +patents applied to a free program could make it effectively proprietary. To +prevent this, the GPL assures that patents cannot be used to render the program +non-free. + +The precise terms and conditions for copying, distribution and modification +follow. + +TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + +"Copyright" also means copyright-like laws that apply to other kinds of works, +such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this License. +Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals +or organizations. + +To "modify" a work means to copy from or adapt all or part of the work in +a fashion requiring copyright permission, other than the making of an exact +copy. The resulting work is called a "modified version" of the earlier work +or a work "based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based on the +Program. + +To "propagate" a work means to do anything with it that, without permission, +would make you directly or secondarily liable for infringement under applicable +copyright law, except executing it on a computer or modifying a private copy. +Propagation includes copying, distribution (with or without modification), +making available to the public, and in some countries other activities as +well. + +To "convey" a work means any kind of propagation that enables other parties +to make or receive copies. Mere interaction with a user through a computer +network, with no transfer of a copy, is not conveying. + +An interactive user interface displays "Appropriate Legal Notices" to the +extent that it includes a convenient and prominently visible feature that +(1) displays an appropriate copyright notice, and (2) tells the user that +there is no warranty for the work (except to the extent that warranties are +provided), that licensees may convey the work under this License, and how +to view a copy of this License. If the interface presents a list of user commands +or options, such as a menu, a prominent item in the list meets this criterion. + + 1. Source Code. + +The "source code" for a work means the preferred form of the work for making +modifications to it. "Object code" means any non-source form of a work. + +A "Standard Interface" means an interface that either is an official standard +defined by a recognized standards body, or, in the case of interfaces specified +for a particular programming language, one that is widely used among developers +working in that language. + +The "System Libraries" of an executable work include anything, other than +the work as a whole, that (a) is included in the normal form of packaging +a Major Component, but which is not part of that Major Component, and (b) +serves only to enable use of the work with that Major Component, or to implement +a Standard Interface for which an implementation is available to the public +in source code form. A "Major Component", in this context, means a major essential +component (kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to produce +the work, or an object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all the source +code needed to generate, install, and (for an executable work) run the object +code and to modify the work, including scripts to control those activities. +However, it does not include the work's System Libraries, or general-purpose +tools or generally available free programs which are used unmodified in performing +those activities but which are not part of the work. For example, Corresponding +Source includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically linked +subprograms that the work is specifically designed to require, such as by +intimate data communication or control flow between those subprograms and +other parts of the work. + +The Corresponding Source need not include anything that users can regenerate +automatically from other parts of the Corresponding Source. + + The Corresponding Source for a work in source code form is that same work. + + 2. Basic Permissions. + +All rights granted under this License are granted for the term of copyright +on the Program, and are irrevocable provided the stated conditions are met. +This License explicitly affirms your unlimited permission to run the unmodified +Program. The output from running a covered work is covered by this License +only if the output, given its content, constitutes a covered work. This License +acknowledges your rights of fair use or other equivalent, as provided by copyright +law. + +You may make, run and propagate covered works that you do not convey, without +conditions so long as your license otherwise remains in force. You may convey +covered works to others for the sole purpose of having them make modifications +exclusively for you, or provide you with facilities for running those works, +provided that you comply with the terms of this License in conveying all material +for which you do not control copyright. Those thus making or running the covered +works for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of your copyrighted +material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions +stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + +No covered work shall be deemed part of an effective technological measure +under any applicable law fulfilling obligations under article 11 of the WIPO +copyright treaty adopted on 20 December 1996, or similar laws prohibiting +or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention +of technological measures to the extent such circumvention is effected by +exercising rights under this License with respect to the covered work, and +you disclaim any intention to limit operation or modification of the work +as a means of enforcing, against the work's users, your or third parties' +legal rights to forbid circumvention of technological measures. + + 4. Conveying Verbatim Copies. + +You may convey verbatim copies of the Program's source code as you receive +it, in any medium, provided that you conspicuously and appropriately publish +on each copy an appropriate copyright notice; keep intact all notices stating +that this License and any non-permissive terms added in accord with section +7 apply to the code; keep intact all notices of the absence of any warranty; +and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you +may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + +You may convey a work based on the Program, or the modifications to produce +it from the Program, in the form of source code under the terms of section +4, provided that you also meet all of these conditions: + +a) The work must carry prominent notices stating that you modified it, and +giving a relevant date. + +b) The work must carry prominent notices stating that it is released under +this License and any conditions added under section 7. This requirement modifies +the requirement in section 4 to "keep intact all notices". + +c) You must license the entire work, as a whole, under this License to anyone +who comes into possession of a copy. This License will therefore apply, along +with any applicable section 7 additional terms, to the whole of the work, +and all its parts, regardless of how they are packaged. This License gives +no permission to license the work in any other way, but it does not invalidate +such permission if you have separately received it. + +d) If the work has interactive user interfaces, each must display Appropriate +Legal Notices; however, if the Program has interactive interfaces that do +not display Appropriate Legal Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, +which are not by their nature extensions of the covered work, and which are +not combined with it such as to form a larger program, in or on a volume of +a storage or distribution medium, is called an "aggregate" if the compilation +and its resulting copyright are not used to limit the access or legal rights +of the compilation's users beyond what the individual works permit. Inclusion +of a covered work in an aggregate does not cause this License to apply to +the other parts of the aggregate. + + 6. Conveying Non-Source Forms. + +You may convey a covered work in object code form under the terms of sections +4 and 5, provided that you also convey the machine-readable Corresponding +Source under the terms of this License, in one of these ways: + +a) Convey the object code in, or embodied in, a physical product (including +a physical distribution medium), accompanied by the Corresponding Source fixed +on a durable physical medium customarily used for software interchange. + +b) Convey the object code in, or embodied in, a physical product (including +a physical distribution medium), accompanied by a written offer, valid for +at least three years and valid for as long as you offer spare parts or customer +support for that product model, to give anyone who possesses the object code +either (1) a copy of the Corresponding Source for all the software in the +product that is covered by this License, on a durable physical medium customarily +used for software interchange, for a price no more than your reasonable cost +of physically performing this conveying of source, or (2) access to copy the +Corresponding Source from a network server at no charge. + +c) Convey individual copies of the object code with a copy of the written +offer to provide the Corresponding Source. This alternative is allowed only +occasionally and noncommercially, and only if you received the object code +with such an offer, in accord with subsection 6b. + +d) Convey the object code by offering access from a designated place (gratis +or for a charge), and offer equivalent access to the Corresponding Source +in the same way through the same place at no further charge. You need not +require recipients to copy the Corresponding Source along with the object +code. If the place to copy the object code is a network server, the Corresponding +Source may be on a different server (operated by you or a third party) that +supports equivalent copying facilities, provided you maintain clear directions +next to the object code saying where to find the Corresponding Source. Regardless +of what server hosts the Corresponding Source, you remain obligated to ensure +that it is available for as long as needed to satisfy these requirements. + +e) Convey the object code using peer-to-peer transmission, provided you inform +other peers where the object code and Corresponding Source of the work are +being offered to the general public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded from +the Corresponding Source as a System Library, need not be included in conveying +the object code work. + +A "User Product" is either (1) a "consumer product", which means any tangible +personal property which is normally used for personal, family, or household +purposes, or (2) anything designed or sold for incorporation into a dwelling. +In determining whether a product is a consumer product, doubtful cases shall +be resolved in favor of coverage. For a particular product received by a particular +user, "normally used" refers to a typical or common use of that class of product, +regardless of the status of the particular user or of the way in which the +particular user actually uses, or expects or is expected to use, the product. +A product is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent the +only significant mode of use of the product. + +"Installation Information" for a User Product means any methods, procedures, +authorization keys, or other information required to install and execute modified +versions of a covered work in that User Product from a modified version of +its Corresponding Source. The information must suffice to ensure that the +continued functioning of the modified object code is in no case prevented +or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically +for use in, a User Product, and the conveying occurs as part of a transaction +in which the right of possession and use of the User Product is transferred +to the recipient in perpetuity or for a fixed term (regardless of how the +transaction is characterized), the Corresponding Source conveyed under this +section must be accompanied by the Installation Information. But this requirement +does not apply if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has been installed +in ROM). + +The requirement to provide Installation Information does not include a requirement +to continue to provide support service, warranty, or updates for a work that +has been modified or installed by the recipient, or for the User Product in +which it has been modified or installed. Access to a network may be denied +when the modification itself materially and adversely affects the operation +of the network or violates the rules and protocols for communication across +the network. + +Corresponding Source conveyed, and Installation Information provided, in accord +with this section must be in a format that is publicly documented (and with +an implementation available to the public in source code form), and must require +no special password or key for unpacking, reading or copying. + + 7. Additional Terms. + +"Additional permissions" are terms that supplement the terms of this License +by making exceptions from one or more of its conditions. Additional permissions +that are applicable to the entire Program shall be treated as though they +were included in this License, to the extent that they are valid under applicable +law. If additional permissions apply only to part of the Program, that part +may be used separately under those permissions, but the entire Program remains +governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any +additional permissions from that copy, or from any part of it. (Additional +permissions may be written to require their own removal in certain cases when +you modify the work.) You may place additional permissions on material, added +by you to a covered work, for which you have or can give appropriate copyright +permission. + +Notwithstanding any other provision of this License, for material you add +to a covered work, you may (if authorized by the copyright holders of that +material) supplement the terms of this License with terms: + +a) Disclaiming warranty or limiting liability differently from the terms of +sections 15 and 16 of this License; or + +b) Requiring preservation of specified reasonable legal notices or author +attributions in that material or in the Appropriate Legal Notices displayed +by works containing it; or + +c) Prohibiting misrepresentation of the origin of that material, or requiring +that modified versions of such material be marked in reasonable ways as different +from the original version; or + +d) Limiting the use for publicity purposes of names of licensors or authors +of the material; or + +e) Declining to grant rights under trademark law for use of some trade names, +trademarks, or service marks; or + +f) Requiring indemnification of licensors and authors of that material by +anyone who conveys the material (or modified versions of it) with contractual +assumptions of liability to the recipient, for any liability that these contractual +assumptions directly impose on those licensors and authors. + +All other non-permissive additional terms are considered "further restrictions" +within the meaning of section 10. If the Program as you received it, or any +part of it, contains a notice stating that it is governed by this License +along with a term that is a further restriction, you may remove that term. +If a license document contains a further restriction but permits relicensing +or conveying under this License, you may add to a covered work material governed +by the terms of that license document, provided that the further restriction +does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, +in the relevant source files, a statement of the additional terms that apply +to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form +of a separately written license, or stated as exceptions; the above requirements +apply either way. + + 8. Termination. + +You may not propagate or modify a covered work except as expressly provided +under this License. Any attempt otherwise to propagate or modify it is void, +and will automatically terminate your rights under this License (including +any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from +a particular copyright holder is reinstated (a) provisionally, unless and +until the copyright holder explicitly and finally terminates your license, +and (b) permanently, if the copyright holder fails to notify you of the violation +by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently +if the copyright holder notifies you of the violation by some reasonable means, +this is the first time you have received notice of violation of this License +(for any work) from that copyright holder, and you cure the violation prior +to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses +of parties who have received copies or rights from you under this License. +If your rights have been terminated and not permanently reinstated, you do +not qualify to receive new licenses for the same material under section 10. + + 9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run a copy +of the Program. Ancillary propagation of a covered work occurring solely as +a consequence of using peer-to-peer transmission to receive a copy likewise +does not require acceptance. However, nothing other than this License grants +you permission to propagate or modify any covered work. These actions infringe +copyright if you do not accept this License. Therefore, by modifying or propagating +a covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically receives +a license from the original licensors, to run, modify and propagate that work, +subject to this License. You are not responsible for enforcing compliance +by third parties with this License. + +An "entity transaction" is a transaction transferring control of an organization, +or substantially all assets of one, or subdividing an organization, or merging +organizations. If propagation of a covered work results from an entity transaction, +each party to that transaction who receives a copy of the work also receives +whatever licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the Corresponding +Source of the work from the predecessor in interest, if the predecessor has +it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights +granted or affirmed under this License. For example, you may not impose a +license fee, royalty, or other charge for exercise of rights granted under +this License, and you may not initiate litigation (including a cross-claim +or counterclaim in a lawsuit) alleging that any patent claim is infringed +by making, using, selling, offering for sale, or importing the Program or +any portion of it. + + 11. Patents. + +A "contributor" is a copyright holder who authorizes use under this License +of the Program or a work on which the Program is based. The work thus licensed +is called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims owned or controlled +by the contributor, whether already acquired or hereafter acquired, that would +be infringed by some manner, permitted by this License, of making, using, +or selling its contributor version, but do not include claims that would be +infringed only as a consequence of further modification of the contributor +version. For purposes of this definition, "control" includes the right to +grant patent sublicenses in a manner consistent with the requirements of this +License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent +license under the contributor's essential patent claims, to make, use, sell, +offer for sale, import and otherwise run, modify and propagate the contents +of its contributor version. + +In the following three paragraphs, a "patent license" is any express agreement +or commitment, however denominated, not to enforce a patent (such as an express +permission to practice a patent or covenant not to sue for patent infringement). +To "grant" such a patent license to a party means to make such an agreement +or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the +Corresponding Source of the work is not available for anyone to copy, free +of charge and under the terms of this License, through a publicly available +network server or other readily accessible means, then you must either (1) +cause the Corresponding Source to be so available, or (2) arrange to deprive +yourself of the benefit of the patent license for this particular work, or +(3) arrange, in a manner consistent with the requirements of this License, +to extend the patent license to downstream recipients. "Knowingly relying" +means you have actual knowledge that, but for the patent license, your conveying +the covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that country +that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, +you convey, or propagate by procuring conveyance of, a covered work, and grant +a patent license to some of the parties receiving the covered work authorizing +them to use, propagate, modify or convey a specific copy of the covered work, +then the patent license you grant is automatically extended to all recipients +of the covered work and works based on it. + +A patent license is "discriminatory" if it does not include within the scope +of its coverage, prohibits the exercise of, or is conditioned on the non-exercise +of one or more of the rights that are specifically granted under this License. +You may not convey a covered work if you are a party to an arrangement with +a third party that is in the business of distributing software, under which +you make payment to the third party based on the extent of your activity of +conveying the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory patent +license (a) in connection with copies of the covered work conveyed by you +(or copies made from those copies), or (b) primarily for and in connection +with specific products or compilations that contain the covered work, unless +you entered into that arrangement, or that patent license was granted, prior +to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied +license or other defenses to infringement that may otherwise be available +to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or otherwise) +that contradict the conditions of this License, they do not excuse you from +the conditions of this License. If you cannot convey a covered work so as +to satisfy simultaneously your obligations under this License and any other +pertinent obligations, then as a consequence you may not convey it at all. +For example, if you agree to terms that obligate you to collect a royalty +for further conveying from those to whom you convey the Program, the only +way you could satisfy both those terms and this License would be to refrain +entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + +Notwithstanding any other provision of this License, you have permission to +link or combine any covered work with a work licensed under version 3 of the +GNU Affero General Public License into a single combined work, and to convey +the resulting work. The terms of this License will continue to apply to the +part which is the covered work, but the special requirements of the GNU Affero +General Public License, section 13, concerning interaction through a network +will apply to the combination as such. + + 14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions of the +GNU General Public License from time to time. Such new versions will be similar +in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +that a certain numbered version of the GNU General Public License "or any +later version" applies to it, you have the option of following the terms and +conditions either of that numbered version or of any later version published +by the Free Software Foundation. If the Program does not specify a version +number of the GNU General Public License, you may choose any version ever +published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of +the GNU General Public License can be used, that proxy's public statement +of acceptance of a version permanently authorizes you to choose that version +for the Program. + +Later license versions may give you additional or different permissions. However, +no additional obligations are imposed on any author or copyright holder as +a result of your choosing to follow a later version. + + 15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE +LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER +EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM +PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + + 16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL +ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM +AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, +INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO +USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED +INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER +PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided above cannot +be given local legal effect according to their terms, reviewing courts shall +apply local law that most closely approximates an absolute waiver of all civil +liability in connection with the Program, unless a warranty or assumption +of liability accompanies a copy of the Program in return for a fee. END OF +TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible +use to the public, the best way to achieve this is to make it free software +which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach +them to the start of each source file to most effectively state the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + +<one line to give the program's name and a brief idea of what it does.> + +Copyright (C) <year> <name of author> + +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 Free Software +Foundation, either version 3 of the License, or (at your option) any later +version. + +This program 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 General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program. If not, see <https://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + +If the program does terminal interaction, make it output a short notice like +this when it starts in an interactive mode: + +<program> Copyright (C) <year> <name of author> + +This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + +This is free software, and you are welcome to redistribute it under certain +conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands might +be different; for a GUI interface, you would use an "about box". + +You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. For +more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>. + +The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General Public +License instead of this License. But first, please read <https://www.gnu.org/ +licenses /why-not-lgpl.html>. diff --git a/poky/meta/files/common-licenses/LGPL-2.0 b/poky/meta/files/common-licenses/LGPL-2.0-only index 5931d439b..5931d439b 100644 --- a/poky/meta/files/common-licenses/LGPL-2.0 +++ b/poky/meta/files/common-licenses/LGPL-2.0-only diff --git a/poky/meta/files/common-licenses/LGPL-2.0-or-later b/poky/meta/files/common-licenses/LGPL-2.0-or-later new file mode 100644 index 000000000..5c96471aa --- /dev/null +++ b/poky/meta/files/common-licenses/LGPL-2.0-or-later @@ -0,0 +1,446 @@ +GNU LIBRARY GENERAL PUBLIC LICENSE + +Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. + +51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is numbered 2 because +it goes with version 2 of the ordinary GPL.] + +Preamble + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public Licenses are intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. + +This license, the Library General Public License, applies to some specially +designated Free Software Foundation software, and to any other libraries whose +authors decide to use it. You can use it for your libraries, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom +to distribute copies of free software (and charge for this service if you +wish), that you receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free programs; and that +you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to +deny you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of +the library, or if you modify it. + +For example, if you distribute copies of the library, whether gratis or for +a fee, you must give the recipients all the rights that we gave you. You must +make sure that they, too, receive or can get the source code. If you link +a program with the library, you must provide complete object files to the +recipients so that they can relink them with the library, after making changes +to the library and recompiling it. And you must show them these terms so they +know their rights. + +Our method of protecting your rights has two steps: (1) copyright the library, +and (2) offer you this license which gives you legal permission to copy, distribute +and/or modify the library. + +Also, for each distributor's protection, we want to make certain that everyone +understands that there is no warranty for this free library. If the library +is modified by someone else and passed on, we want its recipients to know +that what they have is not the original version, so that any problems introduced +by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that companies distributing free software will individually +obtain patent licenses, thus in effect transforming the program into proprietary +software. To prevent this, we have made it clear that any patent must be licensed +for everyone's free use or not licensed at all. + +Most GNU software, including some libraries, is covered by the ordinary GNU +General Public License, which was designed for utility programs. This license, +the GNU Library General Public License, applies to certain designated libraries. +This license is quite different from the ordinary one; be sure to read it +in full, and don't assume that anything in it is the same as in the ordinary +license. + +The reason we have a separate public license for some libraries is that they +blur the distinction we usually make between modifying or adding to a program +and simply using it. Linking a program with a library, without changing the +library, is in some sense simply using the library, and is analogous to running +a utility program or application program. However, in a textual and legal +sense, the linked executable is a combined work, a derivative of the original +library, and the ordinary General Public License treats it as such. + +Because of this blurred distinction, using the ordinary General Public License +for libraries did not effectively promote software sharing, because most developers +did not use the libraries. We concluded that weaker conditions might promote +sharing better. + +However, unrestricted linking of non-free programs would deprive the users +of those programs of all benefit from the free status of the libraries themselves. +This Library General Public License is intended to permit developers of non-free +programs to use free libraries, while preserving your freedom as a user of +such programs to change the free libraries that are incorporated in them. +(We have not seen how to achieve this as regards changes in header files, +but we have achieved it as regards changes in the actual functions of the +Library.) The hope is that this will lead to faster development of free libraries. + +The precise terms and conditions for copying, distribution and modification +follow. Pay close attention to the difference between a "work based on the +library" and a "work that uses the library". The former contains code derived +from the library, while the latter only works together with the library. + +Note that it is possible for a library to be covered by the ordinary General +Public License rather than by this special one. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License Agreement applies to any software library which contains a +notice placed by the copyright holder or other authorized party saying it +may be distributed under the terms of this Library General Public License +(also called "this License"). Each licensee is addressed as "you". + +A "library" means a collection of software functions and/or data prepared +so as to be conveniently linked with application programs (which use some +of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work which has +been distributed under these terms. A "work based on the Library" means either +the Library or any derivative work under copyright law: that is to say, a +work containing the Library or a portion of it, either verbatim or with modifications +and/or translated straightforwardly into another language. (Hereinafter, translation +is included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for making modifications +to it. For a library, complete source code means all the source code for all +modules it contains, plus any associated interface definition files, plus +the scripts used to control compilation and installation of the library. + +Activities other than copying, distribution and modification are not covered +by this License; they are outside its scope. The act of running a program +using the Library is not restricted, and output from such a program is covered +only if its contents constitute a work based on the Library (independent of +the use of the Library in a tool for writing it). Whether that is true depends +on what the Library does and what the program that uses the Library does. + +1. You may copy and distribute verbatim copies of the Library's complete source +code as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and disclaimer +of warranty; keep intact all the notices that refer to this License and to +the absence of any warranty; and distribute a copy of this License along with +the Library. + +You may charge a fee for the physical act of transferring a copy, and you +may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Library or any portion of it, +thus forming a work based on the Library, and copy and distribute such modifications +or work under the terms of Section 1 above, provided that you also meet all +of these conditions: + + a) The modified work must itself be a software library. + +b) You must cause the files modified to carry prominent notices stating that +you changed the files and the date of any change. + +c) You must cause the whole of the work to be licensed at no charge to all +third parties under the terms of this License. + +d) If a facility in the modified Library refers to a function or a table of +data to be supplied by an application program that uses the facility, other +than as an argument passed when the facility is invoked, then you must make +a good faith effort to ensure that, in the event an application does not supply +such function or table, the facility still operates, and performs whatever +part of its purpose remains meaningful. + +(For example, a function in a library to compute square roots has a purpose +that is entirely well-defined independent of the application. Therefore, Subsection +2d requires that any application-supplied function or table used by this function +must be optional: if the application does not supply it, the square root function +must still compute square roots.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Library, and can be reasonably +considered independent and separate works in themselves, then this License, +and its terms, do not apply to those sections when you distribute them as +separate works. But when you distribute the same sections as part of a whole +which is a work based on the Library, the distribution of the whole must be +on the terms of this License, whose permissions for other licensees extend +to the entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise +the right to control the distribution of derivative or collective works based +on the Library. + +In addition, mere aggregation of another work not based on the Library with +the Library (or with a work based on the Library) on a volume of a storage +or distribution medium does not bring the other work under the scope of this +License. + +3. You may opt to apply the terms of the ordinary GNU General Public License +instead of this License to a given copy of the Library. To do this, you must +alter all the notices that refer to this License, so that they refer to the +ordinary GNU General Public License, version 2, instead of to this License. +(If a newer version than version 2 of the ordinary GNU General Public License +has appeared, then you can specify that version instead if you wish.) Do not +make any other change in these notices. + +Once this change is made in a given copy, it is irreversible for that copy, +so the ordinary GNU General Public License applies to all subsequent copies +and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of the Library +into a program that is not a library. + +4. You may copy and distribute the Library (or a portion or derivative of +it, under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you accompany it with the complete corresponding +machine-readable source code, which must be distributed under the terms of +Sections 1 and 2 above on a medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy from a designated +place, then offering equivalent access to copy the source code from the same +place satisfies the requirement to distribute the source code, even though +third parties are not compelled to copy the source along with the object code. + +5. A program that contains no derivative of any portion of the Library, but +is designed to work with the Library by being compiled or linked with it, +is called a "work that uses the Library". Such a work, in isolation, is not +a derivative work of the Library, and therefore falls outside the scope of +this License. + +However, linking a "work that uses the Library" with the Library creates an +executable that is a derivative of the Library (because it contains portions +of the Library), rather than a "work that uses the library". The executable +is therefore covered by this License. Section 6 states terms for distribution +of such executables. + +When a "work that uses the Library" uses material from a header file that +is part of the Library, the object code for the work may be a derivative work +of the Library even though the source code is not. Whether this is true is +especially significant if the work can be linked without the Library, or if +the work is itself a library. The threshold for this to be true is not precisely +defined by law. + +If such an object file uses only numerical parameters, data structure layouts +and accessors, and small macros and small inline functions (ten lines or less +in length), then the use of the object file is unrestricted, regardless of +whether it is legally a derivative work. (Executables containing this object +code plus portions of the Library will still fall under Section 6.) + +Otherwise, if the work is a derivative of the Library, you may distribute +the object code for the work under the terms of Section 6. Any executables +containing that work also fall under Section 6, whether or not they are linked +directly with the Library itself. + +6. As an exception to the Sections above, you may also compile or link a "work +that uses the Library" with the Library to produce a work containing portions +of the Library, and distribute that work under terms of your choice, provided +that the terms permit modification of the work for the customer's own use +and reverse engineering for debugging such modifications. + +You must give prominent notice with each copy of the work that the Library +is used in it and that the Library and its use are covered by this License. +You must supply a copy of this License. If the work during execution displays +copyright notices, you must include the copyright notice for the Library among +them, as well as a reference directing the user to the copy of this License. +Also, you must do one of these things: + +a) Accompany the work with the complete corresponding machine-readable source +code for the Library including whatever changes were used in the work (which +must be distributed under Sections 1 and 2 above); and, if the work is an +executable linked with the Library, with the complete machine-readable "work +that uses the Library", as object code and/or source code, so that the user +can modify the Library and then relink to produce a modified executable containing +the modified Library. (It is understood that the user who changes the contents +of definitions files in the Library will not necessarily be able to recompile +the application to use the modified definitions.) + +b) Accompany the work with a written offer, valid for at least three years, +to give the same user the materials specified in Subsection 6a, above, for +a charge no more than the cost of performing this distribution. + +c) If distribution of the work is made by offering access to copy from a designated +place, offer equivalent access to copy the above specified materials from +the same place. + +d) Verify that the user has already received a copy of these materials or +that you have already sent this user a copy. + +For an executable, the required form of the "work that uses the Library" must +include any data and utility programs needed for reproducing the executable +from it. However, as a special exception, the source code distributed need +not include anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the operating +system on which the executable runs, unless that component itself accompanies +the executable. + +It may happen that this requirement contradicts the license restrictions of +other proprietary libraries that do not normally accompany the operating system. +Such a contradiction means you cannot use both them and the Library together +in an executable that you distribute. + +7. You may place library facilities that are a work based on the Library side-by-side +in a single library together with other library facilities not covered by +this License, and distribute such a combined library, provided that the separate +distribution of the work based on the Library and of the other library facilities +is otherwise permitted, and provided that you do these two things: + +a) Accompany the combined library with a copy of the same work based on the +Library, uncombined with any other library facilities. This must be distributed +under the terms of the Sections above. + +b) Give prominent notice with the combined library of the fact that part of +it is a work based on the Library, and explaining where to find the accompanying +uncombined form of the same work. + +8. You may not copy, modify, sublicense, link with, or distribute the Library +except as expressly provided under this License. Any attempt otherwise to +copy, modify, sublicense, link with, or distribute the Library is void, and +will automatically terminate your rights under this License. However, parties +who have received copies, or rights, from you under this License will not +have their licenses terminated so long as such parties remain in full compliance. + +9. You are not required to accept this License, since you have not signed +it. However, nothing else grants you permission to modify or distribute the +Library or its derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or distributing the Library +(or any work based on the Library), you indicate your acceptance of this License +to do so, and all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + +10. Each time you redistribute the Library (or any work based on the Library), +the recipient automatically receives a license from the original licensor +to copy, distribute, link with or modify the Library subject to these terms +and conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties to this License. + +11. If, as a consequence of a court judgment or allegation of patent infringement +or for any other reason (not limited to patent issues), conditions are imposed +on you (whether by court order, agreement or otherwise) that contradict the +conditions of this License, they do not excuse you from the conditions of +this License. If you cannot distribute so as to satisfy simultaneously your +obligations under this License and any other pertinent obligations, then as +a consequence you may not distribute the Library at all. For example, if a +patent license would not permit royalty-free redistribution of the Library +by all those who receive copies directly or indirectly through you, then the +only way you could satisfy both it and this License would be to refrain entirely +from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents +or other property right claims or to contest validity of any such claims; +this section has the sole purpose of protecting the integrity of the free +software distribution system which is implemented by public license practices. +Many people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose +that choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +12. If the distribution and/or use of the Library is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Library under this License may add an explicit geographical +distribution limitation excluding those countries, so that distribution is +permitted only in or among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the body of this License. + +13. The Free Software Foundation may publish revised and/or new versions of +the Library General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to address +new problems or concerns. + +Each version is given a distinguishing version number. If the Library specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that version +or of any later version published by the Free Software Foundation. If the +Library does not specify a license version number, you may choose any version +ever published by the Free Software Foundation. + +14. If you wish to incorporate parts of the Library into other free programs +whose distribution conditions are incompatible with these, write to the author +to ask for permission. For software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we sometimes make exceptions +for this. Our decision will be guided by the two goals of preserving the free +status of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + +15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE +OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE +OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA +OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES +OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Libraries + +If you develop a new library, and you want it to be of the greatest possible +use to the public, we recommend making it free software that everyone can +redistribute and change. You can do so by permitting redistribution under +these terms (or, alternatively, under the terms of the ordinary General Public +License). + +To apply these terms, attach the following notices to the library. It is safest +to attach them to the start of each source file to most effectively convey +the exclusion of warranty; and each file should have at least the "copyright" +line and a pointer to where the full notice is found. + +one line to give the library's name and an idea of what it does. + +Copyright (C) year name of author + +This library is free software; you can redistribute it and/or modify it under +the terms of the GNU Library General Public License as published by the Free +Software Foundation; either version 2 of the License, or (at your option) +any later version. + +This 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 Library General Public License for more +details. + +You should have received a copy of the GNU Library General Public License +along with this library; if not, write to the Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your school, +if any, to sign a "copyright disclaimer" for the library, if necessary. Here +is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in + +the library `Frob' (a library for tweaking knobs) written + +by James Random Hacker. + +signature of Ty Coon, 1 April 1990 + +Ty Coon, President of Vice + +That's all there is to it! diff --git a/poky/meta/files/common-licenses/LGPL-2.1 b/poky/meta/files/common-licenses/LGPL-2.1-only index a0e735a98..a0e735a98 100644 --- a/poky/meta/files/common-licenses/LGPL-2.1 +++ b/poky/meta/files/common-licenses/LGPL-2.1-only diff --git a/poky/meta/files/common-licenses/LGPL-2.1-or-later b/poky/meta/files/common-licenses/LGPL-2.1-or-later new file mode 100644 index 000000000..04bb156e7 --- /dev/null +++ b/poky/meta/files/common-licenses/LGPL-2.1-or-later @@ -0,0 +1,468 @@ +GNU LESSER GENERAL PUBLIC LICENSE + +Version 2.1, February 1999 + +Copyright (C) 1991, 1999 Free Software Foundation, Inc. + +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts as the +successor of the GNU Library Public License, version 2, hence the version +number 2.1.] + +Preamble + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public Licenses are intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. + +This license, the Lesser General Public License, applies to some specially +designated software packages--typically libraries--of the Free Software Foundation +and other authors who decide to use it. You can use it too, but we suggest +you first think carefully about whether this license or the ordinary General +Public License is the better strategy to use in any particular case, based +on the explanations below. + +When we speak of free software, we are referring to freedom of use, not price. +Our General Public Licenses are designed to make sure that you have the freedom +to distribute copies of free software (and charge for this service if you +wish); that you receive source code or can get it if you want it; that you +can change the software and use pieces of it in new free programs; and that +you are informed that you can do these things. + +To protect your rights, we need to make restrictions that forbid distributors +to deny you these rights or to ask you to surrender these rights. These restrictions +translate to certain responsibilities for you if you distribute copies of +the library or if you modify it. + +For example, if you distribute copies of the library, whether gratis or for +a fee, you must give the recipients all the rights that we gave you. You must +make sure that they, too, receive or can get the source code. If you link +other code with the library, you must provide complete object files to the +recipients, so that they can relink them with the library after making changes +to the library and recompiling it. And you must show them these terms so they +know their rights. + +We protect your rights with a two-step method: (1) we copyright the library, +and (2) we offer you this license, which gives you legal permission to copy, +distribute and/or modify the library. + +To protect each distributor, we want to make it very clear that there is no +warranty for the free library. Also, if the library is modified by someone +else and passed on, the recipients should know that what they have is not +the original version, so that the original author's reputation will not be +affected by problems that might be introduced by others. + +Finally, software patents pose a constant threat to the existence of any free +program. We wish to make sure that a company cannot effectively restrict the +users of a free program by obtaining a restrictive license from a patent holder. +Therefore, we insist that any patent license obtained for a version of the +library must be consistent with the full freedom of use specified in this +license. + +Most GNU software, including some libraries, is covered by the ordinary GNU +General Public License. This license, the GNU Lesser General Public License, +applies to certain designated libraries, and is quite different from the ordinary +General Public License. We use this license for certain libraries in order +to permit linking those libraries into non-free programs. + +When a program is linked with a library, whether statically or using a shared +library, the combination of the two is legally speaking a combined work, a +derivative of the original library. The ordinary General Public License therefore +permits such linking only if the entire combination fits its criteria of freedom. +The Lesser General Public License permits more lax criteria for linking other +code with the library. + +We call this license the "Lesser" General Public License because it does Less +to protect the user's freedom than the ordinary General Public License. It +also provides other free software developers Less of an advantage over competing +non-free programs. These disadvantages are the reason we use the ordinary +General Public License for many libraries. However, the Lesser license provides +advantages in certain special circumstances. + +For example, on rare occasions, there may be a special need to encourage the +widest possible use of a certain library, so that it becomes a de-facto standard. +To achieve this, non-free programs must be allowed to use the library. A more +frequent case is that a free library does the same job as widely used non-free +libraries. In this case, there is little to gain by limiting the free library +to free software only, so we use the Lesser General Public License. + +In other cases, permission to use a particular library in non-free programs +enables a greater number of people to use a large body of free software. For +example, permission to use the GNU C Library in non-free programs enables +many more people to use the whole GNU operating system, as well as its variant, +the GNU/Linux operating system. + +Although the Lesser General Public License is Less protective of the users' +freedom, it does ensure that the user of a program that is linked with the +Library has the freedom and the wherewithal to run that program using a modified +version of the Library. + +The precise terms and conditions for copying, distribution and modification +follow. Pay close attention to the difference between a "work based on the +library" and a "work that uses the library". The former contains code derived +from the library, whereas the latter must be combined with the library in +order to run. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License Agreement applies to any software library or other program +which contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Lesser General +Public License (also called "this License"). Each licensee is addressed as +"you". + +A "library" means a collection of software functions and/or data prepared +so as to be conveniently linked with application programs (which use some +of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work which has +been distributed under these terms. A "work based on the Library" means either +the Library or any derivative work under copyright law: that is to say, a +work containing the Library or a portion of it, either verbatim or with modifications +and/or translated straightforwardly into another language. (Hereinafter, translation +is included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for making modifications +to it. For a library, complete source code means all the source code for all +modules it contains, plus any associated interface definition files, plus +the scripts used to control compilation and installation of the library. + +Activities other than copying, distribution and modification are not covered +by this License; they are outside its scope. The act of running a program +using the Library is not restricted, and output from such a program is covered +only if its contents constitute a work based on the Library (independent of +the use of the Library in a tool for writing it). Whether that is true depends +on what the Library does and what the program that uses the Library does. + +1. You may copy and distribute verbatim copies of the Library's complete source +code as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and disclaimer +of warranty; keep intact all the notices that refer to this License and to +the absence of any warranty; and distribute a copy of this License along with +the Library. + +You may charge a fee for the physical act of transferring a copy, and you +may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Library or any portion of it, +thus forming a work based on the Library, and copy and distribute such modifications +or work under the terms of Section 1 above, provided that you also meet all +of these conditions: + + a) The modified work must itself be a software library. + +b) You must cause the files modified to carry prominent notices stating that +you changed the files and the date of any change. + +c) You must cause the whole of the work to be licensed at no charge to all +third parties under the terms of this License. + +d) If a facility in the modified Library refers to a function or a table of +data to be supplied by an application program that uses the facility, other +than as an argument passed when the facility is invoked, then you must make +a good faith effort to ensure that, in the event an application does not supply +such function or table, the facility still operates, and performs whatever +part of its purpose remains meaningful. + +(For example, a function in a library to compute square roots has a purpose +that is entirely well-defined independent of the application. Therefore, Subsection +2d requires that any application-supplied function or table used by this function +must be optional: if the application does not supply it, the square root function +must still compute square roots.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Library, and can be reasonably +considered independent and separate works in themselves, then this License, +and its terms, do not apply to those sections when you distribute them as +separate works. But when you distribute the same sections as part of a whole +which is a work based on the Library, the distribution of the whole must be +on the terms of this License, whose permissions for other licensees extend +to the entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise +the right to control the distribution of derivative or collective works based +on the Library. + +In addition, mere aggregation of another work not based on the Library with +the Library (or with a work based on the Library) on a volume of a storage +or distribution medium does not bring the other work under the scope of this +License. + +3. You may opt to apply the terms of the ordinary GNU General Public License +instead of this License to a given copy of the Library. To do this, you must +alter all the notices that refer to this License, so that they refer to the +ordinary GNU General Public License, version 2, instead of to this License. +(If a newer version than version 2 of the ordinary GNU General Public License +has appeared, then you can specify that version instead if you wish.) Do not +make any other change in these notices. + +Once this change is made in a given copy, it is irreversible for that copy, +so the ordinary GNU General Public License applies to all subsequent copies +and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of the Library +into a program that is not a library. + +4. You may copy and distribute the Library (or a portion or derivative of +it, under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you accompany it with the complete corresponding +machine-readable source code, which must be distributed under the terms of +Sections 1 and 2 above on a medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy from a designated +place, then offering equivalent access to copy the source code from the same +place satisfies the requirement to distribute the source code, even though +third parties are not compelled to copy the source along with the object code. + +5. A program that contains no derivative of any portion of the Library, but +is designed to work with the Library by being compiled or linked with it, +is called a "work that uses the Library". Such a work, in isolation, is not +a derivative work of the Library, and therefore falls outside the scope of +this License. + +However, linking a "work that uses the Library" with the Library creates an +executable that is a derivative of the Library (because it contains portions +of the Library), rather than a "work that uses the library". The executable +is therefore covered by this License. Section 6 states terms for distribution +of such executables. + +When a "work that uses the Library" uses material from a header file that +is part of the Library, the object code for the work may be a derivative work +of the Library even though the source code is not. Whether this is true is +especially significant if the work can be linked without the Library, or if +the work is itself a library. The threshold for this to be true is not precisely +defined by law. + +If such an object file uses only numerical parameters, data structure layouts +and accessors, and small macros and small inline functions (ten lines or less +in length), then the use of the object file is unrestricted, regardless of +whether it is legally a derivative work. (Executables containing this object +code plus portions of the Library will still fall under Section 6.) + +Otherwise, if the work is a derivative of the Library, you may distribute +the object code for the work under the terms of Section 6. Any executables +containing that work also fall under Section 6, whether or not they are linked +directly with the Library itself. + +6. As an exception to the Sections above, you may also combine or link a "work +that uses the Library" with the Library to produce a work containing portions +of the Library, and distribute that work under terms of your choice, provided +that the terms permit modification of the work for the customer's own use +and reverse engineering for debugging such modifications. + +You must give prominent notice with each copy of the work that the Library +is used in it and that the Library and its use are covered by this License. +You must supply a copy of this License. If the work during execution displays +copyright notices, you must include the copyright notice for the Library among +them, as well as a reference directing the user to the copy of this License. +Also, you must do one of these things: + +a) Accompany the work with the complete corresponding machine-readable source +code for the Library including whatever changes were used in the work (which +must be distributed under Sections 1 and 2 above); and, if the work is an +executable linked with the Library, with the complete machine-readable "work +that uses the Library", as object code and/or source code, so that the user +can modify the Library and then relink to produce a modified executable containing +the modified Library. (It is understood that the user who changes the contents +of definitions files in the Library will not necessarily be able to recompile +the application to use the modified definitions.) + +b) Use a suitable shared library mechanism for linking with the Library. A +suitable mechanism is one that (1) uses at run time a copy of the library +already present on the user's computer system, rather than copying library +functions into the executable, and (2) will operate properly with a modified +version of the library, if the user installs one, as long as the modified +version is interface-compatible with the version that the work was made with. + +c) Accompany the work with a written offer, valid for at least three years, +to give the same user the materials specified in Subsection 6a, above, for +a charge no more than the cost of performing this distribution. + +d) If distribution of the work is made by offering access to copy from a designated +place, offer equivalent access to copy the above specified materials from +the same place. + +e) Verify that the user has already received a copy of these materials or +that you have already sent this user a copy. + +For an executable, the required form of the "work that uses the Library" must +include any data and utility programs needed for reproducing the executable +from it. However, as a special exception, the materials to be distributed +need not include anything that is normally distributed (in either source or +binary form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component itself +accompanies the executable. + +It may happen that this requirement contradicts the license restrictions of +other proprietary libraries that do not normally accompany the operating system. +Such a contradiction means you cannot use both them and the Library together +in an executable that you distribute. + +7. You may place library facilities that are a work based on the Library side-by-side +in a single library together with other library facilities not covered by +this License, and distribute such a combined library, provided that the separate +distribution of the work based on the Library and of the other library facilities +is otherwise permitted, and provided that you do these two things: + +a) Accompany the combined library with a copy of the same work based on the +Library, uncombined with any other library facilities. This must be distributed +under the terms of the Sections above. + +b) Give prominent notice with the combined library of the fact that part of +it is a work based on the Library, and explaining where to find the accompanying +uncombined form of the same work. + +8. You may not copy, modify, sublicense, link with, or distribute the Library +except as expressly provided under this License. Any attempt otherwise to +copy, modify, sublicense, link with, or distribute the Library is void, and +will automatically terminate your rights under this License. However, parties +who have received copies, or rights, from you under this License will not +have their licenses terminated so long as such parties remain in full compliance. + +9. You are not required to accept this License, since you have not signed +it. However, nothing else grants you permission to modify or distribute the +Library or its derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or distributing the Library +(or any work based on the Library), you indicate your acceptance of this License +to do so, and all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + +10. Each time you redistribute the Library (or any work based on the Library), +the recipient automatically receives a license from the original licensor +to copy, distribute, link with or modify the Library subject to these terms +and conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties with this License. + +11. If, as a consequence of a court judgment or allegation of patent infringement +or for any other reason (not limited to patent issues), conditions are imposed +on you (whether by court order, agreement or otherwise) that contradict the +conditions of this License, they do not excuse you from the conditions of +this License. If you cannot distribute so as to satisfy simultaneously your +obligations under this License and any other pertinent obligations, then as +a consequence you may not distribute the Library at all. For example, if a +patent license would not permit royalty-free redistribution of the Library +by all those who receive copies directly or indirectly through you, then the +only way you could satisfy both it and this License would be to refrain entirely +from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents +or other property right claims or to contest validity of any such claims; +this section has the sole purpose of protecting the integrity of the free +software distribution system which is implemented by public license practices. +Many people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose +that choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +12. If the distribution and/or use of the Library is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Library under this License may add an explicit geographical +distribution limitation excluding those countries, so that distribution is +permitted only in or among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the body of this License. + +13. The Free Software Foundation may publish revised and/or new versions of +the Lesser General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to address +new problems or concerns. + +Each version is given a distinguishing version number. If the Library specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that version +or of any later version published by the Free Software Foundation. If the +Library does not specify a license version number, you may choose any version +ever published by the Free Software Foundation. + +14. If you wish to incorporate parts of the Library into other free programs +whose distribution conditions are incompatible with these, write to the author +to ask for permission. For software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we sometimes make exceptions +for this. Our decision will be guided by the two goals of preserving the free +status of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + +15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE +OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE +OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA +OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES +OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Libraries + +If you develop a new library, and you want it to be of the greatest possible +use to the public, we recommend making it free software that everyone can +redistribute and change. You can do so by permitting redistribution under +these terms (or, alternatively, under the terms of the ordinary General Public +License). + +To apply these terms, attach the following notices to the library. It is safest +to attach them to the start of each source file to most effectively convey +the exclusion of warranty; and each file should have at least the "copyright" +line and a pointer to where the full notice is found. + +<one line to give the library's name and an idea of what it does.> + +Copyright (C) <year> <name of author> + +This 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. + +This 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 this library; if not, write to the Free Software Foundation, Inc., 51 +Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your school, +if any, to sign a "copyright disclaimer" for the library, if necessary. Here +is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in + +the library `Frob' (a library for tweaking knobs) written + +by James Random Hacker. + +< signature of Ty Coon > , 1 April 1990 + +Ty Coon, President of Vice + +That's all there is to it! diff --git a/poky/meta/files/common-licenses/LGPL-3.0 b/poky/meta/files/common-licenses/LGPL-3.0-only index 6be29bf20..6be29bf20 100644 --- a/poky/meta/files/common-licenses/LGPL-3.0 +++ b/poky/meta/files/common-licenses/LGPL-3.0-only diff --git a/poky/meta/files/common-licenses/LGPL-3.0-or-later b/poky/meta/files/common-licenses/LGPL-3.0-or-later new file mode 100644 index 000000000..bd405afbe --- /dev/null +++ b/poky/meta/files/common-licenses/LGPL-3.0-or-later @@ -0,0 +1,163 @@ +GNU LESSER GENERAL PUBLIC LICENSE + +Version 3, 29 June 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +This version of the GNU Lesser General Public License incorporates the terms +and conditions of version 3 of the GNU General Public License, supplemented +by the additional permissions listed below. + + 0. Additional Definitions. + + + +As used herein, "this License" refers to version 3 of the GNU Lesser General +Public License, and the "GNU GPL" refers to version 3 of the GNU General Public +License. + + + +"The Library" refers to a covered work governed by this License, other than +an Application or a Combined Work as defined below. + + + +An "Application" is any work that makes use of an interface provided by the +Library, but which is not otherwise based on the Library. Defining a subclass +of a class defined by the Library is deemed a mode of using an interface provided +by the Library. + + + +A "Combined Work" is a work produced by combining or linking an Application +with the Library. The particular version of the Library with which the Combined +Work was made is also called the "Linked Version". + + + +The "Minimal Corresponding Source" for a Combined Work means the Corresponding +Source for the Combined Work, excluding any source code for portions of the +Combined Work that, considered in isolation, are based on the Application, +and not on the Linked Version. + + + +The "Corresponding Application Code" for a Combined Work means the object +code and/or source code for the Application, including any data and utility +programs needed for reproducing the Combined Work from the Application, but +excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + +You may convey a covered work under sections 3 and 4 of this License without +being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + +If you modify a copy of the Library, and, in your modifications, a facility +refers to a function or data to be supplied by an Application that uses the +facility (other than as an argument passed when the facility is invoked), +then you may convey a copy of the modified version: + +a) under this License, provided that you make a good faith effort to ensure +that, in the event an Application does not supply the function or data, the +facility still operates, and performs whatever part of its purpose remains +meaningful, or + +b) under the GNU GPL, with none of the additional permissions of this License +applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + +The object code form of an Application may incorporate material from a header +file that is part of the Library. You may convey such object code under terms +of your choice, provided that, if the incorporated material is not limited +to numerical parameters, data structure layouts and accessors, or small macros, +inline functions and templates (ten or fewer lines in length), you do both +of the following: + +a) Give prominent notice with each copy of the object code that the Library +is used in it and that the Library and its use are covered by this License. + +b) Accompany the object code with a copy of the GNU GPL and this license document. + + 4. Combined Works. + +You may convey a Combined Work under terms of your choice that, taken together, +effectively do not restrict modification of the portions of the Library contained +in the Combined Work and reverse engineering for debugging such modifications, +if you also do each of the following: + +a) Give prominent notice with each copy of the Combined Work that the Library +is used in it and that the Library and its use are covered by this License. + +b) Accompany the Combined Work with a copy of the GNU GPL and this license +document. + +c) For a Combined Work that displays copyright notices during execution, include +the copyright notice for the Library among these notices, as well as a reference +directing the user to the copies of the GNU GPL and this license document. + + d) Do one of the following: + +0) Convey the Minimal Corresponding Source under the terms of this License, +and the Corresponding Application Code in a form suitable for, and under terms +that permit, the user to recombine or relink the Application with a modified +version of the Linked Version to produce a modified Combined Work, in the +manner specified by section 6 of the GNU GPL for conveying Corresponding Source. + +1) Use a suitable shared library mechanism for linking with the Library. A +suitable mechanism is one that (a) uses at run time a copy of the Library +already present on the user's computer system, and (b) will operate properly +with a modified version of the Library that is interface-compatible with the +Linked Version. + +e) Provide Installation Information, but only if you would otherwise be required +to provide such information under section 6 of the GNU GPL, and only to the +extent that such information is necessary to install and execute a modified +version of the Combined Work produced by recombining or relinking the Application +with a modified version of the Linked Version. (If you use option 4d0, the +Installation Information must accompany the Minimal Corresponding Source and +Corresponding Application Code. If you use option 4d1, you must provide the +Installation Information in the manner specified by section 6 of the GNU GPL +for conveying Corresponding Source.) + + 5. Combined Libraries. + +You may place library facilities that are a work based on the Library side +by side in a single library together with other library facilities that are +not Applications and are not covered by this License, and convey such a combined +library under terms of your choice, if you do both of the following: + +a) Accompany the combined library with a copy of the same work based on the +Library, uncombined with any other library facilities, conveyed under the +terms of this License. + +b) Give prominent notice with the combined library that part of it is a work +based on the Library, and explaining where to find the accompanying uncombined +form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + +The Free Software Foundation may publish revised and/or new versions of the +GNU Lesser General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to address +new problems or concerns. + +Each version is given a distinguishing version number. If the Library as you +received it specifies that a certain numbered version of the GNU Lesser General +Public License "or any later version" applies to it, you have the option of +following the terms and conditions either of that published version or of +any later version published by the Free Software Foundation. If the Library +as you received it does not specify a version number of the GNU Lesser General +Public License, you may choose any version of the GNU Lesser General Public +License ever published by the Free Software Foundation. + +If the Library as you received it specifies that a proxy can decide whether +future versions of the GNU Lesser General Public License shall apply, that +proxy's public statement of acceptance of any version is permanent authorization +for you to choose that version for the Library. diff --git a/poky/meta/files/ptest-perl/run-ptest b/poky/meta/files/ptest-perl/run-ptest index c9f9ca94d..fd35357b4 100644 --- a/poky/meta/files/ptest-perl/run-ptest +++ b/poky/meta/files/ptest-perl/run-ptest @@ -1,7 +1,7 @@ #!/bin/sh for case in `find t -type f -name '*.t'`; do - perl $case >$case.output 2>&1 + perl -I . $case >$case.output 2>&1 ret=$? cat $case.output if [ $ret -ne 0 ]; then diff --git a/poky/meta/files/toolchain-shar-extract.sh b/poky/meta/files/toolchain-shar-extract.sh index bea6d4189..dd9342758 100644 --- a/poky/meta/files/toolchain-shar-extract.sh +++ b/poky/meta/files/toolchain-shar-extract.sh @@ -95,7 +95,7 @@ while getopts ":yd:npDRSl" OPT; do listcontents=1 ;; *) - echo "Usage: $(basename $0) [-y] [-d <dir>]" + echo "Usage: $(basename "$0") [-y] [-d <dir>]" echo " -y Automatic yes to all prompts" echo " -d <dir> Install the SDK to <dir>" echo "======== Extensible SDK only options ============" @@ -111,17 +111,17 @@ while getopts ":yd:npDRSl" OPT; do esac done -payload_offset=$(($(grep -na -m1 "^MARKER:$" $0|cut -d':' -f1) + 1)) +payload_offset=$(($(grep -na -m1 "^MARKER:$" "$0"|cut -d':' -f1) + 1)) if [ "$listcontents" = "1" ] ; then if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then - tail -n +$payload_offset $0 > sdk.zip + tail -n +$payload_offset "$0" > sdk.zip if unzip -l sdk.zip;then rm sdk.zip else rm sdk.zip && exit 1 fi else - tail -n +$payload_offset $0| tar tvJ || exit 1 + tail -n +$payload_offset "$0"| tar tvJ || exit 1 fi exit fi @@ -242,14 +242,14 @@ fi printf "Extracting SDK..." if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then - tail -n +$payload_offset $0 > sdk.zip + tail -n +$payload_offset "$0" > sdk.zip if $SUDO_EXEC unzip $EXTRA_TAR_OPTIONS sdk.zip -d $target_sdk_dir;then rm sdk.zip else rm sdk.zip && exit 1 fi else - tail -n +$payload_offset $0| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 + tail -n +$payload_offset "$0"| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 fi echo "done" diff --git a/poky/meta/files/toolchain-shar-relocate.sh b/poky/meta/files/toolchain-shar-relocate.sh index e3c10018e..543374129 100644 --- a/poky/meta/files/toolchain-shar-relocate.sh +++ b/poky/meta/files/toolchain-shar-relocate.sh @@ -55,8 +55,11 @@ fi for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do $SUDO_EXEC find $replace -type f done | xargs -n100 file | grep ":.*\(ASCII\|script\|source\).*text" | \ - awk -F':' '{printf "\"%s\"\n", $1}' | \ - grep -Ev "$target_sdk_dir/(environment-setup-*|relocate_sdk*|${0##*/})" | \ + awk -F': ' '{printf "\"%s\"\n", $1}' | \ + grep -Fv -e "$target_sdk_dir/environment-setup-" \ + -e "$target_sdk_dir/relocate_sdk" \ + -e "$target_sdk_dir/post-relocate-setup" \ + -e "$target_sdk_dir/${0##*/}" | \ xargs -n100 $SUDO_EXEC sed -i \ -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \ -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" \ diff --git a/poky/meta/lib/oe/cve_check.py b/poky/meta/lib/oe/cve_check.py new file mode 100644 index 000000000..ce755f940 --- /dev/null +++ b/poky/meta/lib/oe/cve_check.py @@ -0,0 +1,60 @@ +import collections +import re +import itertools +import functools + +_Version = collections.namedtuple( + "_Version", ["release", "patch_l", "pre_l", "pre_v"] +) + +@functools.total_ordering +class Version(): + + def __init__(self, version, suffix=None): + if str(suffix) == "alphabetical": + version_pattern = r"""r?v?(?:(?P<release>[0-9]+(?:[-\.][0-9]+)*)(?P<patch>[-_\.]?(?P<patch_l>[a-z]))?(?P<pre>[-_\.]?(?P<pre_l>(rc|alpha|beta|pre|preview|dev))[-_\.]?(?P<pre_v>[0-9]+)?)?)(.*)?""" + else: + version_pattern = r"""r?v?(?:(?P<release>[0-9]+(?:[-\.][0-9]+)*)(?P<pre>[-_\.]?(?P<pre_l>(rc|alpha|beta|pre|preview|dev))[-_\.]?(?P<pre_v>[0-9]+)?)?)(.*)?""" + regex = re.compile(r"^\s*" + version_pattern + r"\s*$", re.VERBOSE | re.IGNORECASE) + + match = regex.search(version) + if not match: + raise Exception("Invalid version: '{0}'".format(version)) + + self._version = _Version( + release=tuple(int(i) for i in match.group("release").replace("-",".").split(".")), + patch_l=match.group("patch_l") if str(suffix) == "alphabetical" and match.group("patch_l") else "", + pre_l=match.group("pre_l"), + pre_v=match.group("pre_v") + ) + + self._key = _cmpkey( + self._version.release, + self._version.patch_l, + self._version.pre_l, + self._version.pre_v + ) + + def __eq__(self, other): + if not isinstance(other, Version): + return NotImplemented + return self._key == other._key + + def __gt__(self, other): + if not isinstance(other, Version): + return NotImplemented + return self._key > other._key + +def _cmpkey(release, patch_l, pre_l, pre_v): + # remove leading 0 + _release = tuple( + reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release)))) + ) + + _patch = patch_l.upper() + + if pre_l is None and pre_v is None: + _pre = float('inf') + else: + _pre = float(pre_v) if pre_v else float('-inf') + return _release, _patch, _pre diff --git a/poky/meta/lib/oe/license.py b/poky/meta/lib/oe/license.py index c1274a61d..665d32ecb 100644 --- a/poky/meta/lib/oe/license.py +++ b/poky/meta/lib/oe/license.py @@ -10,14 +10,7 @@ from fnmatch import fnmatchcase as fnmatch def license_ok(license, dont_want_licenses): """ Return False if License exist in dont_want_licenses else True """ for dwl in dont_want_licenses: - # If you want to exclude license named generically 'X', we - # surely want to exclude 'X+' as well. In consequence, we - # will exclude a trailing '+' character from LICENSE in - # case INCOMPATIBLE_LICENSE is not a 'X+' license. - lic = license - if not re.search(r'\+$', dwl): - lic = re.sub(r'\+', '', license) - if fnmatch(lic, dwl): + if fnmatch(license, dwl): return False return True diff --git a/poky/meta/lib/oe/package_manager/__init__.py b/poky/meta/lib/oe/package_manager/__init__.py index 42225a3b2..8e7128b19 100644 --- a/poky/meta/lib/oe/package_manager/__init__.py +++ b/poky/meta/lib/oe/package_manager/__init__.py @@ -328,7 +328,11 @@ class PackageManager(object, metaclass=ABCMeta): try: bb.note("Installing globbed packages...") cmd = ["oe-pkgdata-util", "-p", pkgdatadir, "list-pkgs", globs] - pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") + bb.note('Running %s' % cmd) + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = proc.communicate() + if stderr: bb.note(stderr.decode("utf-8")) + pkgs = stdout.decode("utf-8") self.install(pkgs.split(), attempt_only=True) except subprocess.CalledProcessError as e: # Return code 1 means no packages matched @@ -384,7 +388,10 @@ class PackageManager(object, metaclass=ABCMeta): cmd.extend(['--exclude=' + '|'.join(exclude.split())]) try: bb.note('Running %s' % cmd) - complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = proc.communicate() + if stderr: bb.note(stderr.decode("utf-8")) + complementary_pkgs = stdout.decode("utf-8") complementary_pkgs = set(complementary_pkgs.split()) skip_pkgs = sorted(complementary_pkgs & provided_pkgs) install_pkgs = sorted(complementary_pkgs - provided_pkgs) diff --git a/poky/meta/lib/oe/package_manager/deb/__init__.py b/poky/meta/lib/oe/package_manager/deb/__init__.py index 10ad707c2..2ee68fefb 100644 --- a/poky/meta/lib/oe/package_manager/deb/__init__.py +++ b/poky/meta/lib/oe/package_manager/deb/__init__.py @@ -287,7 +287,8 @@ class DpkgPM(OpkgDpkgPM): try: bb.note("Installing the following packages: %s" % ' '.join(pkgs)) - subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT) + output = subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT) + bb.note(output.decode("utf-8")) except subprocess.CalledProcessError as e: (bb.fatal, bb.warn)[attempt_only]("Unable to install packages. " "Command '%s' returned %d:\n%s" % @@ -312,6 +313,10 @@ class DpkgPM(OpkgDpkgPM): if not pkgs: return + os.environ['D'] = self.target_rootfs + os.environ['OFFLINE_ROOT'] = self.target_rootfs + os.environ['IPKG_OFFLINE_ROOT'] = self.target_rootfs + os.environ['OPKG_OFFLINE_ROOT'] = self.target_rootfs os.environ['INTERCEPT_DIR'] = self.intercepts_dir if with_dependencies: @@ -343,8 +348,12 @@ class DpkgPM(OpkgDpkgPM): if feed_uris == "": return + sources_conf = os.path.join("%s/etc/apt/sources.list" % self.target_rootfs) + if not os.path.exists(os.path.dirname(sources_conf)): + return + arch_list = [] if feed_archs is None: @@ -362,11 +371,11 @@ class DpkgPM(OpkgDpkgPM): if arch_list: for arch in arch_list: bb.note('Adding dpkg channel at (%s)' % uri) - sources_file.write("deb %s/%s ./\n" % + sources_file.write("deb [trusted=yes] %s/%s ./\n" % (uri, arch)) else: bb.note('Adding dpkg channel at (%s)' % uri) - sources_file.write("deb %s ./\n" % uri) + sources_file.write("deb [trusted=yes] %s ./\n" % uri) def _create_configs(self, archs, base_archs): base_archs = re.sub(r"_", r"-", base_archs) @@ -406,7 +415,7 @@ class DpkgPM(OpkgDpkgPM): with open(os.path.join(self.apt_conf_dir, "sources.list"), "w+") as sources_file: for arch in arch_list: - sources_file.write("deb file:%s/ ./\n" % + sources_file.write("deb [trusted=yes] file:%s/ ./\n" % os.path.join(self.deploy_dir, arch)) base_arch_list = base_archs.split() diff --git a/poky/meta/lib/oe/package_manager/ipk/sdk.py b/poky/meta/lib/oe/package_manager/ipk/sdk.py index 37af0344e..e2ca415c8 100644 --- a/poky/meta/lib/oe/package_manager/ipk/sdk.py +++ b/poky/meta/lib/oe/package_manager/ipk/sdk.py @@ -14,6 +14,12 @@ class PkgSdk(Sdk): def __init__(self, d, manifest_dir=None): super(PkgSdk, self).__init__(d, manifest_dir) + # In sdk_list_installed_packages the call to opkg is hardcoded to + # always use IPKGCONF_TARGET and there's no exposed API to change this + # so simply override IPKGCONF_TARGET to use this separated config file. + ipkgconf_sdk_target = d.getVar("IPKGCONF_SDK_TARGET") + d.setVar("IPKGCONF_TARGET", ipkgconf_sdk_target) + self.target_conf = self.d.getVar("IPKGCONF_TARGET") self.host_conf = self.d.getVar("IPKGCONF_SDK") diff --git a/poky/meta/lib/oe/package_manager/rpm/__init__.py b/poky/meta/lib/oe/package_manager/rpm/__init__.py index 898184442..6df009228 100644 --- a/poky/meta/lib/oe/package_manager/rpm/__init__.py +++ b/poky/meta/lib/oe/package_manager/rpm/__init__.py @@ -33,6 +33,9 @@ class RpmIndexer(Indexer): class RpmSubdirIndexer(RpmIndexer): def write_index(self): bb.note("Generating package index for %s" %(self.deploy_dir)) + # Remove the existing repodata to ensure that we re-generate it no matter what + bb.utils.remove(os.path.join(self.deploy_dir, "repodata"), recurse=True) + self.do_write_index(self.deploy_dir) for entry in os.walk(self.deploy_dir): if os.path.samefile(self.deploy_dir, entry[0]): diff --git a/poky/meta/lib/oe/patch.py b/poky/meta/lib/oe/patch.py index 40755fbb0..fccbedb51 100644 --- a/poky/meta/lib/oe/patch.py +++ b/poky/meta/lib/oe/patch.py @@ -38,15 +38,19 @@ def runcmd(args, dir = None): args = [ pipes.quote(str(arg)) for arg in args ] cmd = " ".join(args) # print("cmd: %s" % cmd) - (exitstatus, output) = subprocess.getstatusoutput(cmd) + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) + stdout, stderr = proc.communicate() + stdout = stdout.decode('utf-8') + stderr = stderr.decode('utf-8') + exitstatus = proc.returncode if exitstatus != 0: - raise CmdError(cmd, exitstatus >> 8, output) - if " fuzz " in output and "Hunk " in output: + raise CmdError(cmd, exitstatus >> 8, "stdout: %s\nstderr: %s" % (stdout, stderr)) + if " fuzz " in stdout and "Hunk " in stdout: # Drop patch fuzz info with header and footer to log file so # insane.bbclass can handle to throw error/warning - bb.note("--- Patch fuzz start ---\n%s\n--- Patch fuzz end ---" % format(output)) + bb.note("--- Patch fuzz start ---\n%s\n--- Patch fuzz end ---" % format(stdout)) - return output + return stdout finally: if dir: @@ -512,7 +516,7 @@ class GitApplyTree(PatchTree): try: shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot] self.gitCommandUserOptions(shellcmd, self.commituser, self.commitemail) - shellcmd += ["am", "-3", "--keep-cr", "-p%s" % patch['strippath']] + shellcmd += ["am", "-3", "--keep-cr", "--no-scissors", "-p%s" % patch['strippath']] return _applypatchhelper(shellcmd, patch, force, reverse, run) except CmdError: # Need to abort the git am, or we'll still be within it at the end diff --git a/poky/meta/lib/oe/recipeutils.py b/poky/meta/lib/oe/recipeutils.py index ef69ef207..407d16889 100644 --- a/poky/meta/lib/oe/recipeutils.py +++ b/poky/meta/lib/oe/recipeutils.py @@ -409,7 +409,7 @@ def copy_recipe_files(d, tgt_dir, whole_dir=False, download=True, all_variants=F fetch.download() for pth in fetch.localpaths(): if pth not in localpaths: - localpaths.append(pth) + localpaths.append(os.path.abspath(pth)) uri_values.append(srcuri) fetch_urls(d) diff --git a/poky/meta/lib/oe/reproducible.py b/poky/meta/lib/oe/reproducible.py index 0fb02ccdb..204b9bd73 100644 --- a/poky/meta/lib/oe/reproducible.py +++ b/poky/meta/lib/oe/reproducible.py @@ -90,8 +90,12 @@ def get_source_date_epoch_from_youngest_file(d, sourcedir): bb.debug(1, "Newest file found: %s" % newest_file) return source_date_epoch -def fixed_source_date_epoch(): +def fixed_source_date_epoch(d): bb.debug(1, "No tarball or git repo found to determine SOURCE_DATE_EPOCH") + source_date_epoch = d.getVar('SOURCE_DATE_EPOCH_FALLBACK') + if source_date_epoch: + bb.debug(1, "Using SOURCE_DATE_EPOCH_FALLBACK") + return int(source_date_epoch) return 0 def get_source_date_epoch(d, sourcedir): @@ -99,6 +103,6 @@ def get_source_date_epoch(d, sourcedir): get_source_date_epoch_from_git(d, sourcedir) or get_source_date_epoch_from_known_files(d, sourcedir) or get_source_date_epoch_from_youngest_file(d, sourcedir) or - fixed_source_date_epoch() # Last resort + fixed_source_date_epoch(d) # Last resort ) diff --git a/poky/meta/lib/oe/rootfs.py b/poky/meta/lib/oe/rootfs.py index 4b747dd0f..249c685dc 100644 --- a/poky/meta/lib/oe/rootfs.py +++ b/poky/meta/lib/oe/rootfs.py @@ -217,6 +217,9 @@ class Rootfs(object, metaclass=ABCMeta): self.progress_reporter.next_stage() if bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", + True, False, self.d) and \ + not bb.utils.contains("IMAGE_FEATURES", + "read-only-rootfs-delayed-postinsts", True, False, self.d): delayed_postinsts = self._get_delayed_postinsts() if delayed_postinsts is not None: diff --git a/poky/meta/lib/oe/sstatesig.py b/poky/meta/lib/oe/sstatesig.py index adfe2e403..6cd6e11ac 100644 --- a/poky/meta/lib/oe/sstatesig.py +++ b/poky/meta/lib/oe/sstatesig.py @@ -453,7 +453,7 @@ def find_sstate_manifest(taskdata, taskdata2, taskname, d, multilibcache): manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-%s-%s.%s" % (pkgarch, taskdata, taskname)) if os.path.exists(manifest): return manifest, d2 - bb.warn("Manifest %s not found in %s (variant '%s')?" % (manifest, d2.expand(" ".join(pkgarchs)), variant)) + bb.error("Manifest %s not found in %s (variant '%s')?" % (manifest, d2.expand(" ".join(pkgarchs)), variant)) return None, d2 def OEOuthashBasic(path, sigfile, task, d): @@ -552,9 +552,11 @@ def OEOuthashBasic(path, sigfile, task, d): try: update_hash(" %10s" % pwd.getpwuid(s.st_uid).pw_name) update_hash(" %10s" % grp.getgrgid(s.st_gid).gr_name) - except KeyError: + except KeyError as e: bb.warn("KeyError in %s" % path) - raise + msg = ("KeyError: %s\nPath %s is owned by uid %d, gid %d, which doesn't match " + "any user/group on target. This may be due to host contamination." % (e, path, s.st_uid, s.st_gid)) + raise Exception(msg).with_traceback(e.__traceback__) if include_timestamps: update_hash(" %10d" % s.st_mtime) diff --git a/poky/meta/lib/oe/terminal.py b/poky/meta/lib/oe/terminal.py index eb10a6e33..61c2687ef 100644 --- a/poky/meta/lib/oe/terminal.py +++ b/poky/meta/lib/oe/terminal.py @@ -185,7 +185,7 @@ class Custom(Terminal): Terminal.__init__(self, sh_cmd, title, env, d) logger.warning('Custom terminal was started.') else: - logger.debug(1, 'No custom terminal (OE_TERMINAL_CUSTOMCMD) set') + logger.debug('No custom terminal (OE_TERMINAL_CUSTOMCMD) set') raise UnsupportedTerminal('OE_TERMINAL_CUSTOMCMD not set') @@ -216,7 +216,7 @@ def spawn_preferred(sh_cmd, title=None, env=None, d=None): def spawn(name, sh_cmd, title=None, env=None, d=None): """Spawn the specified terminal, by name""" - logger.debug(1, 'Attempting to spawn terminal "%s"', name) + logger.debug('Attempting to spawn terminal "%s"', name) try: terminal = Registry.registry[name] except KeyError: diff --git a/poky/meta/lib/oe/utils.py b/poky/meta/lib/oe/utils.py index 468c76f30..9a2187e36 100644 --- a/poky/meta/lib/oe/utils.py +++ b/poky/meta/lib/oe/utils.py @@ -193,7 +193,7 @@ def parallel_make(d, makeinst=False): return int(v) - return None + return '' def parallel_make_argument(d, fmt, limit=None, makeinst=False): """ diff --git a/poky/meta/lib/oeqa/runtime/cases/df.py b/poky/meta/lib/oeqa/runtime/cases/df.py index 89fd0fb90..bb155c9cf 100644 --- a/poky/meta/lib/oeqa/runtime/cases/df.py +++ b/poky/meta/lib/oeqa/runtime/cases/df.py @@ -4,12 +4,14 @@ from oeqa.runtime.case import OERuntimeTestCase from oeqa.core.decorator.depends import OETestDepends +from oeqa.core.decorator.data import skipIfDataVar, skipIfInDataVar from oeqa.runtime.decorator.package import OEHasPackage class DfTest(OERuntimeTestCase): @OETestDepends(['ssh.SSHTest.test_ssh']) @OEHasPackage(['coreutils', 'busybox']) + @skipIfInDataVar('IMAGE_FEATURES', 'read-only-rootfs', 'Test case df requires a writable rootfs') def test_df(self): cmd = "df -P / | sed -n '2p' | awk '{print $4}'" (status,output) = self.target.run(cmd) diff --git a/poky/meta/lib/oeqa/runtime/cases/ethernet_ip_connman.py b/poky/meta/lib/oeqa/runtime/cases/ethernet_ip_connman.py new file mode 100644 index 000000000..e01061283 --- /dev/null +++ b/poky/meta/lib/oeqa/runtime/cases/ethernet_ip_connman.py @@ -0,0 +1,36 @@ +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.core.decorator.data import skipIfQemu + +class Ethernet_Test(OERuntimeTestCase): + + def set_ip(self, x): + x = x.split(".") + sample_host_address = '150' + x[3] = sample_host_address + x = '.'.join(x) + return x + + @skipIfQemu('qemuall', 'Test only runs on real hardware') + @OETestDepends(['ssh.SSHTest.test_ssh']) + def test_set_virtual_ip(self): + (status, output) = self.target.run("ifconfig eth0 | grep 'inet ' | awk '{print $2}'") + self.assertEqual(status, 0, msg='Failed to get ip address. Make sure you have an ethernet connection on your device, output: %s' % output) + original_ip = output + virtual_ip = self.set_ip(original_ip) + + (status, output) = self.target.run("ifconfig eth0:1 %s netmask 255.255.255.0 && sleep 2 && ping -c 5 %s && ifconfig eth0:1 down" % (virtual_ip,virtual_ip)) + self.assertEqual(status, 0, msg='Failed to create virtual ip address, output: %s' % output) + + @OETestDepends(['ethernet_ip_connman.Ethernet_Test.test_set_virtual_ip']) + def test_get_ip_from_dhcp(self): + (status, output) = self.target.run("connmanctl services | grep -E '*AO Wired|*AR Wired' | awk '{print $3}'") + self.assertEqual(status, 0, msg='No wired interfaces are detected, output: %s' % output) + wired_interfaces = output + + (status, output) = self.target.run("ip route | grep default | awk '{print $3}'") + self.assertEqual(status, 0, msg='Failed to retrieve the default gateway, output: %s' % output) + default_gateway = output + + (status, output) = self.target.run("connmanctl config %s --ipv4 dhcp && sleep 2 && ping -c 5 %s" % (wired_interfaces,default_gateway)) + self.assertEqual(status, 0, msg='Failed to get dynamic IP address via DHCP in connmand, output: %s' % output)
\ No newline at end of file diff --git a/poky/meta/lib/oeqa/runtime/cases/pam.py b/poky/meta/lib/oeqa/runtime/cases/pam.py index 271a1943e..a482ded94 100644 --- a/poky/meta/lib/oeqa/runtime/cases/pam.py +++ b/poky/meta/lib/oeqa/runtime/cases/pam.py @@ -8,11 +8,14 @@ from oeqa.runtime.case import OERuntimeTestCase from oeqa.core.decorator.depends import OETestDepends from oeqa.core.decorator.data import skipIfNotFeature +from oeqa.runtime.decorator.package import OEHasPackage class PamBasicTest(OERuntimeTestCase): @skipIfNotFeature('pam', 'Test requires pam to be in DISTRO_FEATURES') @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(['shadow']) + @OEHasPackage(['shadow-base']) def test_pam(self): status, output = self.target.run('login --help') msg = ('login command does not work as expected. ' diff --git a/poky/meta/lib/oeqa/runtime/cases/ptest.py b/poky/meta/lib/oeqa/runtime/cases/ptest.py index a9572c81f..0800f3c27 100644 --- a/poky/meta/lib/oeqa/runtime/cases/ptest.py +++ b/poky/meta/lib/oeqa/runtime/cases/ptest.py @@ -108,4 +108,5 @@ class PtestRunnerTest(OERuntimeTestCase): failmsg = failmsg + "Failed ptests:\n%s" % pprint.pformat(failed_tests) if failmsg: + self.logger.warning("There were failing ptests.") self.fail(failmsg) diff --git a/poky/meta/lib/oeqa/runtime/cases/runlevel.py b/poky/meta/lib/oeqa/runtime/cases/runlevel.py new file mode 100644 index 000000000..3a4df8ace --- /dev/null +++ b/poky/meta/lib/oeqa/runtime/cases/runlevel.py @@ -0,0 +1,22 @@ +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends + +import time + +class RunLevel_Test(OERuntimeTestCase): + + @OETestDepends(['ssh.SSHTest.test_ssh']) + def test_runlevel_3(self): + (status, output) = self.target.run("init 3 && sleep 5 && runlevel") + runlevel= '5 3' + self.assertEqual(output, runlevel, msg='Failed to set current runlevel to runlevel 3, current runlevel : %s' % output[-1]) + (status, output) = self.target.run("uname -a") + self.assertEqual(status, 0, msg='Failed to run uname command, output: %s' % output) + + @OETestDepends(['runlevel.RunLevel_Test.test_runlevel_3']) + def test_runlevel_5(self): + (status, output) = self.target.run("init 5 && sleep 5 && runlevel") + runlevel = '3 5' + self.assertEqual(output, runlevel, msg='Failed to set current runlevel to runlevel 5, current runlevel : %s' % output[-1]) + (status, output) = self.target.run('export DISPLAY=:0 && x11perf -aa10text') + self.assertEqual(status, 0, msg='Failed to run 2D graphic test, output: %s' % output) diff --git a/poky/meta/lib/oeqa/runtime/cases/usb_hid.py b/poky/meta/lib/oeqa/runtime/cases/usb_hid.py new file mode 100644 index 000000000..3c292cf66 --- /dev/null +++ b/poky/meta/lib/oeqa/runtime/cases/usb_hid.py @@ -0,0 +1,22 @@ +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.core.decorator.data import skipIfQemu +from oeqa.runtime.decorator.package import OEHasPackage + +class USB_HID_Test(OERuntimeTestCase): + + def keyboard_mouse_simulation(self): + (status, output) = self.target.run('export DISPLAY=:0 && xdotool key F2 && xdotool mousemove 100 100') + return self.assertEqual(status, 0, msg = 'Failed to simulate keyboard/mouse input event, output : %s' % output) + + def set_suspend(self): + (status, output) = self.target.run('sudo rtcwake -m mem -s 10') + return self.assertEqual(status, 0, msg = 'Failed to suspends your system to RAM, output : %s' % output) + + @OEHasPackage(['xdotool']) + @skipIfQemu('qemuall', 'Test only runs on real hardware') + @OETestDepends(['ssh.SSHTest.test_ssh']) + def test_USB_Hid_input(self): + self.keyboard_mouse_simulation() + self.set_suspend() + self.keyboard_mouse_simulation() diff --git a/poky/meta/lib/oeqa/selftest/cases/buildoptions.py b/poky/meta/lib/oeqa/selftest/cases/buildoptions.py index d0f647730..3495bee98 100644 --- a/poky/meta/lib/oeqa/selftest/cases/buildoptions.py +++ b/poky/meta/lib/oeqa/selftest/cases/buildoptions.py @@ -33,18 +33,19 @@ class ImageOptionsTests(OESelftestTestCase): self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) def test_ccache_tool(self): - bb_vars = get_bb_vars(['HOSTTOOLS_DIR'], 'm4-native') - p = bb_vars['HOSTTOOLS_DIR'] + "/" + "ccache" - if not os.path.isfile(p): - self.skipTest("No ccache binary found in %s" % bb_vars['HOSTTOOLS_DIR']) + bitbake("ccache-native") + bb_vars = get_bb_vars(['SYSROOT_DESTDIR', 'bindir'], 'ccache-native') + p = bb_vars['SYSROOT_DESTDIR'] + bb_vars['bindir'] + "/" + "ccache" + self.assertTrue(os.path.isfile(p), msg = "No ccache found (%s)" % p) self.write_config('INHERIT += "ccache"') - self.add_command_to_tearDown('bitbake -c clean m4-native') - bitbake("m4-native -c clean") - bitbake("m4-native -f -c compile") - log_compile = os.path.join(get_bb_var("WORKDIR","m4-native"), "temp/log.do_compile") + recipe = "libgcc-initial" + self.add_command_to_tearDown('bitbake -c clean %s' % recipe) + bitbake("%s -c clean" % recipe) + bitbake("%s -f -c compile" % recipe) + log_compile = os.path.join(get_bb_var("WORKDIR", recipe), "temp/log.do_compile") with open(log_compile, "r") as f: loglines = "".join(f.readlines()) - self.assertIn("ccache", loglines, msg="No match for ccache in m4-native log.do_compile. For further details: %s" % log_compile) + self.assertIn("ccache", loglines, msg="No match for ccache in %s log.do_compile. For further details: %s" % (recipe , log_compile)) def test_read_only_image(self): distro_features = get_bb_var('DISTRO_FEATURES') diff --git a/poky/meta/lib/oeqa/selftest/cases/cve_check.py b/poky/meta/lib/oeqa/selftest/cases/cve_check.py new file mode 100644 index 000000000..3f343a284 --- /dev/null +++ b/poky/meta/lib/oeqa/selftest/cases/cve_check.py @@ -0,0 +1,36 @@ +from oe.cve_check import Version +from oeqa.selftest.case import OESelftestTestCase + +class CVECheck(OESelftestTestCase): + + def test_version_compare(self): + result = Version("100") > Version("99") + self.assertTrue( result, msg="Failed to compare version '100' > '99'") + result = Version("2.3.1") > Version("2.2.3") + self.assertTrue( result, msg="Failed to compare version '2.3.1' > '2.2.3'") + result = Version("2021-01-21") > Version("2020-12-25") + self.assertTrue( result, msg="Failed to compare version '2021-01-21' > '2020-12-25'") + result = Version("1.2-20200910") < Version("1.2-20200920") + self.assertTrue( result, msg="Failed to compare version '1.2-20200910' < '1.2-20200920'") + + result = Version("1.0") >= Version("1.0beta") + self.assertTrue( result, msg="Failed to compare version '1.0' >= '1.0beta'") + result = Version("1.0-rc2") > Version("1.0-rc1") + self.assertTrue( result, msg="Failed to compare version '1.0-rc2' > '1.0-rc1'") + result = Version("1.0.alpha1") < Version("1.0") + self.assertTrue( result, msg="Failed to compare version '1.0.alpha1' < '1.0'") + result = Version("1.0_dev") <= Version("1.0") + self.assertTrue( result, msg="Failed to compare version '1.0_dev' <= '1.0'") + + # ignore "p1" and "p2", so these should be equal + result = Version("1.0p2") == Version("1.0p1") + self.assertTrue( result ,msg="Failed to compare version '1.0p2' to '1.0p1'") + # ignore the "b" and "r" + result = Version("1.0b") == Version("1.0r") + self.assertTrue( result ,msg="Failed to compare version '1.0b' to '1.0r'") + + # consider the trailing alphabet as patched level when comparing + result = Version("1.0b","alphabetical") < Version("1.0r","alphabetical") + self.assertTrue( result ,msg="Failed to compare version with suffix '1.0b' < '1.0r'") + result = Version("1.0b","alphabetical") > Version("1.0","alphabetical") + self.assertTrue( result ,msg="Failed to compare version with suffix '1.0b' > '1.0'") diff --git a/poky/meta/lib/oeqa/selftest/cases/devtool.py b/poky/meta/lib/oeqa/selftest/cases/devtool.py index 4eba23890..3385546e8 100644 --- a/poky/meta/lib/oeqa/selftest/cases/devtool.py +++ b/poky/meta/lib/oeqa/selftest/cases/devtool.py @@ -697,7 +697,44 @@ class DevtoolModifyTests(DevtoolBase): self.assertTrue(bbclassextended, 'None of these recipes are BBCLASSEXTENDed to native - need to adjust testrecipes list: %s' % ', '.join(testrecipes)) self.assertTrue(inheritnative, 'None of these recipes do "inherit native" - need to adjust testrecipes list: %s' % ', '.join(testrecipes)) + def test_devtool_modify_localfiles_only(self): + # Check preconditions + testrecipe = 'base-files' + src_uri = (get_bb_var('SRC_URI', testrecipe) or '').split() + foundlocalonly = False + correct_symlink = False + for item in src_uri: + if item.startswith('file://'): + if '.patch' not in item: + foundlocalonly = True + else: + foundlocalonly = False + break + self.assertTrue(foundlocalonly, 'This test expects the %s recipe to fetch local files only and it seems that it no longer does' % testrecipe) + # Clean up anything in the workdir/sysroot/sstate cache + bitbake('%s -c cleansstate' % testrecipe) + # Try modifying a recipe + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(self.workspacedir) + self.add_command_to_tearDown('bitbake -c clean %s' % testrecipe) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir)) + srcfile = os.path.join(tempdir, 'oe-local-files/share/dot.bashrc') + srclink = os.path.join(tempdir, 'share/dot.bashrc') + self.assertExists(srcfile, 'Extracted source could not be found') + if os.path.islink(srclink) and os.path.exists(srclink) and os.path.samefile(srcfile, srclink): + correct_symlink = True + self.assertTrue(correct_symlink, 'Source symlink to oe-local-files is broken') + matches = glob.glob(os.path.join(self.workspacedir, 'appends', '%s_*.bbappend' % testrecipe)) + self.assertTrue(matches, 'bbappend not created') + # Test devtool status + result = runCmd('devtool status') + self.assertIn(testrecipe, result.output) + self.assertIn(tempdir, result.output) + # Try building + bitbake(testrecipe) def test_devtool_modify_git(self): # Check preconditions diff --git a/poky/meta/lib/oeqa/selftest/cases/fitimage.py b/poky/meta/lib/oeqa/selftest/cases/fitimage.py index 19b9f53ee..02692de82 100644 --- a/poky/meta/lib/oeqa/selftest/cases/fitimage.py +++ b/poky/meta/lib/oeqa/selftest/cases/fitimage.py @@ -69,9 +69,9 @@ FIT_DESC = "A model description" 'type = "ramdisk";', 'load = <0x88000000>;', 'entry = <0x88000000>;', - 'default = "conf@1";', - 'kernel = "kernel@1";', - 'ramdisk = "ramdisk@1";' + 'default = "conf-1";', + 'kernel = "kernel-1";', + 'ramdisk = "ramdisk-1";' ] with open(fitimage_its_path) as its_file: @@ -137,12 +137,12 @@ UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'" "%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'], + ['/', '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 = [] @@ -158,7 +158,7 @@ UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'" elif line.endswith('{'): itspath.append(line[:-1].strip()) itspaths.append(itspath[:]) - elif itspath and itspath[-1] == 'signature@1': + elif itspath and itspath[-1] == 'signature-1': itsdotpath = '.'.join(itspath) if not itsdotpath in sigs: sigs[itsdotpath] = {} @@ -182,7 +182,7 @@ UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'" } for itspath, values in sigs.items(): - if 'conf@' in itspath: + if 'conf-' in itspath: reqsigvalues = reqsigvalues_config else: reqsigvalues = reqsigvalues_image @@ -210,9 +210,9 @@ UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'" 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) + 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) @@ -231,3 +231,135 @@ UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'" 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') + def test_initramfs_bundle(self): + """ + Summary: Verifies the content of the initramfs bundle node in the FIT Image Tree Source (its) + The FIT settings are set by the test case. + The machine used is beaglebone-yocto. + Expected: 1. The ITS is generated with initramfs bundle support + 2. All the fields in the kernel node are as expected (matching the + conf settings) + 3. The kernel is included in all the available configurations and + its hash is included in the configuration signature + + Product: oe-core + Author: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> + """ + + config = """ +DISTRO="poky" +MACHINE = "beaglebone-yocto" +INITRAMFS_IMAGE_BUNDLE = "1" +INITRAMFS_IMAGE = "core-image-minimal-initramfs" +INITRAMFS_SCRIPTS = "" +UBOOT_MACHINE = "am335x_evm_defconfig" +KERNEL_CLASSES = " kernel-fitimage " +KERNEL_IMAGETYPES = "fitImage" +UBOOT_SIGN_ENABLE = "1" +UBOOT_SIGN_KEYNAME = "beaglebonekey" +UBOOT_SIGN_KEYDIR ?= "${DEPLOY_DIR_IMAGE}" +UBOOT_DTB_BINARY = "u-boot.dtb" +UBOOT_ENTRYPOINT = "0x80000000" +UBOOT_LOADADDRESS = "0x80000000" +UBOOT_DTB_LOADADDRESS = "0x82000000" +UBOOT_ARCH = "arm" +UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb -p 2000" +UBOOT_EXTLINUX = "0" +FIT_GENERATE_KEYS = "1" +KERNEL_IMAGETYPE_REPLACEMENT = "zImage" +FIT_HASH_ALG = "sha256" +""" + self.write_config(config) + + # fitImage is created as part of linux recipe + bitbake("virtual/kernel") + + image_type = get_bb_var('INITRAMFS_IMAGE') + 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") + + 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)) + + kernel_load = str(get_bb_var('UBOOT_LOADADDRESS')) + kernel_entry = str(get_bb_var('UBOOT_ENTRYPOINT')) + initramfs_bundle_format = str(get_bb_var('KERNEL_IMAGETYPE_REPLACEMENT')) + uboot_arch = str(get_bb_var('UBOOT_ARCH')) + initramfs_bundle = "arch/" + uboot_arch + "/boot/" + initramfs_bundle_format + ".initramfs" + fit_hash_alg = str(get_bb_var('FIT_HASH_ALG')) + + its_file = open(fitimage_its_path) + + its_lines = [line.strip() for line in its_file.readlines()] + + exp_node_lines = [ + 'kernel-1 {', + 'description = "Linux kernel";', + 'data = /incbin/("' + initramfs_bundle + '");', + 'type = "kernel";', + 'arch = "' + uboot_arch + '";', + 'os = "linux";', + 'compression = "none";', + 'load = <' + kernel_load + '>;', + 'entry = <' + kernel_entry + '>;', + 'hash-1 {', + 'algo = "' + fit_hash_alg +'";', + '};', + '};' + ] + + node_str = exp_node_lines[0] + + test_passed = False + + print ("checking kernel node\n") + + if node_str in its_lines: + node_start_idx = its_lines.index(node_str) + node = its_lines[node_start_idx:(node_start_idx + len(exp_node_lines))] + if node == exp_node_lines: + print("kernel node verified") + else: + self.assertTrue(test_passed == True,"kernel node does not match expectation") + + rx_configs = re.compile("^conf-.*") + its_configs = list(filter(rx_configs.match, its_lines)) + + for cfg_str in its_configs: + cfg_start_idx = its_lines.index(cfg_str) + line_idx = cfg_start_idx + 2 + node_end = False + while node_end == False: + if its_lines[line_idx] == "};" and its_lines[line_idx-1] == "};" : + node_end = True + line_idx = line_idx + 1 + + node = its_lines[cfg_start_idx:line_idx] + print("checking configuration " + cfg_str.rstrip(" {")) + rx_desc_line = re.compile("^description.*1 Linux kernel.*") + if len(list(filter(rx_desc_line.match, node))) != 1: + self.assertTrue(test_passed == True,"kernel keyword not found in the description line") + break + else: + print("kernel keyword found in the description line") + + if 'kernel = "kernel-1";' not in node: + self.assertTrue(test_passed == True,"kernel line not found") + break + else: + print("kernel line found") + + rx_sign_line = re.compile("^sign-images.*kernel.*") + if len(list(filter(rx_sign_line.match, node))) != 1: + self.assertTrue(test_passed == True,"kernel hash not signed") + break + else: + print("kernel hash signed") + + test_passed = True + self.assertTrue(test_passed == True,"Initramfs bundle test success") diff --git a/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py b/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py index 3119520f0..4fc3605f4 100644 --- a/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py +++ b/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py @@ -46,26 +46,25 @@ class oeGoToolchainSelfTest(OESelftestTestCase): shutil.rmtree(cls.tmpdir_SDKQA, ignore_errors=True) super(oeGoToolchainSelfTest, cls).tearDownClass() - def run_sdk_go_command(self, gocmd): - cmd = "cd %s; " % self.tmpdir_SDKQA + def run_sdk_go_command(self, gocmd, proj, name): + cmd = "cd %s/src/%s/%s; " % (self.go_path, proj, name) cmd = cmd + ". %s; " % self.env_SDK cmd = cmd + "export GOPATH=%s; " % self.go_path cmd = cmd + "${CROSS_COMPILE}go %s" % gocmd return runCmd(cmd).status def test_go_dep_build(self): - proj = "github.com/golang" - name = "dep" - ver = "v0.3.1" + proj = "github.com/direnv" + name = "direnv" + ver = "v2.27.0" archive = ".tar.gz" url = "https://%s/%s/archive/%s%s" % (proj, name, ver, archive) runCmd("cd %s; wget %s" % (self.tmpdir_SDKQA, url)) runCmd("cd %s; tar -xf %s" % (self.tmpdir_SDKQA, ver+archive)) runCmd("mkdir -p %s/src/%s" % (self.go_path, proj)) - runCmd("mv %s/dep-0.3.1 %s/src/%s/%s" + runCmd("mv %s/direnv-2.27.0 %s/src/%s/%s" % (self.tmpdir_SDKQA, self.go_path, proj, name)) - retv = self.run_sdk_go_command('build %s/%s/cmd/dep' - % (proj, name)) + retv = self.run_sdk_go_command('build', proj, name) self.assertEqual(retv, 0, msg="Running go build failed for %s" % name) diff --git a/poky/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/poky/meta/lib/oeqa/selftest/cases/incompatible_lic.py index 2a6382a1a..152da6332 100644 --- a/poky/meta/lib/oeqa/selftest/cases/incompatible_lic.py +++ b/poky/meta/lib/oeqa/selftest/cases/incompatible_lic.py @@ -15,66 +15,66 @@ class IncompatibleLicenseTests(OESelftestTestCase): # Verify that a package with an SPDX license (from AVAILABLE_LICENSES) # cannot be built when INCOMPATIBLE_LICENSE contains this SPDX license def test_incompatible_spdx_license(self): - self.lic_test('incompatible-license', 'GPL-3.0', 'GPL-3.0') + self.lic_test('incompatible-license', 'GPL-3.0-only', 'GPL-3.0-only') # Verify that a package with an SPDX license (from AVAILABLE_LICENSES) # cannot be built when INCOMPATIBLE_LICENSE contains an alias (in # SPDXLICENSEMAP) of this SPDX license def test_incompatible_alias_spdx_license(self): - self.lic_test('incompatible-license', 'GPL-3.0', 'GPLv3') + self.lic_test('incompatible-license', 'GPL-3.0-only', 'GPLv3') # Verify that a package with an SPDX license (from AVAILABLE_LICENSES) # cannot be built when INCOMPATIBLE_LICENSE contains a wildcarded license # matching this SPDX license def test_incompatible_spdx_license_wildcard(self): - self.lic_test('incompatible-license', 'GPL-3.0', '*GPL-3.0') + self.lic_test('incompatible-license', 'GPL-3.0-only', '*GPL-3.0-only') # Verify that a package with an SPDX license (from AVAILABLE_LICENSES) # cannot be built when INCOMPATIBLE_LICENSE contains a wildcarded alias # license matching this SPDX license def test_incompatible_alias_spdx_license_wildcard(self): - self.lic_test('incompatible-license', 'GPL-3.0', '*GPLv3') + self.lic_test('incompatible-license', 'GPL-3.0-only', '*GPLv3') # Verify that a package with an alias (from SPDXLICENSEMAP) to an SPDX # license cannot be built when INCOMPATIBLE_LICENSE contains this SPDX # license def test_incompatible_spdx_license_alias(self): - self.lic_test('incompatible-license-alias', 'GPL-3.0', 'GPL-3.0') + self.lic_test('incompatible-license-alias', 'GPL-3.0-only', 'GPL-3.0-only') # Verify that a package with an alias (from SPDXLICENSEMAP) to an SPDX # license cannot be built when INCOMPATIBLE_LICENSE contains this alias def test_incompatible_alias_spdx_license_alias(self): - self.lic_test('incompatible-license-alias', 'GPL-3.0', 'GPLv3') + self.lic_test('incompatible-license-alias', 'GPL-3.0-only', 'GPLv3') # Verify that a package with an alias (from SPDXLICENSEMAP) to an SPDX # license cannot be built when INCOMPATIBLE_LICENSE contains a wildcarded # license matching this SPDX license def test_incompatible_spdx_license_alias_wildcard(self): - self.lic_test('incompatible-license-alias', 'GPL-3.0', '*GPL-3.0') + self.lic_test('incompatible-license-alias', 'GPL-3.0-only', '*GPL-3.0') # Verify that a package with an alias (from SPDXLICENSEMAP) to an SPDX # license cannot be built when INCOMPATIBLE_LICENSE contains a wildcarded # alias license matching the SPDX license def test_incompatible_alias_spdx_license_alias_wildcard(self): - self.lic_test('incompatible-license-alias', 'GPL-3.0', '*GPLv3') + self.lic_test('incompatible-license-alias', 'GPL-3.0-only', '*GPLv3') # Verify that a package with multiple SPDX licenses (from # AVAILABLE_LICENSES) cannot be built when INCOMPATIBLE_LICENSE contains # some of them def test_incompatible_spdx_licenses(self): - self.lic_test('incompatible-licenses', 'GPL-3.0 LGPL-3.0', 'GPL-3.0 LGPL-3.0') + self.lic_test('incompatible-licenses', 'GPL-3.0-only LGPL-3.0-only', 'GPL-3.0-only LGPL-3.0-only') # Verify that a package with multiple SPDX licenses (from # AVAILABLE_LICENSES) cannot be built when INCOMPATIBLE_LICENSE contains a # wildcard to some of them def test_incompatible_spdx_licenses_wildcard(self): - self.lic_test('incompatible-licenses', 'GPL-3.0 LGPL-3.0', '*GPL-3.0') + self.lic_test('incompatible-licenses', 'GPL-3.0-only LGPL-3.0-only', '*GPL-3.0-only') # Verify that a package with multiple SPDX licenses (from # AVAILABLE_LICENSES) cannot be built when INCOMPATIBLE_LICENSE contains a # wildcard matching all licenses def test_incompatible_all_licenses_wildcard(self): - self.lic_test('incompatible-licenses', 'GPL-2.0 GPL-3.0 LGPL-3.0', '*') + self.lic_test('incompatible-licenses', 'GPL-2.0-only GPL-3.0-only LGPL-3.0-only', '*') # Verify that a package with a non-SPDX license (neither in # AVAILABLE_LICENSES nor in SPDXLICENSEMAP) cannot be built when @@ -91,7 +91,7 @@ INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0" def test_bash_default(self): self.write_config(self.default_config()) - error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0+" + error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0-or-later" result = bitbake('core-image-minimal', ignore_status=True) if error_msg not in result.output: @@ -99,7 +99,7 @@ INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0" def test_bash_and_license(self): self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " & SomeLicense"') - error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0+" + error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0-or-later" result = bitbake('core-image-minimal', ignore_status=True) if error_msg not in result.output: diff --git a/poky/meta/lib/oeqa/selftest/cases/oescripts.py b/poky/meta/lib/oeqa/selftest/cases/oescripts.py index 726daff7c..8a10ff357 100644 --- a/poky/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/poky/meta/lib/oeqa/selftest/cases/oescripts.py @@ -167,7 +167,7 @@ class OEListPackageconfigTests(OEScriptTests): def test_packageconfig_flags_option_all(self): results = runCmd('%s/contrib/list-packageconfig-flags.py -a' % self.scripts_dir) expected_endlines = [] - expected_endlines.append("pinentry-1.1.0") + expected_endlines.append("pinentry-1.1.1") expected_endlines.append("PACKAGECONFIG ncurses libcap") expected_endlines.append("PACKAGECONFIG[qt] --enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase") expected_endlines.append("PACKAGECONFIG[gtk2] --enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0") diff --git a/poky/meta/lib/oeqa/selftest/cases/reproducible.py b/poky/meta/lib/oeqa/selftest/cases/reproducible.py index eee494e5c..0d0259477 100644 --- a/poky/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/poky/meta/lib/oeqa/selftest/cases/reproducible.py @@ -24,64 +24,28 @@ import datetime # 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/) + +# ruby-ri-docs, meson: +#https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20210215-0_td9la2/packages/diff-html/ 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', + 'go-', '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' + 'ruby-ri-docs' ] def is_excluded(package): package_name = os.path.basename(package) for i in exclude_packages: if package_name.startswith(i): - return True - return False + return i + return None MISSING = 'MISSING' DIFFERENT = 'DIFFERENT' @@ -107,14 +71,17 @@ class PackageCompareResults(object): self.different = [] self.different_excluded = [] self.same = [] + self.active_exclusions = set() def add_result(self, r): self.total.append(r) if r.status == MISSING: self.missing.append(r) elif r.status == DIFFERENT: - if is_excluded(r.reference): + exclusion = is_excluded(r.reference) + if exclusion: self.different_excluded.append(r) + self.active_exclusions.add(exclusion) else: self.different.append(r) else: @@ -128,7 +95,10 @@ class PackageCompareResults(object): self.same.sort() def __str__(self): - 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)) + return 'same=%i different=%i different_excluded=%i missing=%i total=%i\nunused_exclusions=%s' % (len(self.same), len(self.different), len(self.different_excluded), len(self.missing), len(self.total), self.unused_exclusions()) + + def unused_exclusions(self): + return sorted(set(exclude_packages) - self.active_exclusions) def compare_file(reference, test, diffutils_sysroot): result = CompareResult() @@ -139,7 +109,7 @@ def compare_file(reference, test, diffutils_sysroot): result.status = MISSING return result - r = runCmd(['cmp', '--quiet', reference, test], native_sysroot=diffutils_sysroot, ignore_status=True) + r = runCmd(['cmp', '--quiet', reference, test], native_sysroot=diffutils_sysroot, ignore_status=True, sync=False) if r.status: result.status = DIFFERENT @@ -175,8 +145,14 @@ class DiffoscopeTests(OESelftestTestCase): self.assertTrue(os.path.exists(os.path.join(tmpdir, 'index.html')), "HTML index not found!") class ReproducibleTests(OESelftestTestCase): - package_classes = ['deb', 'ipk'] - images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline', 'world'] + # Test the reproducibility of whatever is built between sstate_targets and targets + + package_classes = ['deb', 'ipk', 'rpm'] + + # targets are the things we want to test the reproducibility of + targets = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline', 'core-image-weston', 'world'] + # sstate targets are things to pull from sstate to potentially cut build/debugging time + sstate_targets = [] save_results = False if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ: save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT'] @@ -257,16 +233,23 @@ class ReproducibleTests(OESelftestTestCase): tmpdir=tmpdir) if not use_sstate: + if self.sstate_targets: + self.logger.info("Building prebuild for %s (sstate allowed)..." % (name)) + self.write_config(config) + bitbake(' '.join(self.sstate_targets)) + # This config fragment will disable using shared and the sstate # mirror, forcing a complete build from scratch config += textwrap.dedent('''\ SSTATE_DIR = "${TMPDIR}/sstate" - SSTATE_MIRROR = "" + SSTATE_MIRRORS = "" ''') + self.logger.info("Building %s (sstate%s allowed)..." % (name, '' if use_sstate else ' NOT')) self.write_config(config) d = get_bb_vars(capture_vars) - bitbake(' '.join(self.images)) + # targets used to be called images + bitbake(' '.join(getattr(self, 'images', self.targets))) return d def test_reproducible_builds(self): @@ -290,6 +273,7 @@ class ReproducibleTests(OESelftestTestCase): self.logger.info('Non-reproducible packages will be copied to %s', save_dir) vars_A = self.do_test_build('reproducibleA', self.build_from_sstate) + vars_B = self.do_test_build('reproducibleB', False) # NOTE: The temp directories from the reproducible build are purposely @@ -304,6 +288,7 @@ class ReproducibleTests(OESelftestTestCase): deploy_A = vars_A['DEPLOY_DIR_' + c.upper()] deploy_B = vars_B['DEPLOY_DIR_' + c.upper()] + self.logger.info('Checking %s packages for differences...' % c) result = self.compare_packages(deploy_A, deploy_B, diffutils_sysroot) self.logger.info('Reproducibility summary for %s: %s' % (c, result)) diff --git a/poky/meta/lib/oeqa/selftest/cases/runtime_test.py b/poky/meta/lib/oeqa/selftest/cases/runtime_test.py index 7189e4e6c..b20c5b427 100644 --- a/poky/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/poky/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -276,7 +276,7 @@ class Postinst(OESelftestTestCase): # run_serial()'s status code is useless.' for filename in ("rootfs", "delayed-a", "delayed-b"): status, output = qemu.run_serial("test -f %s && echo found" % os.path.join(targettestdir, filename)) - self.assertEqual(output, "found", "%s was not present on boot" % filename) + self.assertIn("found", output, "%s was not present on boot" % filename) diff --git a/poky/meta/lib/oeqa/selftest/cases/tinfoil.py b/poky/meta/lib/oeqa/selftest/cases/tinfoil.py index 206168ed0..a51c6048d 100644 --- a/poky/meta/lib/oeqa/selftest/cases/tinfoil.py +++ b/poky/meta/lib/oeqa/selftest/cases/tinfoil.py @@ -100,9 +100,11 @@ class TinfoilTests(OESelftestTestCase): eventreceived = False commandcomplete = False start = time.time() - # Wait for 10s in total so we'd detect spurious heartbeat events for example + # Wait for maximum 60s in total so we'd detect spurious heartbeat events for example # The test is IO load sensitive too - while time.time() - start < 10: + while (not (eventreceived == True and commandcomplete == True) + and (time.time() - start < 60)): + # if we received both events (on let's say a good day), we are done event = tinfoil.wait_event(1) if event: if isinstance(event, bb.command.CommandCompleted): diff --git a/poky/meta/lib/oeqa/selftest/cases/wic.py b/poky/meta/lib/oeqa/selftest/cases/wic.py index 091f0ab47..2bf5cb9a8 100644 --- a/poky/meta/lib/oeqa/selftest/cases/wic.py +++ b/poky/meta/lib/oeqa/selftest/cases/wic.py @@ -318,6 +318,7 @@ class Wic(WicTestCase): "--image-name=core-image-minimal " "-D -o %s" % self.resultdir) self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) + self.assertEqual(1, len(glob(self.resultdir + "tmp.wic*"))) def test_debug_long(self): """Test --debug option""" @@ -325,6 +326,7 @@ class Wic(WicTestCase): "--image-name=core-image-minimal " "--debug -o %s" % self.resultdir) self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) + self.assertEqual(1, len(glob(self.resultdir + "tmp.wic*"))) def test_skip_build_check_short(self): """Test -s option""" @@ -588,6 +590,9 @@ part / --source rootfs --fstype=ext4 --include-path %s --include-path core-imag def test_permissions(self): """Test permissions are respected""" + # prepare wicenv and rootfs + bitbake('core-image-minimal core-image-minimal-mtdutils -c do_rootfs_wicenv') + oldpath = os.environ['PATH'] os.environ['PATH'] = get_bb_var("PATH", "wic-tools") @@ -621,6 +626,19 @@ part /etc --source rootfs --fstype=ext4 --change-directory=etc res = runCmd("debugfs -R 'ls -p' %s 2>/dev/null" % (part)) self.assertEqual(True, files_own_by_root(res.output)) + config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "%s"\n' % wks_file + self.append_config(config) + bitbake('core-image-minimal') + tmpdir = os.path.join(get_bb_var('WORKDIR', 'core-image-minimal'),'build-wic') + + # check each partition for permission + for part in glob(os.path.join(tmpdir, 'temp-*.direct.p*')): + res = runCmd("debugfs -R 'ls -p' %s 2>/dev/null" % (part)) + self.assertTrue(files_own_by_root(res.output) + ,msg='Files permission incorrect using wks set "%s"' % test) + + # clean config and result directory for next cases + self.remove_config(config) rmtree(self.resultdir, ignore_errors=True) finally: diff --git a/poky/meta/lib/oeqa/utils/__init__.py b/poky/meta/lib/oeqa/utils/__init__.py index 70fbe7b55..6d1ec4cb9 100644 --- a/poky/meta/lib/oeqa/utils/__init__.py +++ b/poky/meta/lib/oeqa/utils/__init__.py @@ -43,28 +43,12 @@ def make_logger_bitbake_compatible(logger): import logging """ - Bitbake logger redifines debug() in order to - set a level within debug, this breaks compatibility - with vainilla logging, so we neeed to redifine debug() - method again also add info() method with INFO + 1 level. + We need to raise the log level of the info output so unittest + messages are visible on the console. """ - def _bitbake_log_debug(*args, **kwargs): - lvl = logging.DEBUG - - if isinstance(args[0], int): - lvl = args[0] - msg = args[1] - args = args[2:] - else: - msg = args[0] - args = args[1:] - - logger.log(lvl, msg, *args, **kwargs) - def _bitbake_log_info(msg, *args, **kwargs): logger.log(logging.INFO + 1, msg, *args, **kwargs) - logger.debug = _bitbake_log_debug logger.info = _bitbake_log_info return logger diff --git a/poky/meta/lib/oeqa/utils/package_manager.py b/poky/meta/lib/oeqa/utils/package_manager.py index 362329929..6b67f22fd 100644 --- a/poky/meta/lib/oeqa/utils/package_manager.py +++ b/poky/meta/lib/oeqa/utils/package_manager.py @@ -117,7 +117,7 @@ def extract_packages(d, needed_packages): extract = package.get('extract', True) if extract: - #logger.debug(1, 'Extracting %s' % pkg) + #logger.debug('Extracting %s' % pkg) dst_dir = os.path.join(extracted_path, pkg) # Same package used for more than one test, # don't need to extract again. @@ -130,7 +130,7 @@ def extract_packages(d, needed_packages): shutil.rmtree(pkg_dir) else: - #logger.debug(1, 'Copying %s' % pkg) + #logger.debug('Copying %s' % pkg) _copy_package(d, pkg) def _extract_in_tmpdir(d, pkg): diff --git a/poky/meta/recipes-bsp/efivar/efivar/determinism.patch b/poky/meta/recipes-bsp/efivar/efivar/determinism.patch new file mode 100644 index 000000000..bdf6bfc4a --- /dev/null +++ b/poky/meta/recipes-bsp/efivar/efivar/determinism.patch @@ -0,0 +1,18 @@ +Fix reproducibility issue caused by unsorted wildcard expansion. + +Upstream-Status: Pending +RP 2021/3/1 + +Index: git/src/Makefile +=================================================================== +--- git.orig/src/Makefile ++++ git/src/Makefile +@@ -15,7 +15,7 @@ TARGETS=$(LIBTARGETS) $(BINTARGETS) $(PC + STATICTARGETS=$(STATICLIBTARGETS) $(STATICBINTARGETS) + + LIBEFIBOOT_SOURCES = crc32.c creator.c disk.c gpt.c loadopt.c path-helpers.c \ +- linux.c $(wildcard linux-*.c) ++ linux.c $(sort $(wildcard linux-*.c)) + LIBEFIBOOT_OBJECTS = $(patsubst %.c,%.o,$(LIBEFIBOOT_SOURCES)) + LIBEFIVAR_SOURCES = dp.c dp-acpi.c dp-hw.c dp-media.c dp-message.c \ + efivarfs.c error.c export.c guid.c guids.S guid-symbols.c \ diff --git a/poky/meta/recipes-bsp/efivar/efivar_37.bb b/poky/meta/recipes-bsp/efivar/efivar_37.bb index 9b95721a4..5bf121ff6 100644 --- a/poky/meta/recipes-bsp/efivar/efivar_37.bb +++ b/poky/meta/recipes-bsp/efivar/efivar_37.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" SRC_URI = "git://github.com/rhinstaller/efivar.git \ + file://determinism.patch \ file://no-werror.patch" SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10" diff --git a/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.12.bb b/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.12.bb index 7888aba0f..d27126603 100644 --- a/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.12.bb +++ b/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.12.bb @@ -1,5 +1,6 @@ SUMMARY = "Libraries for producing EFI binaries" HOMEPAGE = "http://sourceforge.net/projects/gnu-efi/" +DESCRIPTION = "GNU-EFI aims to Develop EFI applications for ARM-64, ARM-32, x86_64, IA-64 (IPF), IA-32 (x86), and MIPS platforms using the GNU toolchain and the EFI development environment." SECTION = "devel" LICENSE = "GPLv2+ | BSD-2-Clause" LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582764a4776e60c95bf9ab617343d36 \ diff --git a/poky/meta/recipes-bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch b/poky/meta/recipes-bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch new file mode 100644 index 000000000..8aa209144 --- /dev/null +++ b/poky/meta/recipes-bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch @@ -0,0 +1,47 @@ +From 6643507ce30f775008e093580f0c9499dfb2c485 Mon Sep 17 00:00:00 2001 +From: Simon Hardy <simon.hardy@itdev.co.uk> +Date: Tue, 24 Mar 2020 13:29:12 +0000 +Subject: build: Fix GRUB i386-pc build with Ubuntu gcc + +With recent versions of gcc on Ubuntu a very large lzma_decompress.img file is +output. (e.g. 134479600 bytes instead of 2864.) This causes grub-mkimage to +fail with: "error: Decompressor is too big." + +This seems to be caused by a section .note.gnu.property that is placed at an +offset such that objcopy needs to pad the img file with zeros. + +This issue is present on: +Ubuntu 19.10 with gcc (Ubuntu 8.3.0-26ubuntu1~19.10) 8.3.0 +Ubuntu 19.10 with gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008 + +This issue is not present on: +Ubuntu 19.10 with gcc (Ubuntu 7.5.0-3ubuntu1~19.10) 7.5.0 +RHEL 8.0 with gcc 8.3.1 20190507 (Red Hat 8.3.1-4) + +The issue can be fixed by removing the section using objcopy as shown in +this patch. + +Signed-off-by: Simon Hardy <simon.hardy@itdev.co.uk> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> +--- + gentpl.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Upstream-Status: Backport + +diff --git a/gentpl.py b/gentpl.py +index 387588c05..c86550d4f 100644 +--- a/gentpl.py ++++ b/gentpl.py +@@ -766,7 +766,7 @@ def image(defn, platform): + if test x$(TARGET_APPLE_LINKER) = x1; then \ + $(MACHO2IMG) $< $@; \ + else \ +- $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; \ ++ $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \ + fi + """) + +-- +cgit v1.2.1 + diff --git a/poky/meta/recipes-bsp/grub/grub-efi_2.04.bb b/poky/meta/recipes-bsp/grub/grub-efi_2.04.bb index f80afd95c..287845c50 100644 --- a/poky/meta/recipes-bsp/grub/grub-efi_2.04.bb +++ b/poky/meta/recipes-bsp/grub/grub-efi_2.04.bb @@ -70,10 +70,6 @@ do_install() { install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${D}${EFI_FILES_PATH}/${GRUB_IMAGE} } -do_install_append_aarch64() { - rm -rf ${D}/${prefix}/ -} - GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \ efi_gop iso9660 configfile search loadenv test" @@ -88,8 +84,6 @@ FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ ${EFI_FILES_PATH}/${GRUB_IMAGE} \ " -FILES_${PN}_remove_aarch64 = "${libdir}/grub/${GRUB_TARGET}-efi" - # 64-bit binaries are expected for the bootloader with an x32 userland INSANE_SKIP_${PN}_append_linux-gnux32 = " arch" INSANE_SKIP_${PN}-dbg_append_linux-gnux32 = " arch" diff --git a/poky/meta/recipes-bsp/grub/grub2.inc b/poky/meta/recipes-bsp/grub/grub2.inc index 49c869b5d..f870d41f6 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://6643507ce30f775008e093580f0c9499dfb2c485.patch \ file://determinism.patch \ " SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" diff --git a/poky/meta/recipes-bsp/grub/grub_2.04.bb b/poky/meta/recipes-bsp/grub/grub_2.04.bb index f2942b9e3..d4e09faa4 100644 --- a/poky/meta/recipes-bsp/grub/grub_2.04.bb +++ b/poky/meta/recipes-bsp/grub/grub_2.04.bb @@ -16,12 +16,15 @@ FILES_${PN}-common = " \ ${sbindir} \ ${datadir}/grub \ " - -FILES_${PN}-common_append_aarch64 = " \ - ${libdir}/${BPN} \ -" +ALLOW_EMPTY_${PN} = "1" do_install_append () { + # Avoid conflicts with the EFI package for systems such as arm64 where we + # need to build grub and grub-efi but only EFI is supported by removing EFI + # from this package. + rm -rf ${D}${libdir}/grub/*-efi/ + rmdir --ignore-fail-on-non-empty ${D}${libdir}/grub ${D}${libdir} + install -d ${D}${sysconfdir}/grub.d # Remove build host references... find "${D}" -name modinfo.sh -type f -exec \ diff --git a/poky/meta/recipes-bsp/opensbi/opensbi_0.8.bb b/poky/meta/recipes-bsp/opensbi/opensbi_0.9.bb index 818efac73..cb1c3f2eb 100644 --- a/poky/meta/recipes-bsp/opensbi/opensbi_0.8.bb +++ b/poky/meta/recipes-bsp/opensbi/opensbi_0.9.bb @@ -1,5 +1,6 @@ SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)" DESCRIPTION = "OpenSBI aims to provide an open-source and extensible implementation of the RISC-V SBI specification for a platform specific firmware (M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or System-on-Chip vendors to fit a particular hadware configuration." +HOMEPAGE = "https://github.com/riscv/opensbi" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5" @@ -7,7 +8,7 @@ require opensbi-payloads.inc inherit autotools-brokensep deploy -SRCREV = "a98258d0b537a295f517bbc8d813007336731fa9" +SRCREV = "234ed8e427f4d92903123199f6590d144e0d9351" SRC_URI = "git://github.com/riscv/opensbi.git;branch=master \ file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ " diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc index cbce408a2..5a8035f43 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -12,7 +12,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "050acee119b3757fee3bd128f55d720fdd9bb890" +SRCREV = "c4fddedc48f336eabc4ce3f74940e6aa372de18c" SRC_URI = "git://git.denx.de/u-boot.git \ " diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.10.bb b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.01.bb index ef386f76e..ef386f76e 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.10.bb +++ b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.01.bb diff --git a/poky/meta/recipes-bsp/u-boot/u-boot_2020.10.bb b/poky/meta/recipes-bsp/u-boot/u-boot_2020.10.bb deleted file mode 100644 index 4f5b3e5df..000000000 --- a/poky/meta/recipes-bsp/u-boot/u-boot_2020.10.bb +++ /dev/null @@ -1,5 +0,0 @@ -require u-boot-common.inc -require u-boot.inc - -DEPENDS += "bc-native dtc-native" - diff --git a/poky/meta/recipes-bsp/u-boot/u-boot_2021.01.bb b/poky/meta/recipes-bsp/u-boot/u-boot_2021.01.bb new file mode 100644 index 000000000..2eef1e900 --- /dev/null +++ b/poky/meta/recipes-bsp/u-boot/u-boot_2021.01.bb @@ -0,0 +1,4 @@ +require u-boot-common.inc +require u-boot.inc + +DEPENDS += "bc-native dtc-native python3-setuptools-native" diff --git a/poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb b/poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb index a8df80fdd..e614de0c4 100644 --- a/poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb +++ b/poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb @@ -1,5 +1,6 @@ SUMMARY = "User support binary for the uvesafb kernel module" HOMEPAGE = "https://tracker.debian.org/pkg/v86d" +DESCRIPTION = "v86d provides a backend for kernel drivers that need to execute x86 BIOS code. The code is executed in a controlled environment and the results are passed back to the kernel via the netlink interface." # the copyright info is at the bottom of README, expect break LICENSE = "GPLv2" 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.11/0001-avoid-start-failure-with-bind-user.patch index 8db96ec04..8db96ec04 100644 --- 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.11/0001-avoid-start-failure-with-bind-user.patch 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.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch index 5bcc16c9b..5bcc16c9b 100644 --- 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.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch 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.11/bind-ensure-searching-for-json-headers-searches-sysr.patch index f9cdc7ca4..f9cdc7ca4 100644 --- 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.11/bind-ensure-searching-for-json-headers-searches-sysr.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.10/bind9 b/poky/meta/recipes-connectivity/bind/bind-9.16.11/bind9 index 968679ff7..968679ff7 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.10/bind9 +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.11/bind9 diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.10/conf.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.11/conf.patch index aad345f9f..aad345f9f 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.10/conf.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.11/conf.patch 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.11/generate-rndc-key.sh index 633e29c0e..633e29c0e 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.10/generate-rndc-key.sh +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.11/generate-rndc-key.sh 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.11/init.d-add-support-for-read-only-rootfs.patch index 11db95ede..11db95ede 100644 --- 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.11/init.d-add-support-for-read-only-rootfs.patch 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.11/make-etc-initd-bind-stop-work.patch index 146f3e35d..146f3e35d 100644 --- 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.11/make-etc-initd-bind-stop-work.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.10/named.service b/poky/meta/recipes-connectivity/bind/bind-9.16.11/named.service index cda56ef01..cda56ef01 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.10/named.service +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.11/named.service diff --git a/poky/meta/recipes-connectivity/bind/bind_9.16.10.bb b/poky/meta/recipes-connectivity/bind/bind_9.16.11.bb index 71194a61b..f48cc74c2 100644 --- a/poky/meta/recipes-connectivity/bind/bind_9.16.10.bb +++ b/poky/meta/recipes-connectivity/bind/bind_9.16.11.bb @@ -1,9 +1,10 @@ SUMMARY = "ISC Internet Domain Name Server" HOMEPAGE = "https://www.isc.org/bind/" +DESCRIPTION = "BIND 9 provides a full-featured Domain Name Server system" SECTION = "console/network" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4673dc07337cace3b93c65e9ffe57b60" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ef10b4de6371115dcecdc38ca2af4561" DEPENDS = "openssl libcap zlib libuv" @@ -19,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "bc47fc019c6205e6a6bfb839c544a1472321df0537ba905b846a4cbffe3362b3" +SRC_URI[sha256sum] = "0111f64dd7d8f515cfa129e181cce96ff82070d1b27f11a21f6856110d0699c1" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.16 follow the ESV versions divisible by 4 diff --git a/poky/meta/recipes-connectivity/bluez5/bluez5.inc b/poky/meta/recipes-connectivity/bluez5/bluez5.inc index 4c1156c67..a7b628ce1 100644 --- a/poky/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/poky/meta/recipes-connectivity/bluez5/bluez5.inc @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ - file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e" + file://src/main.c;beginline=1;endline=24;md5=0ad83ca0dc37ab08af448777c581e7ac" DEPENDS = "dbus glib-2.0" PROVIDES += "bluez-hcidump" RPROVIDES_${PN} += "bluez-hcidump" diff --git a/poky/meta/recipes-connectivity/bluez5/bluez5_5.55.bb b/poky/meta/recipes-connectivity/bluez5/bluez5_5.56.bb index 819092456..676cb2dbb 100644 --- a/poky/meta/recipes-connectivity/bluez5/bluez5_5.55.bb +++ b/poky/meta/recipes-connectivity/bluez5/bluez5_5.56.bb @@ -1,7 +1,7 @@ require bluez5.inc -SRC_URI[md5sum] = "94972b8bc7ade60c72b0ffa6ccff2c0a" -SRC_URI[sha256sum] = "8863717113c4897e2ad3271fc808ea245319e6fd95eed2e934fae8e0894e9b88" +SRC_URI[md5sum] = "e6c51b2aefa7c56ff072819a78611fa5" +SRC_URI[sha256sum] = "59c4dba9fc8aae2a6a5f8f12f19bc1b0c2dc27355c7ca3123eed3fe6bd7d0b9d" # noinst programs in Makefile.tools that are conditional on READLINE # support diff --git a/poky/meta/recipes-connectivity/connman/connman-conf.bb b/poky/meta/recipes-connectivity/connman/connman-conf.bb index 9a519ec86..85fee0925 100644 --- a/poky/meta/recipes-connectivity/connman/connman-conf.bb +++ b/poky/meta/recipes-connectivity/connman/connman-conf.bb @@ -2,7 +2,7 @@ SUMMARY = "Connman config to setup wired interface on qemu machines" DESCRIPTION = "This is the ConnMan configuration to set up a Wired \ network interface for a qemu machine." LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" inherit systemd diff --git a/poky/meta/recipes-connectivity/connman/connman_1.38.bb b/poky/meta/recipes-connectivity/connman/connman_1.39.bb index 027c41e9a..df42e9ffb 100644 --- a/poky/meta/recipes-connectivity/connman/connman_1.38.bb +++ b/poky/meta/recipes-connectivity/connman/connman_1.39.bb @@ -9,8 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch" -SRC_URI[md5sum] = "1ed8745354c7254bdfd4def54833ee94" -SRC_URI[sha256sum] = "cb30aca97c2f79ccaed8802aa2909ac5100a3969de74c0af8a9d73b85fc4932b" +SRC_URI[sha256sum] = "9f62a7169b7491c670a1ff2e335b0d966308fb2f62e285c781105eb90f181af3" RRECOMMENDS_${PN} = "connman-conf" RCONFLICTS_${PN} = "networkmanager" diff --git a/poky/meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch b/poky/meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch deleted file mode 100644 index d4764f586..000000000 --- a/poky/meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Pending - -Subject: rcp: fix to work with large files - -When we copy file by rcp command, if the file > 2GB, it will fail. -The cause is that it used incorrect data type on file size in sink() of rcp. - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - src/rcp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/rcp.c b/src/rcp.c -index 21f55b6..bafa35f 100644 ---- a/src/rcp.c -+++ b/src/rcp.c -@@ -876,9 +876,9 @@ sink (int argc, char *argv[]) - enum - { YES, NO, DISPLAYED } wrerr; - BUF *bp; -- off_t i, j; -+ off_t i, j, size; - int amt, count, exists, first, mask, mode, ofd, omode; -- int setimes, size, targisdir, wrerrno; -+ int setimes, targisdir, wrerrno; - char ch, *cp, *np, *targ, *vect[1], buf[BUFSIZ]; - const char *why; - --- -1.9.1 - diff --git a/poky/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch b/poky/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch index 24c134fca..603d2baf9 100644 --- a/poky/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch +++ b/poky/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch @@ -1,17 +1,22 @@ -Upstream: http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html +From c7c27ba763c613f83c1561e56448b49315c271c5 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Wed, 6 Mar 2019 09:36:11 -0500 +Subject: [PATCH] Upstream: + http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html Upstream-Status: Pending Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + --- ping/ping_common.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ping/ping_common.h b/ping/ping_common.h -index 1dfd1b5..3bfbd12 100644 +index 65e3e60..3e84db0 100644 --- a/ping/ping_common.h +++ b/ping/ping_common.h -@@ -17,10 +17,14 @@ +@@ -18,10 +18,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see `http://www.gnu.org/licenses/'. */ @@ -26,7 +31,7 @@ index 1dfd1b5..3bfbd12 100644 #include <icmp.h> #include <error.h> #include <progname.h> -@@ -62,7 +66,12 @@ struct ping_stat +@@ -63,7 +67,12 @@ struct ping_stat want to follow the traditional behaviour of ping. */ #define DEFAULT_PING_COUNT 0 @@ -39,9 +44,9 @@ index 1dfd1b5..3bfbd12 100644 #define PING_TIMING(s) ((s) >= sizeof (struct timeval)) #define PING_DATALEN (64 - PING_HEADER_LEN) /* default data length */ -@@ -74,13 +83,20 @@ struct ping_stat - (t).tv_usec = ((i)%PING_PRECISION)*(1000000/PING_PRECISION) ;\ - } while (0) +@@ -78,13 +87,20 @@ struct ping_stat + + #define PING_MIN_USER_INTERVAL (200000/PING_PRECISION) +#ifdef HAVE_IPV6 /* FIXME: Adjust IPv6 case for options and their consumption. */ @@ -60,7 +65,7 @@ index 1dfd1b5..3bfbd12 100644 typedef int (*ping_efp) (int code, void *closure, -@@ -89,13 +105,17 @@ typedef int (*ping_efp) (int code, +@@ -93,13 +109,17 @@ typedef int (*ping_efp) (int code, struct ip * ip, icmphdr_t * icmp, int datalen); union event { @@ -78,6 +83,3 @@ index 1dfd1b5..3bfbd12 100644 }; typedef struct ping_data PING; --- -2.8.3 - diff --git a/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch b/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch index 3da4e9f55..2974bd4f9 100644 --- a/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch +++ b/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch @@ -1,20 +1,21 @@ -From 552a7d64ad4a7188a9b7cd89933ae7caf7ebfe90 Mon Sep 17 00:00:00 2001 +From f7f785c21306010b2367572250b2822df5bc7728 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier at gentoo.org> Date: Thu, 18 Nov 2010 16:59:14 -0500 -Subject: [PATCH gnulib] printf-parse: pull in features.h for __GLIBC__ +Subject: [PATCH] printf-parse: pull in features.h for __GLIBC__ Upstream-Status: Pending Signed-off-by: Mike Frysinger <vapier at gentoo.org> + --- - lib/printf-parse.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + lib/printf-parse.h | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/lib/printf-parse.h b/lib/printf-parse.h -index 67a4a2a..3bd6152 100644 +index e7d0f82..d7b4534 100644 --- a/lib/printf-parse.h +++ b/lib/printf-parse.h -@@ -25,6 +25,9 @@ +@@ -28,6 +28,9 @@ #include "printf-args.h" @@ -24,6 +25,3 @@ index 67a4a2a..3bd6152 100644 /* Flags */ #define FLAG_GROUP 1 /* ' flag */ --- -1.7.3.2 - diff --git a/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch b/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch index b13bb9229..1ef7e2107 100644 --- a/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch +++ b/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch @@ -1,8 +1,19 @@ +From 9089c6eafbf5903174dce87b68476e35db80beb9 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Wed, 6 Mar 2019 09:36:11 -0500 +Subject: [PATCH] inetutils: Import version 1.9.4 + Upstream-Status: Pending ---- inetutils-1.8/lib/wchar.in.h -+++ inetutils-1.8/lib/wchar.in.h -@@ -70,6 +70,9 @@ +--- + lib/wchar.in.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/wchar.in.h b/lib/wchar.in.h +index cdda680..043866a 100644 +--- a/lib/wchar.in.h ++++ b/lib/wchar.in.h +@@ -77,6 +77,9 @@ /* The include_next requires a split double-inclusion guard. */ #if @HAVE_WCHAR_H@ # @INCLUDE_NEXT@ @NEXT_WCHAR_H@ diff --git a/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch b/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch index 2592989a9..460ddf983 100644 --- a/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch +++ b/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch @@ -1,4 +1,10 @@ -inetutils: define PATH_PROCNET_DEV if not already defined +From 101130f422dd5c01a1459645d7b2a5b8d19720ab Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Wed, 6 Mar 2019 09:36:11 -0500 +Subject: [PATCH] inetutils: define PATH_PROCNET_DEV if not already defined +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit this prevents the following compilation error : system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function) @@ -9,11 +15,16 @@ this patch comes from : Upstream-Status: Inappropriate [not author] Signed-of-by: Eric Bénard <eric@eukrea.com> + --- -diff -Naur inetutils-1.9.orig/ifconfig/system/linux.c inetutils-1.9/ifconfig/system/linux.c ---- inetutils-1.9.orig/ifconfig/system/linux.c 2012-01-04 16:31:36.000000000 -0500 -+++ inetutils-1.9/ifconfig/system/linux.c 2012-01-04 16:40:53.000000000 -0500 -@@ -49,6 +49,10 @@ + ifconfig/system/linux.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c +index e453b46..4268ca9 100644 +--- a/ifconfig/system/linux.c ++++ b/ifconfig/system/linux.c +@@ -53,6 +53,10 @@ #include "../ifconfig.h" diff --git a/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch b/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch index ff3abd86a..7d5c087c9 100644 --- a/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch +++ b/poky/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch @@ -1,15 +1,24 @@ +From 684e45b34a33186bb17bcee0b01814c549a60bf6 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 6 Mar 2019 09:36:11 -0500 +Subject: [PATCH] inetutils: Import version 1.9.4 + Only check security/pam_appl.h which is provided by package libpam when pam is enabled. Upstream-Status: Pending Signed-off-by: Kai Kang <kai.kang@windriver.com> + --- + configure.ac | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + diff --git a/configure.ac b/configure.ac -index b35e672..e78a751 100644 +index 86136fb..b220319 100644 --- a/configure.ac +++ b/configure.ac -@@ -195,6 +195,19 @@ fi +@@ -183,6 +183,19 @@ AC_SUBST(LIBUTIL) # See if we have libpam.a. Investigate PAM versus Linux-PAM. if test "$with_pam" = yes ; then @@ -29,8 +38,8 @@ index b35e672..e78a751 100644 AC_CHECK_LIB(dl, dlopen, LIBDL=-ldl) AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam) if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then -@@ -587,7 +600,7 @@ AC_HEADER_DIRENT - AC_CHECK_HEADERS([arpa/nameser.h errno.h fcntl.h features.h \ +@@ -620,7 +633,7 @@ AC_HEADER_DIRENT + AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h errno.h fcntl.h features.h \ glob.h memory.h netinet/ether.h netinet/in_systm.h \ netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \ - security/pam_appl.h shadow.h \ diff --git a/poky/meta/recipes-connectivity/inetutils/inetutils/version.patch b/poky/meta/recipes-connectivity/inetutils/inetutils/version.patch deleted file mode 100644 index 532a0e5c0..000000000 --- a/poky/meta/recipes-connectivity/inetutils/inetutils/version.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -remove m4_esyscmd function - -Signed-off-by: Chunrong Guo <b40290@freescale.com> ---- inetutils-1.9.1/configure.ac 2012-01-06 22:05:05.000000000 +0800 -+++ inetutils-1.9.1/configure.ac 2012-11-12 14:01:11.732957019 +0800 -@@ -20,8 +20,7 @@ - - AC_PREREQ(2.59) - --AC_INIT([GNU inetutils], -- m4_esyscmd([build-aux/git-version-gen .tarball-version 's/inetutils-/v/;s/_/./g']), -+AC_INIT([GNU inetutils],[1.9.4], - [bug-inetutils@gnu.org]) - - AC_CONFIG_SRCDIR([src/inetd.c]) diff --git a/poky/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/poky/meta/recipes-connectivity/inetutils/inetutils_2.0.bb index 09a196ad9..a4d05b054 100644 --- a/poky/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb +++ b/poky/meta/recipes-connectivity/inetutils/inetutils_2.0.bb @@ -10,8 +10,7 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7" -SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \ - file://version.patch \ +SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \ file://inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch \ file://inetutils-1.8-0003-wchar.patch \ file://rexec.xinetd.inetutils \ @@ -21,13 +20,9 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \ file://tftpd.xinetd.inetutils \ file://inetutils-1.9-PATH_PROCNET_DEV.patch \ file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \ - file://0001-rcp-fix-to-work-with-large-files.patch \ - file://fix-buffer-fortify-tfpt.patch \ - file://0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch \ " -SRC_URI[md5sum] = "04852c26c47cc8c6b825f2b74f191f52" -SRC_URI[sha256sum] = "be8f75eff936b8e41b112462db51adf689715658a1b09e0d6b05d11ec92cc616" +SRC_URI[md5sum] = "5e1018502cd131ed8e42339f6b5c98aa" inherit autotools gettext update-alternatives texinfo diff --git a/poky/meta/recipes-connectivity/iproute2/iproute2.inc b/poky/meta/recipes-connectivity/iproute2/iproute2.inc index 7a22fe925..6c8eea679 100644 --- a/poky/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/poky/meta/recipes-connectivity/iproute2/iproute2.inc @@ -19,8 +19,9 @@ PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," PACKAGECONFIG[devlink] = ",,libmnl," +PACKAGECONFIG[rdma] = ",,libmnl," -IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}" +IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma', d)}" EXTRA_OEMAKE = "\ CC='${CC}' \ @@ -48,32 +49,39 @@ do_install () { # The .so files in iproute2-tc are modules, not traditional libraries INSANE_SKIP_${PN}-tc = "dev-so" -PACKAGES =+ "\ +IPROUTE2_PACKAGES =+ "\ ${PN}-devlink \ ${PN}-genl \ ${PN}-ifstat \ + ${PN}-ip \ ${PN}-lnstat \ ${PN}-nstat \ ${PN}-rtacct \ ${PN}-ss \ ${PN}-tc \ ${PN}-tipc \ + ${PN}-rdma \ " +PACKAGE_BEFORE_PN = "${IPROUTE2_PACKAGES}" +RDEPENDS_${PN} += "${PN}-ip" + FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ ${base_sbindir}/ctstat \ ${base_sbindir}/rtstat" FILES_${PN}-ifstat = "${base_sbindir}/ifstat" +FILES_${PN}-ip = "${base_sbindir}/ip.${PN} ${sysconfdir}/iproute2" FILES_${PN}-genl = "${base_sbindir}/genl" FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" FILES_${PN}-devlink = "${base_sbindir}/devlink" +FILES_${PN}-rdma = "${base_sbindir}/rdma" -ALTERNATIVE_${PN} = "ip" +ALTERNATIVE_${PN}-ip = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip" ALTERNATIVE_PRIORITY = "100" diff --git a/poky/meta/recipes-connectivity/iproute2/iproute2_5.9.0.bb b/poky/meta/recipes-connectivity/iproute2/iproute2_5.11.0.bb index 0e6a53e6a..e27b42d23 100644 --- a/poky/meta/recipes-connectivity/iproute2/iproute2_5.9.0.bb +++ b/poky/meta/recipes-connectivity/iproute2/iproute2_5.11.0.bb @@ -4,7 +4,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-libc-compat.h-add-musl-workaround.patch \ " -SRC_URI[sha256sum] = "a25dac94bcdcf2f73316c7f812115ea7a5710580bad892b08a83d00c6b33dacf" +SRC_URI[sha256sum] = "c5e2ea108212b3445051b35953ec267f9f3469e1d5c67ac034ab559849505c54" # CFLAGS are computed in Makefile and reference CCOPTS # diff --git a/poky/meta/recipes-connectivity/kea/files/0001-ax_cpp11.m4-Include-memory-header.patch b/poky/meta/recipes-connectivity/kea/files/0001-ax_cpp11.m4-Include-memory-header.patch new file mode 100644 index 000000000..4978cae87 --- /dev/null +++ b/poky/meta/recipes-connectivity/kea/files/0001-ax_cpp11.m4-Include-memory-header.patch @@ -0,0 +1,24 @@ +From 5314a4815006e3a42f3ce265d1597db700cdb784 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 Feb 2021 23:14:20 -0800 +Subject: [PATCH] ax_cpp11.m4: Include <memory> header + +This is needed for std::shared_ptr +GCC-11 throws errors if header is not included + +Upstream-Status: Submitted [https://github.com/isc-projects/kea/pull/120] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4macros/ax_cpp11.m4 | 1 + + 1 file changed, 1 insertion(+) + +--- a/m4macros/ax_cpp11.m4 ++++ b/m4macros/ax_cpp11.m4 +@@ -182,6 +182,7 @@ for retry in "none" "--std=c++11" "--std + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include <thread> ++ #include <memory> + std::shared_ptr<std::thread> th;], + [th.reset(new std::thread([[]]() { return; })); + th->join();])], diff --git a/poky/meta/recipes-connectivity/kea/files/0001-include-limits.h.patch b/poky/meta/recipes-connectivity/kea/files/0001-include-limits.h.patch new file mode 100644 index 000000000..3856b3d52 --- /dev/null +++ b/poky/meta/recipes-connectivity/kea/files/0001-include-limits.h.patch @@ -0,0 +1,35 @@ +From 7bca122e15bbe98c7b8da851ef3e1cf9a714afd9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 Feb 2021 23:31:15 -0800 +Subject: [PATCH] include limits.h + +Fixes build with gcc11 +backend_selector.cc:61:35: error: 'numeric_limits' is not a member of 'std' + +Upstream-Status: Submitted [https://github.com/isc-projects/kea/pull/120] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/lib/exceptions/exceptions.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/lib/database/backend_selector.cc ++++ b/src/lib/database/backend_selector.cc +@@ -6,7 +6,7 @@ + + #include <database/backend_selector.h> + #include <exceptions/exceptions.h> +-#include <climits> ++#include <limits> + #include <sstream> + + using namespace isc::data; +--- a/src/lib/dhcpsrv/subnet_id.h ++++ b/src/lib/dhcpsrv/subnet_id.h +@@ -10,6 +10,7 @@ + #include <exceptions/exceptions.h> + #include <stdint.h> + #include <typeinfo> ++#include <limits> + + namespace isc { + namespace dhcp { diff --git a/poky/meta/recipes-connectivity/kea/kea_1.8.2.bb b/poky/meta/recipes-connectivity/kea/kea_1.8.2.bb index 3dc4f6af7..fe10d9062 100644 --- a/poky/meta/recipes-connectivity/kea/kea_1.8.2.bb +++ b/poky/meta/recipes-connectivity/kea/kea_1.8.2.bb @@ -18,6 +18,8 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://fix-multilib-conflict.patch \ file://fix_pid_keactrl.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ + file://0001-ax_cpp11.m4-Include-memory-header.patch \ + file://0001-include-limits.h.patch \ " SRC_URI[sha256sum] = "486ca7abedb9d6fdf8e4344ad8688d1171f2ef0f5506d118988aadeae80a1d39" diff --git a/poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.14.1.bb b/poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.14.1.bb index 5e4460045..9a83898e5 100644 --- a/poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.14.1.bb +++ b/poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.14.1.bb @@ -1,5 +1,6 @@ SUMMARY = "Name Service Switch module for Multicast DNS (zeroconf) name resolution" HOMEPAGE = "https://github.com/lathiat/nss-mdns" +DESCRIPTION = "nss-mdns is a plugin for the GNU Name Service Switch (NSS) functionality of the GNU C Library (glibc) providing host name resolution via Multicast DNS (aka Zeroconf, aka Apple Rendezvous, aka Apple Bonjour), effectively allowing name resolution by common Unix/Linux programs in the ad-hoc mDNS domain .local." SECTION = "libs" LICENSE = "LGPLv2.1+" diff --git a/poky/meta/recipes-connectivity/libpcap/libpcap_1.9.1.bb b/poky/meta/recipes-connectivity/libpcap/libpcap_1.10.0.bb index 35bb5650b..967eabcc1 100644 --- a/poky/meta/recipes-connectivity/libpcap/libpcap_1.9.1.bb +++ b/poky/meta/recipes-connectivity/libpcap/libpcap_1.10.0.bb @@ -12,8 +12,8 @@ DEPENDS = "flex-native bison-native" SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz \ " -SRC_URI[md5sum] = "21af603d9a591c7d96a6457021d84e6c" -SRC_URI[sha256sum] = "635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094" +SRC_URI[md5sum] = "8c12dc19dd7e0d02d2bb6596eb5a71c7" +SRC_URI[sha256sum] = "8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e" inherit autotools binconfig-disabled pkgconfig diff --git a/poky/meta/recipes-connectivity/libuv/libuv_1.40.0.bb b/poky/meta/recipes-connectivity/libuv/libuv_1.41.0.bb index f793db09b..4987331dc 100644 --- a/poky/meta/recipes-connectivity/libuv/libuv_1.40.0.bb +++ b/poky/meta/recipes-connectivity/libuv/libuv_1.41.0.bb @@ -1,10 +1,11 @@ SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" HOMEPAGE = "https://github.com/libuv/libuv" +DESCRIPTION = "libuv is a multi-platform support library with a focus on asynchronous I/O. It was primarily developed for use by Node.js, but it's also used by Luvit, Julia, pyuv, and others." BUGTRACKER = "https://github.com/libuv/libuv/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" -SRCREV = "4e69e333252693bd82d6338d6124f0416538dbfc" +SRCREV = "1dff88e5161cba5c59276d2070d2e304e4dcb242" SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" S = "${WORKDIR}/git" 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 7dccc15e0..f170cf465 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 @@ -1,5 +1,6 @@ SUMMARY = "Mobile Broadband Service Provider Database" HOMEPAGE = "http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" +DESCRIPTION = "Mobile Broadband Service Provider Database stores service provider specific information. When this Database is available the information can be fetched there" SECTION = "network" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04" diff --git a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.2.bb b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.3.bb index c7ac67cf3..d8c6391b3 100644 --- a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.2.bb +++ b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.3.bb @@ -31,7 +31,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ file://clang-warnings.patch \ " -SRC_URI[sha256sum] = "d493b81c9d3ffce5d10af701a63ed2b8a21768c23da4a2eceb4d708aea65d9de" +SRC_URI[sha256sum] = "b54d6d8ea2ee62d64111278301ba4631b7bb19174e7f717a724fe5d463900c80" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. diff --git a/poky/meta/recipes-connectivity/openssh/openssh/0f90440ca70abab947acbd77795e9f130967956c.patch b/poky/meta/recipes-connectivity/openssh/openssh/0f90440ca70abab947acbd77795e9f130967956c.patch new file mode 100644 index 000000000..b88bc18f1 --- /dev/null +++ b/poky/meta/recipes-connectivity/openssh/openssh/0f90440ca70abab947acbd77795e9f130967956c.patch @@ -0,0 +1,28 @@ +From 0f90440ca70abab947acbd77795e9f130967956c Mon Sep 17 00:00:00 2001 +From: Darren Tucker <dtucker@dtucker.net> +Date: Fri, 20 Nov 2020 13:37:54 +1100 +Subject: [PATCH] Add new pselect6_time64 syscall on ARM. + +This is apparently needed on armhfp/armv7hl. bz#3232, patch from +jjelen at redhat.com. +--- + sandbox-seccomp-filter.c | 3 +++ + 1 file changed, 3 insertions(+) + +Upstream-Status: Backport +[fixes issues on 32bit IA and probably other 32 bit platforms too with glibc 2.33] + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index e0768c063..5065ae7ef 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -267,6 +267,9 @@ static const struct sock_filter preauth_insns[] = { + #ifdef __NR_pselect6 + SC_ALLOW(__NR_pselect6), + #endif ++#ifdef __NR_pselect6_time64 ++ SC_ALLOW(__NR_pselect6_time64), ++#endif + #ifdef __NR_read + SC_ALLOW(__NR_read), + #endif diff --git a/poky/meta/recipes-connectivity/openssh/openssh_8.4p1.bb b/poky/meta/recipes-connectivity/openssh/openssh_8.4p1.bb index 688fc8a02..128e2e318 100644 --- a/poky/meta/recipes-connectivity/openssh/openssh_8.4p1.bb +++ b/poky/meta/recipes-connectivity/openssh/openssh_8.4p1.bb @@ -24,6 +24,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ file://sshd_check_keys \ file://add-test-support-for-busybox.patch \ + file://0f90440ca70abab947acbd77795e9f130967956c.patch \ " SRC_URI[sha256sum] = "5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24" diff --git a/poky/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb b/poky/meta/recipes-connectivity/openssl/openssl_1.1.1j.bb index c63ba3c8e..181790e6a 100644 --- a/poky/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb +++ b/poky/meta/recipes-connectivity/openssl/openssl_1.1.1j.bb @@ -23,7 +23,7 @@ SRC_URI_append_class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" +SRC_URI[sha256sum] = "aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf" inherit lib_package multilib_header multilib_script ptest MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" @@ -33,6 +33,8 @@ PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module" +PACKAGECONFIG[no-tls1] = "no-tls1" +PACKAGECONFIG[no-tls1_1] = "no-tls1_1" B = "${WORKDIR}/build" do_configure[cleandirs] = "${B}" @@ -52,6 +54,20 @@ EXTRA_OECONF_class-nativesdk = "--with-rand-seed=os,devrandom" CFLAGS_append_class-native = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" CFLAGS_append_class-nativesdk = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" +# Disable deprecated crypto algorithms +# Retained for compatibilty +# des (curl) +# dh (python-ssl) +# dsa (rpm) +# md4 (cyrus-sasl freeradius hostapd) +# bf (wvstreams postgresql x11vnc crda znc cfengine) +# rc4 (freerdp librtorrent ettercap xrdp transmission pam-ssh-agent-auth php) +# rc2 (mailx) +# psk (qt5) +# srp (libest) +# whirlpool (qca) +DEPRECATED_CRYPTO_FLAGS = "no-ssl no-idea no-rc5 no-md2 no-camellia no-mdc2 no-scrypt no-seed no-siphash no-sm2 no-sm3 no-sm4" + do_configure () { os=${HOST_OS} case $os in @@ -125,7 +141,7 @@ do_configure () { # 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 ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target perl ${B}/configdata.pm --dump } @@ -183,6 +199,10 @@ do_install_ptest () { install -d ${D}${PTEST_PATH}/engines install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines + + # seems to be needed with perl 5.32.1 + install -d ${D}${PTEST_PATH}/util/perl/recipes + cp ${D}${PTEST_PATH}/test/recipes/tconversion.pl ${D}${PTEST_PATH}/util/perl/recipes/ } # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto @@ -216,6 +236,8 @@ BBCLASSEXTEND = "native nativesdk" CVE_PRODUCT = "openssl:openssl" +CVE_VERSION_SUFFIX = "alphabetical" + # 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-dialin/ppp-dialin_0.1.bb b/poky/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb index b5f68951d..b0097aa48 100644 --- a/poky/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +++ b/poky/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb @@ -1,5 +1,6 @@ SUMMARY = "Enables PPP dial-in through a serial connection" SECTION = "console/network" +DESCRIPTION = "PPP dail-in provides a point to point protocol (PPP), so that other computers can dial up to it and access connected networks." DEPENDS = "ppp" RDEPENDS_${PN} = "ppp" PR = "r8" diff --git a/poky/meta/recipes-connectivity/ppp/ppp/makefix.patch b/poky/meta/recipes-connectivity/ppp/ppp/makefix.patch index 9471df32e..fce068cae 100644 --- a/poky/meta/recipes-connectivity/ppp/ppp/makefix.patch +++ b/poky/meta/recipes-connectivity/ppp/ppp/makefix.patch @@ -33,7 +33,7 @@ Index: ppp-2.4.9/pppd/Makefile.linux endif -ifeq ($(shell echo '\#include <crypt.h>' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes) -+CRYPTHEADER = "\#include <utmp.h>" ++CRYPTHEADER = "\#include <crypt.h>" +ifeq ($(shell echo $(CRYPTHEADER) | $(CC) -E - >/dev/null 2>&1 && echo yes),yes) CFLAGS += -DHAVE_CRYPT_H=1 LIBS += -lcrypt diff --git a/poky/meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb b/poky/meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb index 33ee553d1..6df96b699 100644 --- a/poky/meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb +++ b/poky/meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb @@ -11,12 +11,12 @@ AUTHOR = "Thomas Hood" HOMEPAGE = "http://packages.debian.org/resolvconf" RDEPENDS_${PN} = "bash" -SRC_URI = "git://salsa.debian.org/debian/resolvconf.git;protocol=https \ +SRC_URI = "git://salsa.debian.org/debian/resolvconf.git;protocol=https;branch=unstable \ file://fix-path-for-busybox.patch \ file://99_resolvconf \ - " + " -SRCREV = "d001dd2b7ce4c854eaa29e46b9640ab66c6e70bb" +SRCREV = "1dda36d8465e335c60190c41e7185d782da1bd7b" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-connectivity/socat/socat_1.7.3.4.bb b/poky/meta/recipes-connectivity/socat/socat_1.7.4.1.bb index f3f569d26..5a13af91b 100644 --- a/poky/meta/recipes-connectivity/socat/socat_1.7.3.4.bb +++ b/poky/meta/recipes-connectivity/socat/socat_1.7.4.1.bb @@ -7,13 +7,13 @@ SECTION = "console/network" LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f" + file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86" SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ " -SRC_URI[md5sum] = "3cca4f8cd9d2d1caabd9cc099451bac9" -SRC_URI[sha256sum] = "972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc" +SRC_URI[md5sum] = "36cad050ecf4981ab044c3fbd75c643f" +SRC_URI[sha256sum] = "3faca25614e89123dff5045680549ecef519d02e331aaf3c4f5a8f6837c675e9" inherit autotools diff --git a/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-0326.patch b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-0326.patch new file mode 100644 index 000000000..8c90fa342 --- /dev/null +++ b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-0326.patch @@ -0,0 +1,45 @@ +From 947272febe24a8f0ea828b5b2f35f13c3821901e Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <jouni@codeaurora.org> +Date: Mon, 9 Nov 2020 11:43:12 +0200 +Subject: [PATCH] P2P: Fix copying of secondary device types for P2P group + client + +Parsing and copying of WPS secondary device types list was verifying +that the contents is not too long for the internal maximum in the case +of WPS messages, but similar validation was missing from the case of P2P +group information which encodes this information in a different +attribute. This could result in writing beyond the memory area assigned +for these entries and corrupting memory within an instance of struct +p2p_device. This could result in invalid operations and unexpected +behavior when trying to free pointers from that corrupted memory. + +Upstream-Status: Backport +CVE: CVE-2021-0326 + +Reference to upstream patch: +[https://w1.fi/cgit/hostap/commit/?id=947272febe24a8f0ea828b5b2f35f13c3821901e] + +Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269 +Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers") +Signed-off-by: Jouni Malinen <jouni@codeaurora.org> +Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com> +--- + src/p2p/p2p.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c +index a08ba02..079270f 100644 +--- a/src/p2p/p2p.c ++++ b/src/p2p/p2p.c +@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *dev, + dev->info.config_methods = cli->config_methods; + os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8); + dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types; ++ if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN) ++ dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN; + os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types, + dev->info.wps_sec_dev_type_list_len); + } +-- +2.17.1 + diff --git a/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb index 7cc03fef7..caa6018ce 100644 --- a/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb +++ b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb @@ -1,5 +1,6 @@ SUMMARY = "Client for Wi-Fi Protected Access (WPA)" HOMEPAGE = "http://w1.fi/wpa_supplicant/" +DESCRIPTION = "wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). Supplicant is the IEEE 802.1X/WPA component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver." BUGTRACKER = "http://w1.fi/security/" SECTION = "network" LICENSE = "BSD-3-Clause" @@ -29,6 +30,7 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch \ file://0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch \ file://0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch \ + file://CVE-2021-0326.patch \ " SRC_URI[md5sum] = "2d2958c782576dc9901092fbfecb4190" SRC_URI[sha256sum] = "fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17" diff --git a/poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb index d01cd7e29..65b3cd778 100644 --- a/poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +++ b/poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb @@ -1,5 +1,6 @@ SUMMARY = "Base system master password/group files" DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group). The update-passwd tool is also provided to keep the system databases synchronized with these master files." +HOMEPAGE = "https://launchpad.net/base-passwd" SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" 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 8d0f419f4..3804f4f7b 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 @@ -1,6 +1,6 @@ SUMMARY = "inittab configuration for BusyBox" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://inittab" diff --git a/poky/meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch b/poky/meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch deleted file mode 100644 index 8d1f27212..000000000 --- a/poky/meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 5b2fc5746c352eb2b27bfc9fb224580d9852d0fa Mon Sep 17 00:00:00 2001 -From: Sakib Sajal <sakib.sajal@windriver.com> -Date: Fri, 17 Jul 2020 17:27:21 +0000 -Subject: [PATCH] hwclock: make glibc 2.31 compatible - -NEWS for glibc version 2.31 -=========================== - -Deprecated and removed features, and other changes affecting compatibility: - -* The settimeofday function can still be used to set a system-wide - time zone when the operating system supports it. This is because - the Linux kernel reused the API, on some architectures, to describe - a system-wide time-zone-like offset between the software clock - maintained by the kernel, and the "RTC" clock that keeps time when - the system is shut down. - - However, to reduce the odds of this offset being set by accident, - settimeofday can no longer be used to set the time and the offset - simultaneously. If both of its two arguments are non-null, the call - will fail (setting errno to EINVAL). - - Callers attempting to set this offset should also be prepared for - the call to fail and set errno to ENOSYS; this already happens on - the Hurd and on some Linux architectures. The Linux kernel - maintainers are discussing a more principled replacement for the - reused API. After a replacement becomes available, we will change - settimeofday to fail with ENOSYS on all platforms when its 'tzp' - argument is not a null pointer. - - settimeofday itself is obsolescent according to POSIX. Programs - that set the system time should use clock_settime and/or the adjtime - family of functions instead. We may cease to make settimeofday - available to newly linked binaries after there is a replacement for - Linux's time-zone-like offset API. - -hwclock had two calls to settimeofday, in functions to_sys_clock and -set_system_clock_timezone, where both the arguments to settimeofday -were valid (non-null). -Therefore, split the call, once for timezone and once for timeval. - -Fixes #12756 - -Upstream-Status: Pending - -Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> ---- - util-linux/hwclock.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c -index dc97d8f..cf346e8 100644 ---- a/util-linux/hwclock.c -+++ b/util-linux/hwclock.c -@@ -131,8 +131,10 @@ static void to_sys_clock(const char **pp_rtcname, int utc) - - tv.tv_sec = read_rtc(pp_rtcname, NULL, utc); - tv.tv_usec = 0; -- if (settimeofday(&tv, &tz)) -- bb_simple_perror_msg_and_die("settimeofday"); -+ if (settimeofday(NULL, &tz)) -+ bb_simple_perror_msg_and_die("settimeofday: timezone"); -+ if (settimeofday(&tv, NULL)) -+ bb_simple_perror_msg_and_die("settimeofday: timeval"); - } - - static void from_sys_clock(const char **pp_rtcname, int utc) -@@ -283,8 +285,10 @@ static void set_system_clock_timezone(int utc) - gettimeofday(&tv, NULL); - if (!utc) - tv.tv_sec += tz.tz_minuteswest * 60; -- if (settimeofday(&tv, &tz)) -- bb_simple_perror_msg_and_die("settimeofday"); -+ if (settimeofday(NULL, &tz)) -+ bb_simple_perror_msg_and_die("settimeofday: timezone"); -+ if (settimeofday(&tv, NULL)) -+ bb_simple_perror_msg_and_die("settimeofday: timeval"); - } - - //usage:#define hwclock_trivial_usage --- -2.24.1 - diff --git a/poky/meta/recipes-core/busybox/busybox_1.32.0.bb b/poky/meta/recipes-core/busybox/busybox_1.33.0.bb index 3a669444d..1a3f218bc 100644 --- a/poky/meta/recipes-core/busybox/busybox_1.32.0.bb +++ b/poky/meta/recipes-core/busybox/busybox_1.33.0.bb @@ -44,11 +44,9 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ - file://0001-hwclock-make-glibc-2.31-compatible.patch \ file://rev.cfg \ file://pgrep.cfg \ " SRC_URI_append_libc-musl = " file://musl.cfg " -SRC_URI[tarball.md5sum] = "9576986f1a960da471d03b72a62f13c7" -SRC_URI[tarball.sha256sum] = "c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689" +SRC_URI[tarball.sha256sum] = "d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd" diff --git a/poky/meta/recipes-core/coreutils/coreutils_8.32.bb b/poky/meta/recipes-core/coreutils/coreutils_8.32.bb index 320f93bdc..c1962ccb9 100644 --- a/poky/meta/recipes-core/coreutils/coreutils_8.32.bb +++ b/poky/meta/recipes-core/coreutils/coreutils_8.32.bb @@ -117,7 +117,7 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" # Make hostname's priority higher than busybox but lower than net-tools ALTERNATIVE_PRIORITY[hostname] = "90" -ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 nice printenv mktemp df" +ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base32 base64 nice printenv mktemp df" ALTERNATIVE_${PN}-doc = "base64.1 nice.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1" ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" diff --git a/poky/meta/recipes-core/dbus-wait/dbus-wait_git.bb b/poky/meta/recipes-core/dbus-wait/dbus-wait_git.bb index c24295b53..677768d35 100644 --- a/poky/meta/recipes-core/dbus-wait/dbus-wait_git.bb +++ b/poky/meta/recipes-core/dbus-wait/dbus-wait_git.bb @@ -1,5 +1,6 @@ SUMMARY = "A simple tool to wait for a specific signal over DBus" HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/dbus-wait" +DESCRIPTION = "${SUMMARY}" SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/poky/meta/recipes-core/dbus/dbus_1.12.20.bb b/poky/meta/recipes-core/dbus/dbus_1.12.20.bb index 09049301c..32e7d9cfa 100644 --- a/poky/meta/recipes-core/dbus/dbus_1.12.20.bb +++ b/poky/meta/recipes-core/dbus/dbus_1.12.20.bb @@ -6,8 +6,6 @@ SECTION = "base" require dbus.inc DEPENDS = "expat virtual/libintl autoconf-archive" -RDEPENDS_dbus_class-native = "" -RDEPENDS_dbus_class-nativesdk = "" PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" ALLOW_EMPTY_dbus-ptest = "1" RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" diff --git a/poky/meta/recipes-core/dropbear/dropbear.inc b/poky/meta/recipes-core/dropbear/dropbear.inc index a30f98faa..ed3ef3384 100644 --- a/poky/meta/recipes-core/dropbear/dropbear.inc +++ b/poky/meta/recipes-core/dropbear/dropbear.inc @@ -1,5 +1,6 @@ SUMMARY = "A lightweight SSH and SCP implementation" HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" +DESCRIPTION = "Dropbear is a relatively small SSH server and client. It runs on a variety of POSIX-based platforms. Dropbear is open source software, distributed under a MIT-style license. Dropbear is particularly useful for "embedded"-type Linux (or other Unix) systems, such as wireless routers." SECTION = "console/network" # some files are from other projects and have others license terms: 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 deleted file mode 100644 index 2460d26bd..000000000 --- a/poky/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch +++ /dev/null @@ -1,23 +0,0 @@ -From dd350f4e2258b5a638bc8fb26a6193147902d292 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=89rico=20Nogueira?= <ericonr@disroot.org> -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 <alex.kanavin@gmail.com> ---- - 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 <config.h> - #endif - -+#include <linux/types.h> - #include <net/ethernet.h> - #include <sys/socket.h> - #include <arpa/inet.h> diff --git a/poky/meta/recipes-core/ell/ell_0.35.bb b/poky/meta/recipes-core/ell/ell_0.38.bb index ccc54b5ff..7d3a33997 100644 --- a/poky/meta/recipes-core/ell/ell_0.35.bb +++ b/poky/meta/recipes-core/ell/ell_0.38.bb @@ -1,4 +1,5 @@ SUMMARY = "Embedded Linux Library" +HOMEPAGE = "https://01.org/ell" 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 \ @@ -14,10 +15,9 @@ 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" +SRC_URI[sha256sum] = "c1b7ae5676eec310f08757b3d8652b8e818776be1897fb5deb59e55f02a012a7" do_configure_prepend () { mkdir -p ${S}/build-aux diff --git a/poky/meta/recipes-core/fts/fts_1.2.7.bb b/poky/meta/recipes-core/fts/fts_1.2.7.bb index 589ae0e91..ea820cb0c 100644 --- a/poky/meta/recipes-core/fts/fts_1.2.7.bb +++ b/poky/meta/recipes-core/fts/fts_1.2.7.bb @@ -3,6 +3,7 @@ SUMMARY = "Implementation of ftsfor musl libc packages" HOMEPAGE = "https://github.com/pullmoll/musl-fts" +DESCRIPTION = "The musl-fts package implements the fts(3) functions fts_open, fts_read, fts_children, fts_set and fts_close, which are missing in musl libc." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=5ffe358174aad383f1b69ce3b53da982" SECTION = "libs" diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-codegen.py-removing-unecessary-print-statement.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-codegen.py-removing-unecessary-print-statement.patch new file mode 100644 index 000000000..40427e0e6 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-codegen.py-removing-unecessary-print-statement.patch @@ -0,0 +1,38 @@ +From 6178df5658045a6253ef806e018fe80d99a8f5fb Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Mon, 1 Feb 2021 16:10:28 -0500 +Subject: [PATCH] tests/codegen.py: removing unecessary print statement + +A huge amount of output(boiler-plate code) is +printed to the console screen. +This is not critical to the test results. + +This causes intermittent test failure when another process +has to parse its output. + +Root cause is in ptest-runner, This is a workaround + +Uptream-Status: Inappropriate [other] + + + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +--- + gio/tests/codegen.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py +index 51de0ede4..cfa4db42e 100644 +--- a/gio/tests/codegen.py ++++ b/gio/tests/codegen.py +@@ -250,7 +250,6 @@ class TestCodegen(unittest.TestCase): + + result = Result(info, out, err, subs) + +- print('Output:', result.out) + return result + + def runCodegenWithInterface(self, interface_contents, *args): +-- +2.29.2 + 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.7.bb index 70e8aa878..882a89da7 100644 --- 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.7.bb @@ -17,11 +17,12 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ 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 \ + file://0001-tests-codegen.py-removing-unecessary-print-statement.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "97df8670e32f9fd4f7392b0980e661dd625012015d58350da1e58e343f4af984" +SRC_URI[sha256sum] = "09f158769f6f26b31074e15b1ac80ec39b13b53102dfae66cfe826fb2cc65502" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. @@ -30,7 +31,7 @@ def find_meson_cross_files(d): if bb.data.inherits_class('native', d): return "" - corebase = d.getVar("COREBASE") + thisdir = d.getVar("THISDIR") import collections sitedata = siteinfo_data(d) # filename -> found @@ -38,7 +39,11 @@ def find_meson_cross_files(d): 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) + sanitized_path = filename.replace(thisdir, "${THISDIR}") + if sanitized_path == filename: + bb.error("Cannot add '%s' to --cross-file, because it's not relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir)) + continue + files[filename.replace(thisdir, "${THISDIR}")] = os.path.exists(filename) items = ["--cross-file=" + k for k,v in files.items() if v] d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) diff --git a/poky/meta/recipes-core/glibc/cross-localedef-native_2.32.bb b/poky/meta/recipes-core/glibc/cross-localedef-native_2.33.bb index 5a0abbb70..ec59c6ba1 100644 --- a/poky/meta/recipes-core/glibc/cross-localedef-native_2.32.bb +++ b/poky/meta/recipes-core/glibc/cross-localedef-native_2.33.bb @@ -14,8 +14,8 @@ require glibc-version.inc # AUTOTOOLS_SCRIPT_PATH = "${S}/localedef" -inherit native inherit autotools +inherit native FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" diff --git a/poky/meta/recipes-core/glibc/glibc-collateral.inc b/poky/meta/recipes-core/glibc/glibc-collateral.inc index 52880791a..4f81f07da 100644 --- a/poky/meta/recipes-core/glibc/glibc-collateral.inc +++ b/poky/meta/recipes-core/glibc/glibc-collateral.inc @@ -1,7 +1,7 @@ require glibc-common.inc -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ - file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ + file://${COMMON_LICENSE_DIR}/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780" deltask do_fetch deltask do_unpack diff --git a/poky/meta/recipes-core/glibc/glibc-common.inc b/poky/meta/recipes-core/glibc/glibc-common.inc index 027c70099..41ff7e9a1 100644 --- a/poky/meta/recipes-core/glibc/glibc-common.inc +++ b/poky/meta/recipes-core/glibc/glibc-common.inc @@ -22,4 +22,4 @@ ARM_INSTRUCTION_SET_armv6 = "arm" # COMPATIBLE_HOST_libc-musl_class-target = "null" -PV = "2.32" +PV = "2.33" diff --git a/poky/meta/recipes-core/glibc/glibc-locale_2.32.bb b/poky/meta/recipes-core/glibc/glibc-locale_2.33.bb index f7702e035..f7702e035 100644 --- a/poky/meta/recipes-core/glibc/glibc-locale_2.32.bb +++ b/poky/meta/recipes-core/glibc/glibc-locale_2.33.bb diff --git a/poky/meta/recipes-core/glibc/glibc-mtrace_2.32.bb b/poky/meta/recipes-core/glibc/glibc-mtrace_2.33.bb index 0b69bad46..0b69bad46 100644 --- a/poky/meta/recipes-core/glibc/glibc-mtrace_2.32.bb +++ b/poky/meta/recipes-core/glibc/glibc-mtrace_2.33.bb diff --git a/poky/meta/recipes-core/glibc/glibc-package.inc b/poky/meta/recipes-core/glibc/glibc-package.inc index f7e4b59a5..8d0cc8047 100644 --- a/poky/meta/recipes-core/glibc/glibc-package.inc +++ b/poky/meta/recipes-core/glibc/glibc-package.inc @@ -156,6 +156,7 @@ do_install_armmultilib () { oe_multilib_header bits/local_lim.h bits/mman.h bits/msq.h bits/pthreadtypes.h bits/pthreadtypes-arch.h bits/sem.h bits/semaphore.h bits/setjmp.h oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h + oe_multilib_header bits/struct_stat.h oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h diff --git a/poky/meta/recipes-core/glibc/glibc-scripts_2.32.bb b/poky/meta/recipes-core/glibc/glibc-scripts_2.33.bb index 5a89bd802..5a89bd802 100644 --- a/poky/meta/recipes-core/glibc/glibc-scripts_2.32.bb +++ b/poky/meta/recipes-core/glibc/glibc-scripts_2.33.bb diff --git a/poky/meta/recipes-core/glibc/glibc-testsuite_2.32.bb b/poky/meta/recipes-core/glibc/glibc-testsuite_2.33.bb index d887aeff7..d887aeff7 100644 --- a/poky/meta/recipes-core/glibc/glibc-testsuite_2.32.bb +++ b/poky/meta/recipes-core/glibc/glibc-testsuite_2.33.bb diff --git a/poky/meta/recipes-core/glibc/glibc-version.inc b/poky/meta/recipes-core/glibc/glibc-version.inc index 156605629..3a9517317 100644 --- a/poky/meta/recipes-core/glibc/glibc-version.inc +++ b/poky/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ -SRCBRANCH ?= "release/2.32/master" -PV = "2.32" -SRCREV_glibc ?= "3de512be7ea6053255afed6154db9ee31d4e557a" +SRCBRANCH ?= "release/2.33/master" +PV = "2.33" +SRCREV_glibc ?= "9826b03b747b841f5fc6de2054bf1ef3f5c4bdf3" SRCREV_localedef ?= "bd644c9e6f3e20c5504da1488448173c69c56c28" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" diff --git a/poky/meta/recipes-core/glibc/glibc.inc b/poky/meta/recipes-core/glibc/glibc.inc index d2f02ad59..7d1430637 100644 --- a/poky/meta/recipes-core/glibc/glibc.inc +++ b/poky/meta/recipes-core/glibc/glibc.inc @@ -20,6 +20,7 @@ CACHED_CONFIGUREVARS += " \ libc_cv_ssp_strong=no \ libc_cv_ssp_all=no \ libc_cv_ssp=no \ + libc_cv_include_x86_isa_level=no \ " # ifunc doesn't appear to work on mips, casuses libbfd assertion failures diff --git a/poky/meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch b/poky/meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch index e0ec1887d..f96da83a9 100644 --- a/poky/meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch +++ b/poky/meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch @@ -1,7 +1,7 @@ -From 5db90855621a81d02f1434d5602cefea8c45de1c Mon Sep 17 00:00:00 2001 +From d1f1671034a222417f9a829dcaa4f0c3d4f8954d Mon Sep 17 00:00:00 2001 From: Jason Wessel <jason.wessel@windriver.com> Date: Sat, 7 Dec 2019 09:59:22 -0800 -Subject: [PATCH 01/29] localedef: Add hardlink resolver from util-linux +Subject: [PATCH] localedef: Add hardlink resolver from util-linux The hard link resolver that is built into localedef cannot be run in parallel. It will search sibling directories (which are be processed @@ -1128,6 +1128,3 @@ index 0000000000..0129a85e2e +} + +#endif --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch b/poky/meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch index 05b76803b..3dc4582f4 100644 --- a/poky/meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch +++ b/poky/meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch @@ -1,7 +1,7 @@ -From ab022ce3c1c01fd6c850f541a33efd0cacabe052 Mon Sep 17 00:00:00 2001 +From 14d256e2db009f8bac9a265e8393d7ed25050df9 Mon Sep 17 00:00:00 2001 From: Jason Wessel <jason.wessel@windriver.com> Date: Sat, 7 Dec 2019 10:01:37 -0800 -Subject: [PATCH 02/29] localedef: fix-ups hardlink to make it compile +Subject: [PATCH] localedef: fix-ups hardlink to make it compile Upstream-Status: Pending Signed-off-by: Jason Wessel <jason.wessel@windriver.com> @@ -236,6 +236,3 @@ index 63615896b0..726e6dd948 100644 } continue; } --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch b/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch index 743994f2d..c4718a106 100644 --- a/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch +++ b/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch @@ -1,8 +1,7 @@ -From de4322ef6d4dc9fc3ee9b69af1c10edbc64a66a3 Mon Sep 17 00:00:00 2001 +From 32a4b8ae046fe4bb1b19f61378d079d44deaede7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:48:24 +0000 -Subject: [PATCH 03/29] nativesdk-glibc: Look for host system ld.so.cache as - well +Subject: [PATCH] nativesdk-glibc: Look for host system ld.so.cache as well Upstream-Status: Inappropriate [embedded specific] @@ -31,10 +30,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c -index e39980fb19..565b039b23 100644 +index 9e2089cfaa..ad01674027 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c -@@ -2160,6 +2160,14 @@ _dl_map_object (struct link_map *loader, const char *name, +@@ -2175,6 +2175,14 @@ _dl_map_object (struct link_map *loader, const char *name, } } @@ -42,14 +41,14 @@ index e39980fb19..565b039b23 100644 + if (fd == -1 + && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL + || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1)) -+ && rtld_search_dirs.dirs != (void *) -1) -+ fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs, ++ && __rtld_search_dirs.dirs != (void *) -1) ++ fd = open_path (name, namelen, mode & __RTLD_SECURE, &__rtld_search_dirs, + &realname, &fb, l, LA_SER_DEFAULT, &found_other_class); + /* Finally try ld.so.cache */ #ifdef USE_LDCONFIG if (fd == -1 && (__glibc_likely ((mode & __RTLD_SECURE) == 0) -@@ -2218,14 +2226,6 @@ _dl_map_object (struct link_map *loader, const char *name, +@@ -2233,14 +2241,6 @@ _dl_map_object (struct link_map *loader, const char *name, } #endif @@ -57,13 +56,10 @@ index e39980fb19..565b039b23 100644 - if (fd == -1 - && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL - || __glibc_likely (!(l->l_flags_1 & DF_1_NODEFLIB))) -- && rtld_search_dirs.dirs != (void *) -1) -- fd = open_path (name, namelen, mode, &rtld_search_dirs, +- && __rtld_search_dirs.dirs != (void *) -1) +- fd = open_path (name, namelen, mode, &__rtld_search_dirs, - &realname, &fb, l, LA_SER_DEFAULT, &found_other_class); - /* Add another newline when we are tracing the library loading. */ if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) _dl_debug_printf ("\n"); --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch b/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch index a3b5b7750..a8e625d24 100644 --- a/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch +++ b/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch @@ -1,8 +1,7 @@ -From 258c44e4ecffd830cb89d0016d45b2bac765f559 Mon Sep 17 00:00:00 2001 +From aa8393bff257e4badfd208b88473ead175c69362 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:50:00 +0000 -Subject: [PATCH 04/29] nativesdk-glibc: Fix buffer overrun with a relocated - SDK +Subject: [PATCH] nativesdk-glibc: Fix buffer overrun with a relocated SDK When ld-linux-*.so.2 is relocated to a path that is longer than the original fixed location, the dynamic loader will crash in open_path @@ -22,10 +21,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 12 insertions(+) diff --git a/elf/dl-load.c b/elf/dl-load.c -index 565b039b23..e1b3486549 100644 +index ad01674027..f455207e79 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c -@@ -1860,7 +1860,19 @@ open_path (const char *name, size_t namelen, int mode, +@@ -1871,7 +1871,19 @@ open_path (const char *name, size_t namelen, int mode, given on the command line when rtld is run directly. */ return -1; @@ -45,6 +44,3 @@ index 565b039b23..e1b3486549 100644 do { struct r_search_path_elem *this_dir = *dirs; --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch b/poky/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch index 2073576aa..197caae92 100644 --- a/poky/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch +++ b/poky/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch @@ -1,8 +1,7 @@ -From 19cd858f5f04a6ac584fbd89a2fbc51791263b85 Mon Sep 17 00:00:00 2001 +From 3ea08e491a8494ff03e598b5e0fc2d8131e75da9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:51:38 +0000 -Subject: [PATCH 05/29] nativesdk-glibc: Raise the size of arrays containing dl - paths +Subject: [PATCH] nativesdk-glibc: Raise the size of arrays containing dl paths This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings and lengths as well as ld.so.cache path in the dynamic loader to specific @@ -18,20 +17,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- elf/dl-cache.c | 4 ++++ elf/dl-load.c | 4 ++-- + elf/dl-usage.c | 6 ++++-- elf/interp.c | 2 +- elf/ldconfig.c | 3 +++ - elf/rtld.c | 5 +++-- + elf/rtld.c | 1 + iconv/gconv_conf.c | 2 +- sysdeps/generic/dl-cache.h | 4 ---- - 7 files changed, 14 insertions(+), 10 deletions(-) + 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/elf/dl-cache.c b/elf/dl-cache.c -index 93d185e788..e115b18756 100644 +index 32f3bef5ea..71f3a82dc0 100644 --- a/elf/dl-cache.c +++ b/elf/dl-cache.c -@@ -133,6 +133,10 @@ do \ - while (0) - +@@ -359,6 +359,10 @@ search_cache (const char *string_table, uint32_t string_table_size, + return best; + } +const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))) = + SYSCONFDIR "/ld.so.cache"; @@ -41,10 +41,10 @@ index 93d185e788..e115b18756 100644 _dl_cache_libcmp (const char *p1, const char *p2) { diff --git a/elf/dl-load.c b/elf/dl-load.c -index e1b3486549..5226d0c4fa 100644 +index f455207e79..a144e24fcf 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c -@@ -111,8 +111,8 @@ static size_t max_capstrlen attribute_relro; +@@ -115,8 +115,8 @@ enum { ncapstr = 1, max_capstrlen = 0 }; gen-trusted-dirs.awk. */ #include "trusted-dirs.h" @@ -55,8 +55,39 @@ index e1b3486549..5226d0c4fa 100644 { SYSTEM_DIRS_LEN }; +diff --git a/elf/dl-usage.c b/elf/dl-usage.c +index 6e26818bd7..f09e8b93e5 100644 +--- a/elf/dl-usage.c ++++ b/elf/dl-usage.c +@@ -25,6 +25,8 @@ + #include <dl-procinfo.h> + #include <dl-hwcaps.h> + ++extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))); ++ + void + _dl_usage (const char *argv0, const char *wrong_option) + { +@@ -244,7 +246,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ + --list list all dependencies and how they are resolved\n\ + --verify verify that given object really is a dynamically linked\n\ + object we can handle\n\ +- --inhibit-cache Do not use " LD_SO_CACHE "\n\ ++ --inhibit-cache Do not use %s\n\ + --library-path PATH use given PATH instead of content of the environment\n\ + variable LD_LIBRARY_PATH\n\ + --glibc-hwcaps-prepend LIST\n\ +@@ -266,7 +268,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ + \n\ + This program interpreter self-identifies as: " RTLD "\n\ + ", +- argv0); ++ argv0, LD_SO_CACHE); + print_search_path_for_help (state); + print_hwcaps_subdirectories (state); + print_legacy_hwcap_directories (); diff --git a/elf/interp.c b/elf/interp.c -index 331cc1df48..885b2d9476 100644 +index 91966702ca..dc86c20e83 100644 --- a/elf/interp.c +++ b/elf/interp.c @@ -18,5 +18,5 @@ @@ -67,10 +98,10 @@ index 331cc1df48..885b2d9476 100644 +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) = RUNTIME_LINKER; diff --git a/elf/ldconfig.c b/elf/ldconfig.c -index 0c090dca15..6bb6e0fe72 100644 +index 28ed637a29..5d38a60c5d 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c -@@ -171,6 +171,9 @@ static struct argp argp = +@@ -176,6 +176,9 @@ static struct argp argp = options, parse_opt, NULL, doc, NULL, more_help, NULL }; @@ -81,10 +112,10 @@ index 0c090dca15..6bb6e0fe72 100644 a platform. */ static int diff --git a/elf/rtld.c b/elf/rtld.c -index 5b882163fa..db407b5d8b 100644 +index 596b6ac3d9..1ccd33f668 100644 --- a/elf/rtld.c +++ b/elf/rtld.c -@@ -217,6 +217,7 @@ dso_name_valid_for_suid (const char *p) +@@ -185,6 +185,7 @@ dso_name_valid_for_suid (const char *p) } return *p != '\0'; } @@ -92,24 +123,8 @@ index 5b882163fa..db407b5d8b 100644 static void audit_list_init (struct audit_list *list) -@@ -1286,13 +1287,13 @@ of this helper program; chances are you did not intend to run this program.\n\ - --list list all dependencies and how they are resolved\n\ - --verify verify that given object really is a dynamically linked\n\ - object we can handle\n\ -- --inhibit-cache Do not use " LD_SO_CACHE "\n\ -+ --inhibit-cache Do not use %s\n\ - --library-path PATH use given PATH instead of content of the environment\n\ - variable LD_LIBRARY_PATH\n\ - --inhibit-rpath LIST ignore RUNPATH and RPATH information in object names\n\ - in LIST\n\ - --audit LIST use objects named in LIST as auditors\n\ -- --preload LIST preload objects named in LIST\n"); -+ --preload LIST preload objects named in LIST\n", LD_SO_CACHE); - - ++_dl_skip_args; - --_dl_argc; diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c -index 735bd1f2d5..25100ba666 100644 +index 682f949834..7eed87bc9d 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -36,7 +36,7 @@ @@ -122,10 +137,10 @@ index 735bd1f2d5..25100ba666 100644 /* Type to represent search path. */ struct path_elem diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h -index 6b310e9e15..3877311df4 100644 +index 964d50a486..94bf68ca9d 100644 --- a/sysdeps/generic/dl-cache.h +++ b/sysdeps/generic/dl-cache.h -@@ -27,10 +27,6 @@ +@@ -34,10 +34,6 @@ ((flags) == 1 || (flags) == _DL_CACHE_DEFAULT_ID) #endif @@ -136,6 +151,3 @@ index 6b310e9e15..3877311df4 100644 #ifndef add_system_dir # define add_system_dir(dir) add_dir (dir) #endif --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch b/poky/meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch index 372dca727..172ade8d9 100644 --- a/poky/meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch +++ b/poky/meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch @@ -1,7 +1,7 @@ -From bd0486cab67c3441210aed48caab67418610a765 Mon Sep 17 00:00:00 2001 +From 19e3e45eb1838ee80af13c3d27fcff446773211e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 31 Dec 2015 14:35:35 -0800 -Subject: [PATCH 06/29] nativesdk-glibc: Allow 64 bit atomics for x86 +Subject: [PATCH] nativesdk-glibc: Allow 64 bit atomics for x86 The fix consist of allowing 64bit atomic ops for x86. This should be safe for i586 and newer CPUs. @@ -17,11 +17,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sysdeps/x86/atomic-machine.h b/sysdeps/x86/atomic-machine.h -index bb49648374..aa08d3c0a7 100644 +index 695222e4fa..9d39bfdbd5 100644 --- a/sysdeps/x86/atomic-machine.h +++ b/sysdeps/x86/atomic-machine.h -@@ -58,15 +58,14 @@ typedef uintmax_t uatomic_max_t; - #endif +@@ -52,15 +52,14 @@ typedef uintmax_t uatomic_max_t; + #define LOCK_PREFIX "lock;" #define USE_ATOMIC_COMPILER_BUILTINS 1 +# define __HAVE_64B_ATOMICS 1 @@ -37,6 +37,3 @@ index bb49648374..aa08d3c0a7 100644 # define SP_REG "esp" # define SEG_REG "gs" # define BR_CONSTRAINT "r" --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch b/poky/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch index 729ce1b42..14697567c 100644 --- a/poky/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch +++ b/poky/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch @@ -1,7 +1,7 @@ -From 9a8bf11ea375a2fe5eddb30bc10943e64d3b96a4 Mon Sep 17 00:00:00 2001 +From 732d4f4954fe60718870048d0583a20a7a8a8540 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 3 Aug 2018 09:55:12 -0700 -Subject: [PATCH 07/29] nativesdk-glibc: Make relocatable install for locales +Subject: [PATCH] nativesdk-glibc: Make relocatable install for locales The glibc locale path is hard-coded to the install prefix, but in SDKs we need to be able to relocate the binaries. Expand the strings to 4K and put them in a @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/locale/findlocale.c b/locale/findlocale.c -index 9cd3b71a6d..84272310e0 100644 +index ab09122b0c..f42cc75780 100644 --- a/locale/findlocale.c +++ b/locale/findlocale.c @@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = @@ -41,7 +41,7 @@ index 9cd3b71a6d..84272310e0 100644 else /* We really have to load some data. First see whether the name is diff --git a/locale/loadarchive.c b/locale/loadarchive.c -index ba0fe45648..9737fd4cda 100644 +index 4177fc8972..40247b1e68 100644 --- a/locale/loadarchive.c +++ b/locale/loadarchive.c @@ -42,7 +42,7 @@ @@ -54,7 +54,7 @@ index ba0fe45648..9737fd4cda 100644 /* Size of initial mapping window, optimal if large enough to cover the header plus the initial locale. */ diff --git a/locale/localeinfo.h b/locale/localeinfo.h -index 1bfe22aa7f..fdc283c69a 100644 +index b3d4da0185..22f9dc1140 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -331,7 +331,7 @@ _nl_lookup_word (locale_t l, int category, int item) @@ -67,7 +67,7 @@ index 1bfe22aa7f..fdc283c69a 100644 /* Load the locale data for CATEGORY from the file specified by *NAME. If *NAME is "", use environment variables as specified by POSIX, and diff --git a/locale/programs/locale.c b/locale/programs/locale.c -index e2e309c2a1..61a92cdcd1 100644 +index 575b208e82..5ec630c3a4 100644 --- a/locale/programs/locale.c +++ b/locale/programs/locale.c @@ -632,6 +632,7 @@ nameentcmp (const void *a, const void *b) @@ -98,6 +98,3 @@ index e2e309c2a1..61a92cdcd1 100644 locrec = (struct locrecent *) (addr + names[cnt].locrec_offset); --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0008-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch b/poky/meta/recipes-core/glibc/glibc/0008-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch index 5e3b3e2d7..2162bf38c 100644 --- a/poky/meta/recipes-core/glibc/glibc/0008-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch +++ b/poky/meta/recipes-core/glibc/glibc/0008-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch @@ -1,7 +1,7 @@ -From 59b0a78ae706a540dbd8905bc97c875220d6aeb2 Mon Sep 17 00:00:00 2001 +From 3d58330390a7d4f4ed32f4a9c25628af3e0dd5c1 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:01:50 +0000 -Subject: [PATCH 08/29] fsl e500/e5500/e6500/603e fsqrt implementation +Subject: [PATCH] fsl e500/e5500/e6500/603e fsqrt implementation Upstream-Status: Pending Signed-off-by: Edmar Wienskoski <edmar@freescale.com> @@ -1579,6 +1579,3 @@ index 0000000000..04ff8cc181 +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/e6500/fpu/Implies @@ -0,0 +1 @@ +powerpc/powerpc64/e6500/fpu --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0009-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch b/poky/meta/recipes-core/glibc/glibc/0009-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch index a94ed207f..0c8bf94a7 100644 --- a/poky/meta/recipes-core/glibc/glibc/0009-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch +++ b/poky/meta/recipes-core/glibc/glibc/0009-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch @@ -1,7 +1,7 @@ -From 78f67f016ca9e3f7a37af86cf6e400cf17cf1d05 Mon Sep 17 00:00:00 2001 +From 3b5fe5b1a7390cde0f07351415e3891f62d1f7e0 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:15:07 +0000 -Subject: [PATCH 09/29] ppc/sqrt: Fix undefined reference to `__sqrt_finite' +Subject: [PATCH] ppc/sqrt: Fix undefined reference to `__sqrt_finite' on ppc fixes the errors like below | ./.libs/libpulsecore-1.1.so: undefined reference to `__sqrt_finite' @@ -203,6 +203,3 @@ index 26fa067abf..9d175122a8 100644 return f_washf (b); } +strong_alias (__ieee754_sqrtf, __sqrtf_finite) --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0010-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/poky/meta/recipes-core/glibc/glibc/0010-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch index 743bea143..cadaa0b2e 100644 --- a/poky/meta/recipes-core/glibc/glibc/0010-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch +++ b/poky/meta/recipes-core/glibc/glibc/0010-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch @@ -1,8 +1,8 @@ -From 670b5d70ab62b42ab02a8e18b8fcee2879b8c4a0 Mon Sep 17 00:00:00 2001 +From 6b6e1dcd707017598ea3bdc2d91a761943b62218 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:16:38 +0000 -Subject: [PATCH 10/29] __ieee754_sqrt{,f} are now inline functions and call - out __slow versions +Subject: [PATCH] __ieee754_sqrt{,f} are now inline functions and call out + __slow versions Upstream-Status: Pending @@ -382,6 +382,3 @@ index 9d175122a8..10de1f0cc3 100644 +} + strong_alias (__ieee754_sqrtf, __sqrtf_finite) --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0011-Quote-from-bug-1443-which-explains-what-the-patch-do.patch b/poky/meta/recipes-core/glibc/glibc/0011-Quote-from-bug-1443-which-explains-what-the-patch-do.patch index a9280b7c3..e4c78b5c7 100644 --- a/poky/meta/recipes-core/glibc/glibc/0011-Quote-from-bug-1443-which-explains-what-the-patch-do.patch +++ b/poky/meta/recipes-core/glibc/glibc/0011-Quote-from-bug-1443-which-explains-what-the-patch-do.patch @@ -1,8 +1,7 @@ -From de7a7c04a92dbc5d35cb37e47c471e12784cc95e Mon Sep 17 00:00:00 2001 +From 297bac9429260f8df495b81d3fae8ae4c6913f5f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:20:09 +0000 -Subject: [PATCH 11/29] Quote from bug 1443 which explains what the patch does - : +Subject: [PATCH] Quote from bug 1443 which explains what the patch does : We build some random program and link it with -lust. When we run it, it dies with a SIGSEGV before reaching main(). @@ -45,7 +44,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h -index 90856779b1..a29bb86c56 100644 +index ff5e09e207..d68bfe5cbe 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -510,7 +510,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, @@ -57,6 +56,3 @@ index 90856779b1..a29bb86c56 100644 break; case R_ARM_TLS_TPOFF32: --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0012-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/poky/meta/recipes-core/glibc/glibc/0012-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch index ab07455ad..c5e8e6473 100644 --- a/poky/meta/recipes-core/glibc/glibc/0012-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch +++ b/poky/meta/recipes-core/glibc/glibc/0012-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch @@ -1,7 +1,7 @@ -From c8807899367e64d803585e7dd4b56a1085d5893b Mon Sep 17 00:00:00 2001 +From f389babf3c920e68b7d7391556a78ebf62a21ebe Mon Sep 17 00:00:00 2001 From: Ting Liu <b28495@freescale.com> Date: Wed, 19 Dec 2012 04:39:57 -0600 -Subject: [PATCH 12/29] eglibc: run libm-err-tab.pl with specific dirs in ${S} +Subject: [PATCH] eglibc: run libm-err-tab.pl with specific dirs in ${S} libm-err-tab.pl will parse all the files named "libm-test-ulps" in the given dir recursively. To avoid parsing the one in @@ -18,7 +18,7 @@ Signed-off-by: Ting Liu <b28495@freescale.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manual/Makefile b/manual/Makefile -index c61e11dcd7..5d859e6f84 100644 +index e83444341e..aa2645bc55 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -103,7 +103,8 @@ $(objpfx)stamp-libm-err: $(..)math/gen-libm-test.py \ @@ -31,6 +31,3 @@ index c61e11dcd7..5d859e6f84 100644 $(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi touch $@ --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0013-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/poky/meta/recipes-core/glibc/glibc/0013-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch index d875825ff..7f362cace 100644 --- a/poky/meta/recipes-core/glibc/glibc/0013-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch +++ b/poky/meta/recipes-core/glibc/glibc/0013-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch @@ -1,8 +1,8 @@ -From 86fea3409b89f9d8884053a519282f2f30d7ea87 Mon Sep 17 00:00:00 2001 +From 4b0d41a315e66f688fef7b0c2e2b6ce9fa16ec93 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:24:46 +0000 -Subject: [PATCH 13/29] __ieee754_sqrt{,f} are now inline functions and call - out __slow versions +Subject: [PATCH] __ieee754_sqrt{,f} are now inline functions and call out + __slow versions Upstream-Status: Pending @@ -56,6 +56,3 @@ index 812653558f..10de1f0cc3 100644 float b; #endif { --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0014-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch b/poky/meta/recipes-core/glibc/glibc/0014-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch index 954534bae..4da0e003c 100644 --- a/poky/meta/recipes-core/glibc/glibc/0014-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch +++ b/poky/meta/recipes-core/glibc/glibc/0014-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch @@ -1,7 +1,7 @@ -From a3c4f67fb3cb02855073a9cdbcf2881fb53144f0 Mon Sep 17 00:00:00 2001 +From c062a462fee53a30a85d693c8288b5bd8fe4ec6e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:27:10 +0000 -Subject: [PATCH 14/29] sysdeps/gnu/configure.ac: handle correctly +Subject: [PATCH] sysdeps/gnu/configure.ac: handle correctly $libc_cv_rootsbindir Upstream-Status:Pending @@ -37,6 +37,3 @@ index 634fe4de2a..3db1697f4f 100644 + test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin ;; esac --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch b/poky/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch index 04a9bf01c..15e83f891 100644 --- a/poky/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch +++ b/poky/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch @@ -1,7 +1,7 @@ -From 17a602b89cbe53a5a92d0153ccb013a737f028cb Mon Sep 17 00:00:00 2001 +From 0bd39d8907953f18e01742f42b24647ac7689d0a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:31:06 +0000 -Subject: [PATCH 15/29] 'yes' within the path sets wrong config variables +Subject: [PATCH] 'yes' within the path sets wrong config variables It seems that the 'AC_EGREP_CPP(yes...' example is quite popular but being such a short word to grep it is likely to produce @@ -29,10 +29,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure -index ac3cf6fd36..32add94df9 100644 +index 83c3a23e44..a68c946277 100644 --- a/sysdeps/aarch64/configure +++ b/sysdeps/aarch64/configure -@@ -148,12 +148,12 @@ else +@@ -157,12 +157,12 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __AARCH64EB__ @@ -48,10 +48,10 @@ index ac3cf6fd36..32add94df9 100644 else libc_cv_aarch64_be=no diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac -index 8b042d6d05..3cdd262951 100644 +index 66f755078a..a32b265bbe 100644 --- a/sysdeps/aarch64/configure.ac +++ b/sysdeps/aarch64/configure.ac -@@ -10,8 +10,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +@@ -17,8 +17,8 @@ AC_DEFINE(SUPPORT_STATIC_PIE) # the dynamic linker via %ifdef. AC_CACHE_CHECK([for big endian], [libc_cv_aarch64_be], @@ -165,7 +165,7 @@ index f05f43802b..dc8639902d 100644 ], libc_cv_nios2_be=yes, libc_cv_nios2_be=no)]) if test $libc_cv_nios2_be = yes; then diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure -index 25f98e0c7b..e95bfae359 100644 +index f25f2a3a65..1b7483e6c6 100644 --- a/sysdeps/unix/sysv/linux/mips/configure +++ b/sysdeps/unix/sysv/linux/mips/configure @@ -414,11 +414,11 @@ else @@ -183,7 +183,7 @@ index 25f98e0c7b..e95bfae359 100644 else libc_cv_mips_nan2008=no diff --git a/sysdeps/unix/sysv/linux/mips/configure.ac b/sysdeps/unix/sysv/linux/mips/configure.ac -index 3db1b32b08..f8cd375ebc 100644 +index 049a0f4bdf..005526d4e8 100644 --- a/sysdeps/unix/sysv/linux/mips/configure.ac +++ b/sysdeps/unix/sysv/linux/mips/configure.ac @@ -105,9 +105,9 @@ AC_COMPILE_IFELSE( @@ -258,6 +258,3 @@ index f9cba6e15d..b21f72f1e4 100644 #endif ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)]) if test $libc_cv_ppc64_def_call_elf = no; then --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch b/poky/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch index cd072018e..79bd70415 100644 --- a/poky/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch +++ b/poky/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch @@ -1,7 +1,7 @@ -From 4762386b599f5c3287310a69ad3555e0129e0c51 Mon Sep 17 00:00:00 2001 +From 3feb4213628f1485000ffe1d3fd26e37a7b14336 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:33:03 +0000 -Subject: [PATCH 16/29] timezone: re-written tzselect as posix sh +Subject: [PATCH] timezone: re-written tzselect as posix sh To avoid the bash dependency. @@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/timezone/Makefile b/timezone/Makefile -index 75f38df527..74e1ab7ff7 100644 +index 395abfeebd..2d939edf75 100644 --- a/timezone/Makefile +++ b/timezone/Makefile -@@ -122,7 +122,7 @@ $(testdata)/XT%: testdata/XT% +@@ -123,7 +123,7 @@ $(testdata)/XT%: testdata/XT% cp $< $@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make @@ -40,6 +40,3 @@ index 18fce27e24..70745f9d36 100755 # Output one argument as-is to standard output. # Safer than 'echo', which can mishandle '\' or leading '-'. --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch b/poky/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch index 57907fe66..c32d70b59 100644 --- a/poky/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch +++ b/poky/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch @@ -1,7 +1,7 @@ -From dac46c07736a799fc82be03aa546b2d24c19ad78 Mon Sep 17 00:00:00 2001 +From f6119b98a9caa80642d69a97edc98f57ecef5c3c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 31 Dec 2015 14:33:02 -0800 -Subject: [PATCH 17/29] Remove bash dependency for nscd init script +Subject: [PATCH] Remove bash dependency for nscd init script The nscd init script uses #! /bin/bash but only really uses one bashism (translated strings), so remove them and switch the shell to #!/bin/sh. @@ -70,6 +70,3 @@ index a882da7d8b..b02986ec15 100644 RETVAL=1 ;; esac --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch b/poky/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch index 58d41ffe0..826e5af46 100644 --- a/poky/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch +++ b/poky/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch @@ -1,7 +1,7 @@ -From 0bd1dedf77194151397c53b12e0355c2edb8bccc Mon Sep 17 00:00:00 2001 +From 060ba13b5ac5e90517d540f009ebdcdcf62f9685 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:42:58 +0000 -Subject: [PATCH 18/29] eglibc: Cross building and testing instructions +Subject: [PATCH] eglibc: Cross building and testing instructions Ported from eglibc Upstream-Status: Pending @@ -614,6 +614,3 @@ index 0000000000..b67b468466 +- Some tests require access to libstdc++.so.6 and libgcc_s.so.1; we + simply place copies of these libraries in the top GLIBC build + directory. --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch b/poky/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch index f633079f3..afac2e04f 100644 --- a/poky/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch +++ b/poky/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch @@ -1,7 +1,7 @@ -From 5591b7653411da26fa2939352e50ea4121b327e6 Mon Sep 17 00:00:00 2001 +From f13c2f525e9bc82ce13e4cf486f7fe0831fc3fac Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:49:28 +0000 -Subject: [PATCH 19/29] eglibc: Help bootstrap cross toolchain +Subject: [PATCH] eglibc: Help bootstrap cross toolchain Taken from EGLIBC, r1484 + r1525 @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> create mode 100644 include/stubs-bootstrap.h diff --git a/Makefile b/Makefile -index 6dcfe40c25..bc37c32e5a 100644 +index 50f99ca611..31eed15f02 100644 --- a/Makefile +++ b/Makefile @@ -79,9 +79,18 @@ subdir-dirs = include @@ -52,7 +52,7 @@ index 6dcfe40c25..bc37c32e5a 100644 ifeq (yes,$(build-shared)) headers += gnu/lib-names.h endif -@@ -407,6 +416,16 @@ others: $(common-objpfx)testrun.sh $(common-objpfx)debugglibc.sh +@@ -416,6 +425,16 @@ others: $(common-objpfx)testrun.sh $(common-objpfx)debugglibc.sh subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs) @@ -69,7 +69,7 @@ index 6dcfe40c25..bc37c32e5a 100644 ifndef abi-variants installed-stubs = $(inst_includedir)/gnu/stubs.h else -@@ -433,6 +452,7 @@ $(inst_includedir)/gnu/stubs.h: $(+force) +@@ -442,6 +461,7 @@ $(inst_includedir)/gnu/stubs.h: $(+force) install-others-nosubdir: $(installed-stubs) endif @@ -95,6 +95,3 @@ index 0000000000..1d2b669aff + difficult headers. The <gnu/stubs.h> header depends, via the + EGLIBC subdir 'stubs' make targets, on every .o file in EGLIBC, but + an empty stubs.h like this will do fine for GCC. */ --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch b/poky/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch index bb21c5472..9a610c670 100644 --- a/poky/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch +++ b/poky/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch @@ -1,7 +1,7 @@ -From d3451c186f96c6b2434a4ac9304c01730bf22061 Mon Sep 17 00:00:00 2001 +From 330c4e50e28e29c31fb8d6ab39cdbb2af4d3def7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:55:53 +0000 -Subject: [PATCH 20/29] eglibc: Resolve __fpscr_values on SH4 +Subject: [PATCH] eglibc: Resolve __fpscr_values on SH4 2010-09-29 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Andrew Stubbs <ams@codesourcery.com> @@ -33,7 +33,7 @@ index e0938c4165..ca1d7da339 100644 # a* alphasort64; diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.S b/sysdeps/unix/sysv/linux/sh/sysdep.S -index 85ff3f900e..7743b8d57a 100644 +index a18fbb2e8b..59421bfbb0 100644 --- a/sysdeps/unix/sysv/linux/sh/sysdep.S +++ b/sysdeps/unix/sysv/linux/sh/sysdep.S @@ -30,3 +30,14 @@ ENTRY (__syscall_error) @@ -51,6 +51,3 @@ index 85ff3f900e..7743b8d57a 100644 + .long 0x80000 +weak_alias (___fpscr_values, __fpscr_values) + --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch b/poky/meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch index 7fe5db0c2..0b2f020fd 100644 --- a/poky/meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch +++ b/poky/meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch @@ -1,7 +1,7 @@ -From e4b8abdc2d884d721fd89d67b689546f2f780924 Mon Sep 17 00:00:00 2001 +From 557ed640b26bd208ce8d4a6fd725b124893668d7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:33:49 +0000 -Subject: [PATCH 21/29] eglibc: Forward port cross locale generation support +Subject: [PATCH] eglibc: Forward port cross locale generation support Upstream-Status: Pending @@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> create mode 100644 locale/catnames.c diff --git a/locale/Makefile b/locale/Makefile -index 49c0c78c7d..ebfcf4f4da 100644 +index b7c60681fa..07c606cde3 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -26,7 +26,8 @@ headers = langinfo.h locale.h bits/locale.h \ @@ -89,7 +89,7 @@ index 0000000000..538f3f5edb + [LC_ALL] = sizeof ("LC_ALL") - 1 + }; diff --git a/locale/localeinfo.h b/locale/localeinfo.h -index fdc283c69a..4eeed35f90 100644 +index 22f9dc1140..fa31b3c5ea 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -230,7 +230,7 @@ __libc_tsd_define (extern, locale_t, LOCALE) @@ -102,7 +102,7 @@ index fdc283c69a..4eeed35f90 100644 # define NL_CURRENT_INDIRECT 1 #endif diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c -index 1a526a240d..0fb2daf936 100644 +index 4841bfd05d..ffcba1fd79 100644 --- a/locale/programs/charmap-dir.c +++ b/locale/programs/charmap-dir.c @@ -18,7 +18,9 @@ @@ -148,7 +148,7 @@ index 1a526a240d..0fb2daf936 100644 return NULL; } diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c -index feb1a11258..5a8e522470 100644 +index 0af21e05e2..4980b0c52f 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -349,7 +349,7 @@ new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen, @@ -197,7 +197,7 @@ index feb1a11258..5a8e522470 100644 == runp->wcnext->wcs[runp->nwcs - 1] + 1)); diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c -index 3328093d0e..d58fb0f4b7 100644 +index 2fb579bbbf..d0be99581c 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -915,7 +915,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap, @@ -279,7 +279,7 @@ index 3328093d0e..d58fb0f4b7 100644 srunp = srunp->next; } diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c -index f7db873adb..fec3773c9d 100644 +index dcd2a2386d..6814740325 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -220,8 +220,10 @@ No definition for %s category found"), "LC_TIME"); @@ -348,7 +348,7 @@ index f7db873adb..fec3773c9d 100644 diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c -index 7ebd933801..5753750756 100644 +index 96d3ab66db..3af379d2c3 100644 --- a/locale/programs/linereader.c +++ b/locale/programs/linereader.c @@ -595,7 +595,7 @@ get_string (struct linereader *lr, const struct charmap_t *charmap, @@ -361,7 +361,7 @@ index 7ebd933801..5753750756 100644 size_t bufmax = 56; diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c -index b048bd05b9..fed15c42ec 100644 +index 832c8fd1fc..fe689b3ae1 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -109,6 +109,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; @@ -407,7 +407,7 @@ index b048bd05b9..fed15c42ec 100644 force_output = 1; break; diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c -index eb2f4634da..d387147323 100644 +index 0f1affa1d4..7d86fae801 100644 --- a/locale/programs/locfile.c +++ b/locale/programs/locfile.c @@ -544,6 +544,9 @@ compare_files (const char *filename1, const char *filename2, size_t size, @@ -430,7 +430,7 @@ index eb2f4634da..d387147323 100644 /* Record that FILE's next element is the 32-bit integer VALUE. */ diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h -index 7ea10038b4..0888c09762 100644 +index c986d599ec..222a779176 100644 --- a/locale/programs/locfile.h +++ b/locale/programs/locfile.h @@ -71,6 +71,8 @@ extern void write_all_categories (struct localedef_t *definitions, @@ -519,7 +519,7 @@ index 7ea10038b4..0888c09762 100644 + #endif /* locfile.h */ diff --git a/locale/setlocale.c b/locale/setlocale.c -index 030f1727bd..096d8ed895 100644 +index 19ed85ae8e..f28ca11446 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -63,35 +63,6 @@ static char *const _nl_current_used[] = @@ -558,6 +558,3 @@ index 030f1727bd..096d8ed895 100644 #ifdef NL_CURRENT_INDIRECT # define WEAK_POSTLOAD(postload) weak_extern (postload) #else --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0022-Define-DUMMY_LOCALE_T-if-not-defined.patch b/poky/meta/recipes-core/glibc/glibc/0022-Define-DUMMY_LOCALE_T-if-not-defined.patch index 0e9318308..33d912d35 100644 --- a/poky/meta/recipes-core/glibc/glibc/0022-Define-DUMMY_LOCALE_T-if-not-defined.patch +++ b/poky/meta/recipes-core/glibc/glibc/0022-Define-DUMMY_LOCALE_T-if-not-defined.patch @@ -1,7 +1,7 @@ -From ad5bc87134871b99e082e2449b8c1ce2f1375ef9 Mon Sep 17 00:00:00 2001 +From c8df3cf4556d8d78a98675865395ce42f3b67109 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 20 Apr 2016 21:11:00 -0700 -Subject: [PATCH 22/29] Define DUMMY_LOCALE_T if not defined +Subject: [PATCH] Define DUMMY_LOCALE_T if not defined This is a hack to fix building the locale bits on an older CentOs 5.X machine @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 3 insertions(+) diff --git a/locale/programs/config.h b/locale/programs/config.h -index d76d9f7e8b..92b56d7df3 100644 +index 2edcf3696c..5350101e38 100644 --- a/locale/programs/config.h +++ b/locale/programs/config.h @@ -19,6 +19,9 @@ @@ -27,6 +27,3 @@ index d76d9f7e8b..92b56d7df3 100644 /* Use the internal textdomain used for libc messages. */ #define PACKAGE _libc_intl_domainname #ifndef VERSION --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch b/poky/meta/recipes-core/glibc/glibc/0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch index 7cbf6811a..a5a7a0cad 100644 --- a/poky/meta/recipes-core/glibc/glibc/0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch +++ b/poky/meta/recipes-core/glibc/glibc/0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch @@ -1,8 +1,7 @@ -From c5fd8a3d336b8288f631fb6b6dd85f9d1076f25b Mon Sep 17 00:00:00 2001 +From 2ec233ce078b74030de9195096058cd502fdc395 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 3 Aug 2018 09:42:06 -0700 -Subject: [PATCH 23/29] localedef --add-to-archive uses a hard-coded locale - path +Subject: [PATCH] localedef --add-to-archive uses a hard-coded locale path it doesn't exist in normal use, and there's no way to pass an alternative filename. @@ -19,7 +18,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c -index dccaf04e3b..ae0b7fe155 100644 +index 6bb189ae37..0711c5c44e 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -340,12 +340,24 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) @@ -79,6 +78,3 @@ index dccaf04e3b..ae0b7fe155 100644 { if (readonly) { --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch b/poky/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch index 02e73594a..d2691e1ee 100644 --- a/poky/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch +++ b/poky/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch @@ -1,7 +1,7 @@ -From dffa52364f8c54c455b2459ebe83f05cb6ffc9fc Mon Sep 17 00:00:00 2001 +From f8289aa320b00f6db43213979cceab2325a7a611 Mon Sep 17 00:00:00 2001 From: Mark Hatle <mark.hatle@windriver.com> Date: Thu, 18 Aug 2016 14:07:58 -0500 -Subject: [PATCH 24/29] elf/dl-deps.c: Make _dl_build_local_scope breadth first +Subject: [PATCH] elf/dl-deps.c: Make _dl_build_local_scope breadth first According to the ELF specification: @@ -24,7 +24,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/elf/dl-deps.c b/elf/dl-deps.c -index b5a43232a7..8aa8f37fa3 100644 +index 087a49b212..c09f9334f2 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -73,13 +73,19 @@ _dl_build_local_scope (struct link_map **list, struct link_map *map) @@ -51,6 +51,3 @@ index b5a43232a7..8aa8f37fa3 100644 return p - list; } --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0025-intl-Emit-no-lines-in-bison-generated-files.patch b/poky/meta/recipes-core/glibc/glibc/0025-intl-Emit-no-lines-in-bison-generated-files.patch index 700fb2887..32f8fd22b 100644 --- a/poky/meta/recipes-core/glibc/glibc/0025-intl-Emit-no-lines-in-bison-generated-files.patch +++ b/poky/meta/recipes-core/glibc/glibc/0025-intl-Emit-no-lines-in-bison-generated-files.patch @@ -1,7 +1,7 @@ -From bc3380877bd2a1f9368a913fa6a2ca1ee88fd95f Mon Sep 17 00:00:00 2001 +From 3156464f9a95bf1dafd2e22d19d7bf89c520acc1 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 3 Aug 2018 09:44:00 -0700 -Subject: [PATCH 25/29] intl: Emit no lines in bison generated files +Subject: [PATCH] intl: Emit no lines in bison generated files Improve reproducibility: Do not put any #line preprocessor commands in bison generated files. @@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intl/Makefile b/intl/Makefile -index ce3072420f..58457840d9 100644 +index 93478d87e8..b27a7935eb 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -155,7 +155,7 @@ $(objpfx)tst-gettext6.out: $(objpfx)tst-gettext.out @@ -29,6 +29,3 @@ index ce3072420f..58457840d9 100644 $(inst_localedir)/locale.alias: locale.alias $(+force) $(do-install) --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0026-inject-file-assembly-directives.patch b/poky/meta/recipes-core/glibc/glibc/0026-inject-file-assembly-directives.patch deleted file mode 100644 index 89eef82e1..000000000 --- a/poky/meta/recipes-core/glibc/glibc/0026-inject-file-assembly-directives.patch +++ /dev/null @@ -1,240 +0,0 @@ -From cf043d56638883157dbfaa8c6a8e2f63a6f66280 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 29 Nov 2018 17:29:35 -0800 -Subject: [PATCH 26/29] inject file assembly directives - -Currently, non-IA builds are not reproducibile since build paths are -being injected into the debug symbols. These are coming from the use of -.S assembler files during the glibc build. No STT_FILE section is added -during the assembly but when linking, ld decides to add one to aid -debugging and ensure references between the different object files its -linking remain clear. - -We can avoid this by injecting a file header into the assembler files -ahead of time, choosing a filename which does not contain build system -paths. - -This is a bit of a workaround/hack but does significantly reduce the -build system references in target binaries for the non-IA architectures -which use .S files. - -RP -2018/10/3 - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - csu/abi-note.c | 2 ++ - sysdeps/aarch64/crti.S | 2 ++ - sysdeps/aarch64/crtn.S | 1 + - sysdeps/aarch64/dl-tlsdesc.S | 2 ++ - sysdeps/aarch64/dl-trampoline.S | 2 ++ - sysdeps/aarch64/start.S | 2 ++ - sysdeps/arm/crti.S | 2 ++ - sysdeps/arm/crtn.S | 2 ++ - sysdeps/arm/dl-tlsdesc.S | 2 ++ - sysdeps/arm/dl-trampoline.S | 2 ++ - sysdeps/arm/start.S | 2 ++ - sysdeps/mips/start.S | 2 ++ - sysdeps/powerpc/powerpc32/dl-start.S | 2 ++ - sysdeps/powerpc/powerpc32/start.S | 2 ++ - sysdeps/powerpc/powerpc64/start.S | 2 ++ - sysdeps/unix/sysv/linux/aarch64/__read_tp.S | 2 ++ - sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S | 2 ++ - sysdeps/unix/sysv/linux/arm/libc-do-syscall.S | 2 ++ - sysdeps/unix/sysv/linux/powerpc/dl-brk.S | 2 ++ - 19 files changed, 37 insertions(+) - ---- a/sysdeps/aarch64/crti.S -+++ b/sysdeps/aarch64/crti.S -@@ -50,6 +50,8 @@ - # define PREINIT_FUNCTION_WEAK 1 - #endif - -+ .file "crti.S" -+ - #if PREINIT_FUNCTION_WEAK - weak_extern (PREINIT_FUNCTION) - #else ---- a/sysdeps/aarch64/crtn.S -+++ b/sysdeps/aarch64/crtn.S -@@ -38,6 +38,7 @@ - corresponding to the prologues in crti.S. */ - - #include <sysdep.h> -+ .file "crtn.S" - - .section .init,"ax",%progbits - ldp x29, x30, [sp], 16 ---- a/sysdeps/aarch64/dl-tlsdesc.S -+++ b/sysdeps/aarch64/dl-tlsdesc.S -@@ -22,6 +22,8 @@ - #include <tls.h> - #include "tlsdesc.h" - -+ .file "dl-tlsdesc.S" -+ - #define NSAVEDQREGPAIRS 16 - #define SAVE_Q_REGISTERS \ - stp q0, q1, [sp, #-32*NSAVEDQREGPAIRS]!; \ ---- a/sysdeps/aarch64/dl-trampoline.S -+++ b/sysdeps/aarch64/dl-trampoline.S -@@ -21,6 +21,8 @@ - - #include "dl-link.h" - -+ .file "dl-trampoline.S" -+ - #define ip0 x16 - #define ip0l PTR_REG (16) - #define ip1 x17 ---- a/sysdeps/aarch64/start.S -+++ b/sysdeps/aarch64/start.S -@@ -18,6 +18,8 @@ - - #include <sysdep.h> - -+ .file "start.S" -+ - /* This is the canonical entry point, usually the first thing in the text - segment. - ---- a/sysdeps/arm/crti.S -+++ b/sysdeps/arm/crti.S -@@ -57,6 +57,8 @@ - .hidden PREINIT_FUNCTION - #endif - -+ .file "crti.S" -+ - #if PREINIT_FUNCTION_WEAK - .p2align 2 - .type call_weak_fn, %function ---- a/sysdeps/arm/crtn.S -+++ b/sysdeps/arm/crtn.S -@@ -37,6 +37,8 @@ - #define NO_THUMB - #include <sysdep.h> - -+ .file "crtn.S" -+ - /* crtn.S puts function epilogues in the .init and .fini sections - corresponding to the prologues in crti.S. */ - ---- a/sysdeps/arm/dl-tlsdesc.S -+++ b/sysdeps/arm/dl-tlsdesc.S -@@ -21,6 +21,8 @@ - #include <tls.h> - #include "tlsdesc.h" - -+ .file "dl-tlsdesc.S" -+ - .text - @ emit debug information with cfi - @ use arm-specific pseudos for unwinding itself ---- a/sysdeps/arm/dl-trampoline.S -+++ b/sysdeps/arm/dl-trampoline.S -@@ -21,6 +21,8 @@ - #include <sysdep.h> - #include <libc-symbols.h> - -+ .file "dl-trampoline.S" -+ - .text - .globl _dl_runtime_resolve - .type _dl_runtime_resolve, #function ---- a/sysdeps/arm/start.S -+++ b/sysdeps/arm/start.S -@@ -57,6 +57,8 @@ - NULL - */ - -+ .file "start.S" -+ - /* Tag_ABI_align8_preserved: This code preserves 8-byte - alignment in any callee. */ - .eabi_attribute 25, 1 ---- a/sysdeps/mips/start.S -+++ b/sysdeps/mips/start.S -@@ -38,6 +38,8 @@ - #include <sgidefs.h> - #include <sys/asm.h> - -+ .file "start.S" -+ - #ifndef ENTRY_POINT - #error ENTRY_POINT needs to be defined for start.S on MIPS/ELF. - #endif ---- a/sysdeps/powerpc/powerpc32/dl-start.S -+++ b/sysdeps/powerpc/powerpc32/dl-start.S -@@ -18,6 +18,8 @@ - - #include <sysdep.h> - -+ .file "dl-start.S" -+ - /* Initial entry point code for the dynamic linker. - The C function `_dl_start' is the real entry point; - its return value is the user program's entry point. */ ---- a/sysdeps/powerpc/powerpc32/start.S -+++ b/sysdeps/powerpc/powerpc32/start.S -@@ -35,6 +35,8 @@ - - #include <sysdep.h> - -+ .file "start.S" -+ - /* We do not want .eh_frame info for crt1.o since crt1.o is linked - before crtbegin.o, the file defining __EH_FRAME_BEGIN__. */ - #undef cfi_startproc ---- a/sysdeps/powerpc/powerpc64/start.S -+++ b/sysdeps/powerpc/powerpc64/start.S -@@ -35,6 +35,8 @@ - - #include <sysdep.h> - -+ .file "start.S" -+ - /* We do not want .eh_frame info for crt1.o since crt1.o is linked - before crtbegin.o, the file defining __EH_FRAME_BEGIN__. */ - #undef cfi_startproc ---- a/sysdeps/unix/sysv/linux/aarch64/__read_tp.S -+++ b/sysdeps/unix/sysv/linux/aarch64/__read_tp.S -@@ -18,6 +18,8 @@ - - #include <sysdep.h> - -+ .file "__read_tp.S" -+ - .hidden __read_tp - ENTRY (__read_tp) - mrs x0, tpidr_el0 ---- a/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S -+++ b/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S -@@ -39,6 +39,8 @@ - a normal function call) in a high page of memory; tail call to the - helper. */ - -+ .file "aeabi_read_tp.S" -+ - .hidden __aeabi_read_tp - ENTRY (__aeabi_read_tp) - #ifdef ARCH_HAS_HARD_TP ---- a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S -+++ b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S -@@ -27,6 +27,8 @@ - ARM unwind tables for register to register moves, the actual opcodes - are not defined. */ - -+ .file "libc-do-syscall.S" -+ - #if defined(__thumb__) - .thumb - .syntax unified ---- a/sysdeps/unix/sysv/linux/powerpc/dl-brk.S -+++ b/sysdeps/unix/sysv/linux/powerpc/dl-brk.S -@@ -1 +1,3 @@ -+ .file "dl-brk.S" -+ - #include <brk.S> diff --git a/poky/meta/recipes-core/glibc/glibc/0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch b/poky/meta/recipes-core/glibc/glibc/0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch index d2c88d235..782d931f2 100644 --- a/poky/meta/recipes-core/glibc/glibc/0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch +++ b/poky/meta/recipes-core/glibc/glibc/0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch @@ -1,7 +1,7 @@ -From 10aef8f0671d814aaf910ababc0225cf6f0a46e8 Mon Sep 17 00:00:00 2001 +From 881f5b8134afd9a30049b93fc79dda7a44947a5f Mon Sep 17 00:00:00 2001 From: Martin Jansa <martin.jansa@gmail.com> Date: Mon, 17 Dec 2018 21:36:18 +0000 -Subject: [PATCH 27/29] locale: prevent maybe-uninitialized errors with -Os [BZ +Subject: [PATCH] locale: prevent maybe-uninitialized errors with -Os [BZ #19444] Fixes following error when building for aarch64 with -Os: @@ -33,7 +33,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 7 insertions(+) diff --git a/locale/weight.h b/locale/weight.h -index e071253f85..2889c395f1 100644 +index 723e1fefda..f5798d379a 100644 --- a/locale/weight.h +++ b/locale/weight.h @@ -28,7 +28,14 @@ findidx (const int32_t *table, @@ -51,6 +51,3 @@ index e071253f85..2889c395f1 100644 const unsigned char *cp; const unsigned char *usrc; --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch b/poky/meta/recipes-core/glibc/glibc/0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch index 25c046f5c..d273cab4a 100644 --- a/poky/meta/recipes-core/glibc/glibc/0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch +++ b/poky/meta/recipes-core/glibc/glibc/0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch @@ -1,8 +1,7 @@ -From 70731329feb7ba20364aa37aed83d920de97f028 Mon Sep 17 00:00:00 2001 +From b4e0a034b12b313dcb82d22341bef6a66b3e9ef9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:11:22 +0000 -Subject: [PATCH 28/29] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known - names +Subject: [PATCH] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known names This bolts in a hook for OE to pass its own version of interpreter names into glibc especially for multilib case, where it differs from any @@ -17,7 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+) diff --git a/elf/readlib.c b/elf/readlib.c -index 994a4426a1..baabf099b1 100644 +index 7383c23249..e97ea9449d 100644 --- a/elf/readlib.c +++ b/elf/readlib.c @@ -51,6 +51,7 @@ static struct known_names interpreters[] = @@ -28,6 +27,3 @@ index 994a4426a1..baabf099b1 100644 }; static struct known_names known_libs[] = --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/poky/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch index 0ebf8a618..11a77cdf9 100644 --- a/poky/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +++ b/poky/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch @@ -1,7 +1,7 @@ -From bf1c4b2f01c5f86bb770fd1711a69ea727e0f56e Mon Sep 17 00:00:00 2001 +From 2ae3ff3ae28abb1d0d100b4722da7ff188de9a30 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 15 May 2020 17:05:45 -0700 -Subject: [PATCH 29/29] wordsize.h: Unify the header between arm and aarch64 +Subject: [PATCH] wordsize.h: Unify the header between arm and aarch64 This helps OE multilibs to not sythesize this header which causes all kind of recursions and other issues since wordsize is fundamental header @@ -11,13 +11,13 @@ Upstream-Status: Inappropriate [ OE-Specific ] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- - sysdeps/{aarch64 => arm}/bits/wordsize.h | 8 ++++++-- - 2 files changed, 12 insertions(+), 4 deletions(-) - copy sysdeps/{aarch64 => arm}/bits/wordsize.h (85%) + sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- + sysdeps/{aarch64 => arm}/bits/wordsize.h | 10 +++++++--- + 2 files changed, 13 insertions(+), 5 deletions(-) + copy sysdeps/{aarch64 => arm}/bits/wordsize.h (80%) diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h -index ee01841773..34fcdef1f1 100644 +index 91da566b74..9a754514b3 100644 --- a/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/aarch64/bits/wordsize.h @@ -17,12 +17,16 @@ @@ -40,12 +40,20 @@ index ee01841773..34fcdef1f1 100644 #define __WORDSIZE_TIME64_COMPAT32 0 diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h -similarity index 85% +similarity index 80% copy from sysdeps/aarch64/bits/wordsize.h copy to sysdeps/arm/bits/wordsize.h -index ee01841773..34fcdef1f1 100644 +index 91da566b74..34fcdef1f1 100644 --- a/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/arm/bits/wordsize.h +@@ -1,6 +1,6 @@ + /* Determine the wordsize from the preprocessor defines. + +- Copyright (C) 2016-2021 Free Software Foundation, Inc. ++ Copyright (C) 2016-2021 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 @@ -17,12 +17,16 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ @@ -65,6 +73,3 @@ index ee01841773..34fcdef1f1 100644 #endif #define __WORDSIZE_TIME64_COMPAT32 0 --- -2.27.0 - diff --git a/poky/meta/recipes-core/glibc/glibc/0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch b/poky/meta/recipes-core/glibc/glibc/0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch index a76455236..5ef1ac2ed 100644 --- a/poky/meta/recipes-core/glibc/glibc/0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch +++ b/poky/meta/recipes-core/glibc/glibc/0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch @@ -1,7 +1,7 @@ -From 8b1d521290218df8ceeaf2e6ee44a54b19d8d328 Mon Sep 17 00:00:00 2001 +From 5cc14938f05ae1354c8062f017a21f39d5fc9729 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Aug 2020 14:31:16 -0700 -Subject: [PATCH 30/30] powerpc: Do not ask compiler for finding arch +Subject: [PATCH] powerpc: Do not ask compiler for finding arch This does not work well in cross compiling environments like OE and moreover it uses its own -mcpu/-march options via cflags @@ -46,6 +46,3 @@ index 6c63bd8257..3e925f1d48 100644 # Note if you add patterns here you must ensure that an appropriate # directory exists in sysdeps/powerpc. Likewise, if we find a # cpu, don't let the generic configure append extra compiler options. --- -2.28.0 - 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 deleted file mode 100644 index a458a2a22..000000000 --- a/poky/meta/recipes-core/glibc/glibc/0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 75a193b7611bade31a150dfcc528b973e3d46231 Mon Sep 17 00:00:00 2001 -From: Adhemerval Zanella <adhemerval.zanella@linaro.org> -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 <lukma@denx.de> -Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=75a193b7611bade31a150dfcc528b973e3d46231] -Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> ---- - 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 -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sys/time.h> -+#include <stdlib.h> -+ -+#include <errno.h> -+#include <support/check.h> -+ -+ -+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 <support/test-driver.c> diff --git a/poky/meta/recipes-core/glibc/glibc/0031-x86-Require-full-ISA-support-for-x86-64-level-marker.patch b/poky/meta/recipes-core/glibc/glibc/0031-x86-Require-full-ISA-support-for-x86-64-level-marker.patch new file mode 100644 index 000000000..3cb60b2e5 --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/0031-x86-Require-full-ISA-support-for-x86-64-level-marker.patch @@ -0,0 +1,116 @@ +From b1971f6f1331d738d1d6b376b4741668a7546125 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" <hjl.tools@gmail.com> +Date: Tue, 2 Feb 2021 13:45:58 -0800 +Subject: [PATCH] x86: Require full ISA support for x86-64 level marker [BZ #27318] + +Since -march=sandybridge enables ISAs in x86-64 ISA level v3, the v3 +marker is set on libc.so. We couldn't set the needed ISA marker to v2 +since this libc won't run on all v2 machines. Technically, the v3 marker +is correct. But the resulting libc.so won't run on Sandy Brigde, which +is a v2 machine, even when libc is compiled with -march=sandybridge: + +$ ./elf/ld.so ./libc.so +./libc.so: (p) CPU ISA level is lower than required: needed: 7; got: 3 + +Instead, we require full ISA support for x86-64 level marker and disable +x86-64 level marker for -march=sandybridge which enables ISAs between v2 +and v3. + +Upstream-Status: Submitted [https://sourceware.org/pipermail/libc-alpha/2021-February/122297.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + + sysdeps/x86/configure | 7 ++++++- + sysdeps/x86/configure.ac | 2 +- + sysdeps/x86/isa-level.c | 21 ++++++++++++++++++++- + 3 files changed, 27 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure +index 5e32dc62b3..5b20646843 100644 +--- a/sysdeps/x86/configure ++++ b/sysdeps/x86/configure +@@ -133,7 +133,12 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -nostartfiles -nostdlib -r -o conftest c + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + count=`LC_ALL=C $READELF -n conftest | grep NT_GNU_PROPERTY_TYPE_0 | wc -l` +- if test "$count" = 1; then ++ if test "$count" = 1 && { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -DINCLUDE_X86_ISA_LEVEL -S -o conftest.s $srcdir/sysdeps/x86/isa-level.c' ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then + libc_cv_include_x86_isa_level=yes + fi + fi +diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac +index f94088f377..54ecd33d2c 100644 +--- a/sysdeps/x86/configure.ac ++++ b/sysdeps/x86/configure.ac +@@ -100,7 +100,7 @@ EOF + libc_cv_include_x86_isa_level=no + if AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS -nostartfiles -nostdlib -r -o conftest conftest1.S conftest2.S); then + count=`LC_ALL=C $READELF -n conftest | grep NT_GNU_PROPERTY_TYPE_0 | wc -l` +- if test "$count" = 1; then ++ if test "$count" = 1 && AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS -DINCLUDE_X86_ISA_LEVEL -S -o conftest.s $srcdir/sysdeps/x86/isa-level.c); then + libc_cv_include_x86_isa_level=yes + fi + fi +diff --git a/sysdeps/x86/isa-level.c b/sysdeps/x86/isa-level.c +index aaf524cb56..7f83449061 100644 +--- a/sysdeps/x86/isa-level.c ++++ b/sysdeps/x86/isa-level.c +@@ -25,12 +25,17 @@ + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +-#include <elf.h> ++#ifdef _LIBC ++# include <elf.h> ++#endif + + /* ELF program property for x86 ISA level. */ + #ifdef INCLUDE_X86_ISA_LEVEL + # if defined __x86_64__ || defined __FXSR__ || !defined _SOFT_FLOAT \ + || defined __MMX__ || defined __SSE__ || defined __SSE2__ ++# if !defined __SSE__ || !defined __SSE2__ ++# error "Missing ISAs for x86-64 ISA level baseline" ++# endif + # define ISA_BASELINE GNU_PROPERTY_X86_ISA_1_BASELINE + # else + # define ISA_BASELINE 0 +@@ -40,6 +45,11 @@ + || (defined __x86_64__ && defined __LAHF_SAHF__) \ + || defined __POPCNT__ || defined __SSE3__ \ + || defined __SSSE3__ || defined __SSE4_1__ || defined __SSE4_2__ ++# if !defined __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16 \ ++ || !defined __POPCNT__ || !defined __SSE3__ \ ++ || !defined __SSSE3__ || !defined __SSE4_1__ || !defined __SSE4_2__ ++# error "Missing ISAs for x86-64 ISA level v2" ++# endif + # define ISA_V2 GNU_PROPERTY_X86_ISA_1_V2 + # else + # define ISA_V2 0 +@@ -48,6 +58,10 @@ + # if defined __AVX__ || defined __AVX2__ || defined __F16C__ \ + || defined __FMA__ || defined __LZCNT__ || defined __MOVBE__ \ + || defined __XSAVE__ ++# if !defined __AVX__ || !defined __AVX2__ || !defined __F16C__ \ ++ || !defined __FMA__ || !defined __LZCNT__ ++# error "Missing ISAs for x86-64 ISA level v3" ++# endif + # define ISA_V3 GNU_PROPERTY_X86_ISA_1_V3 + # else + # define ISA_V3 0 +@@ -55,6 +69,11 @@ + + # if defined __AVX512F__ || defined __AVX512BW__ || defined __AVX512CD__ \ + || defined __AVX512DQ__ || defined __AVX512VL__ ++# if !defined __AVX512F__ || !defined __AVX512BW__ \ ++ || !defined __AVX512CD__ || !defined __AVX512DQ__ \ ++ || !defined __AVX512VL__ ++# error "Missing ISAs for x86-64 ISA level v4" ++# endif + # define ISA_V4 GNU_PROPERTY_X86_ISA_1_V4 + # else + # define ISA_V4 0 diff --git a/poky/meta/recipes-core/glibc/glibc/0032-string-Work-around-GCC-PR-98512-in-rawmemchr.patch b/poky/meta/recipes-core/glibc/glibc/0032-string-Work-around-GCC-PR-98512-in-rawmemchr.patch new file mode 100644 index 000000000..e904b28a0 --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/0032-string-Work-around-GCC-PR-98512-in-rawmemchr.patch @@ -0,0 +1,58 @@ +From 044e603b698093cf48f6e6229e0b66acf05227e4 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Fri, 19 Feb 2021 13:29:00 +0100 +Subject: [PATCH] string: Work around GCC PR 98512 in rawmemchr + +Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=044e603b698093cf48f6e6229e0b66acf05227e4] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + string/rawmemchr.c | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +diff --git a/string/rawmemchr.c b/string/rawmemchr.c +index 59bbeeaa42..b8523118e5 100644 +--- a/string/rawmemchr.c ++++ b/string/rawmemchr.c +@@ -22,24 +22,28 @@ + # define RAWMEMCHR __rawmemchr + #endif + +-/* Find the first occurrence of C in S. */ +-void * +-RAWMEMCHR (const void *s, int c) +-{ +- DIAG_PUSH_NEEDS_COMMENT; ++/* The pragmata should be nested inside RAWMEMCHR below, but that ++ triggers GCC PR 98512. */ ++DIAG_PUSH_NEEDS_COMMENT; + #if __GNUC_PREREQ (7, 0) +- /* GCC 8 warns about the size passed to memchr being larger than +- PTRDIFF_MAX; the use of SIZE_MAX is deliberate here. */ +- DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-overflow="); ++/* GCC 8 warns about the size passed to memchr being larger than ++ PTRDIFF_MAX; the use of SIZE_MAX is deliberate here. */ ++DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-overflow="); + #endif + #if __GNUC_PREREQ (11, 0) +- /* Likewise GCC 11, with a different warning option. */ +- DIAG_IGNORE_NEEDS_COMMENT (11, "-Wstringop-overread"); ++/* Likewise GCC 11, with a different warning option. */ ++DIAG_IGNORE_NEEDS_COMMENT (11, "-Wstringop-overread"); + #endif ++ ++/* Find the first occurrence of C in S. */ ++void * ++RAWMEMCHR (const void *s, int c) ++{ + if (c != '\0') + return memchr (s, c, (size_t)-1); +- DIAG_POP_NEEDS_COMMENT; + return (char *)s + strlen (s); + } + libc_hidden_def (__rawmemchr) + weak_alias (__rawmemchr, rawmemchr) ++ ++DIAG_POP_NEEDS_COMMENT; +-- +2.30.1 + diff --git a/poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch b/poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch deleted file mode 100644 index 134b4e361..000000000 --- a/poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 228edd356f03bf62dcf2b1335f25d43c602ee68d Mon Sep 17 00:00:00 2001 -From: Michael Colavita <mcolavita@fb.com> -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 <zhixiong.chi@windriver.com> ---- - 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 -+ <http://www.gnu.org/licenses/>. */ -+ -+/* Derived from BZ #26923 */ -+#include <errno.h> -+#include <iconv.h> -+#include <stdio.h> -+#include <support/check.h> -+ -+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 <support/test-driver.c> --- -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 deleted file mode 100644 index 0f54d72ca..000000000 --- a/poky/meta/recipes-core/glibc/glibc/CVE-2020-29573.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 681900d29683722b1cb0a8e565a0585846ec5a61 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -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 <zhixiong.chi@windriver.com> ---- - 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/faccessat2-perm.patch b/poky/meta/recipes-core/glibc/glibc/faccessat2-perm.patch new file mode 100644 index 000000000..2ee7110ca --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/faccessat2-perm.patch @@ -0,0 +1,31 @@ +Older seccomp-based filters used in container frameworks will block faccessat2 +calls as it's a relatively new syscall. This isn't a big problem with +glibc <2.33 but 2.33 will call faccessat2 itself, get EPERM, and thenn be confused +about what to do as EPERM isn't an expected error code. + +This manifests itself as mysterious errors, for example a kernel failing to link. + +The root cause of bad seccomp filters is mostly fixed (systemd 247, Docker 20.10.0) +but we can't expect everyone to upgrade, so add a workaound (originally from +Red Hat) to handle EPERM like ENOSYS and fallback to faccessat(). + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/sysdeps/unix/sysv/linux/faccessat.c b/sysdeps/unix/sysv/linux/faccessat.c +index 56cb6dcc8b4d58d3..5de75032bbc93a2c 100644 +--- a/sysdeps/unix/sysv/linux/faccessat.c ++++ b/sysdeps/unix/sysv/linux/faccessat.c +@@ -34,7 +34,11 @@ faccessat (int fd, const char *file, int mode, int flag) + #if __ASSUME_FACCESSAT2 + return ret; + #else +- if (ret == 0 || errno != ENOSYS) ++ /* Fedora-specific workaround: ++ As a workround for a broken systemd-nspawn that returns ++ EPERM when a syscall is not allowed instead of ENOSYS ++ we must check for EPERM here and fall back to faccessat. */ ++ if (ret == 0 || !(errno == ENOSYS || errno == EPERM)) + return ret; + + if (flag & ~(AT_SYMLINK_NOFOLLOW | AT_EACCESS)) diff --git a/poky/meta/recipes-core/glibc/glibc_2.32.bb b/poky/meta/recipes-core/glibc/glibc_2.33.bb index b850c28c7..c47826a51 100644 --- a/poky/meta/recipes-core/glibc/glibc_2.32.bb +++ b/poky/meta/recipes-core/glibc/glibc_2.33.bb @@ -12,6 +12,7 @@ NATIVESDKFIXES_class-nativesdk = "\ file://0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch \ file://0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch \ file://0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch \ + file://faccessat2-perm.patch \ " SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ @@ -38,14 +39,12 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ file://0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \ file://0025-intl-Emit-no-lines-in-bison-generated-files.patch \ - file://0026-inject-file-assembly-directives.patch \ file://0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \ 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 \ + file://0031-x86-Require-full-ISA-support-for-x86-64-level-marker.patch \ + file://0032-string-Work-around-GCC-PR-98512-in-rawmemchr.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}" @@ -78,6 +77,9 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" +EXTRA_OECONF_append_x86 = " --enable-cet" +EXTRA_OECONF_append_x86-64 = " --enable-cet" + PACKAGECONFIG ??= "nscd" PACKAGECONFIG[nscd] = "--enable-nscd,--disable-nscd" diff --git a/poky/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb b/poky/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb index 5b425da95..c0a90a397 100644 --- a/poky/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb +++ b/poky/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb @@ -1,4 +1,5 @@ SUMMARY = "ifupdown: basic ifup and ifdown used by initscripts" +HOMEPAGE = "https://salsa.debian.org/debian/ifupdown" DESCRIPTION = "High level tools to configure network interfaces \ This package provides the tools ifup and ifdown which may be used to \ configure (or, respectively, deconfigure) network interfaces, based on \ diff --git a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 8b9502621..705ff63cf 100644 --- a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -20,11 +20,11 @@ IMAGE_ROOTFS_EXTRA_SPACE = "41943040" APPEND += "rootfstype=ext4 quiet" DEPENDS = "zip-native python3-pip-native" -IMAGE_FSTYPES = "wic.vmdk" +IMAGE_FSTYPES = "wic.vmdk wic.vhd wic.vhdx" inherit core-image module-base setuptools3 -SRCREV ?= "89ae28983c5fb3ce9d13fd337450ac709cc5efcd" +SRCREV ?= "e56305dd709ae2af2da7a7599984b3ad18c4970f" SRC_URI = "git://git.yoctoproject.org/poky \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ @@ -129,6 +129,8 @@ create_bundle_files () { mkdir -p Yocto_Build_Appliance cp *.vmx* Yocto_Build_Appliance ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic.vmdk Yocto_Build_Appliance/Yocto_Build_Appliance.vmdk + ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic.vhdx Yocto_Build_Appliance/Yocto_Build_Appliance.vhdx + ln -sf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.wic.vhd Yocto_Build_Appliance/Yocto_Build_Appliance.vhd zip -r ${IMGDEPLOYDIR}/Yocto_Build_Appliance-${DATETIME}.zip Yocto_Build_Appliance ln -sf Yocto_Build_Appliance-${DATETIME}.zip ${IMGDEPLOYDIR}/Yocto_Build_Appliance.zip } diff --git a/poky/meta/recipes-core/images/core-image-tiny-initramfs.bb b/poky/meta/recipes-core/images/core-image-tiny-initramfs.bb index 584990074..47470849e 100644 --- a/poky/meta/recipes-core/images/core-image-tiny-initramfs.bb +++ b/poky/meta/recipes-core/images/core-image-tiny-initramfs.bb @@ -27,7 +27,7 @@ IMAGE_ROOTFS_SIZE = "8192" IMAGE_ROOTFS_EXTRA_SPACE = "0" # Use the same restriction as initramfs-live-install -COMPATIBLE_HOST = "(i.86|x86_64).*-linux" +COMPATIBLE_HOST = "(i.86|x86_64|aarch64).*-linux" python tinyinitrd () { # Modify our init file so the user knows we drop to shell prompt on purpose diff --git a/poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh index b6855b5aa..f667518b8 100644 --- a/poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -279,6 +279,11 @@ fi umount /tgt_root +# copy any extra files needed for ESP +if [ -d /run/media/$1/esp ]; then + cp -r /run/media/$1/esp/* /boot +fi + # Copy kernel artifacts. To add more artifacts just add to types # For now just support kernel types already being used by something in OE-core for types in bzImage zImage vmlinux vmlinuz fitImage; do diff --git a/poky/meta/recipes-core/kbd/kbd_2.4.0.bb b/poky/meta/recipes-core/kbd/kbd_2.4.0.bb index 65ba70bf4..b557d691b 100644 --- a/poky/meta/recipes-core/kbd/kbd_2.4.0.bb +++ b/poky/meta/recipes-core/kbd/kbd_2.4.0.bb @@ -1,5 +1,6 @@ SUMMARY = "Keytable files and keyboard utilities" HOMEPAGE = "http://www.kbd-project.org/" +DESCRIPTION = "The kbd project contains tools for managing Linux console (Linux console, virtual terminals, keyboard, etc.) – mainly, what they do is loading console fonts and keyboard maps." # everything minus console-fonts is GPLv2+ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.17.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.18.bb index ba74eb1f9..ba74eb1f9 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.17.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.18.bb diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt.inc b/poky/meta/recipes-core/libxcrypt/libxcrypt.inc index 104a2af4d..e9f968b55 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -3,14 +3,14 @@ DESCRIPTION = "Forked code from glibc libary to extract only crypto part." HOMEPAGE = "https://github.com/besser82/libxcrypt" SECTION = "libs" LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSING;md5=102923b6e1b02a85c5a1203fa87d151d \ +LIC_FILES_CHKSUM = "file://LICENSING;md5=bd5d9777dfe7076c4f2928f12fed226a \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "6b110bcd4f4caa61fc39c7339d30adc20a7dd177" +SRCREV = "94d84f92ca123d851586016c4678eb1f21c19029" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.17.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.18.bb index 79dba2f6d..79dba2f6d 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.17.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.18.bb diff --git a/poky/meta/recipes-core/meta/buildtools-extended-tarball.bb b/poky/meta/recipes-core/meta/buildtools-extended-tarball.bb index 081648675..83e3fddcc 100644 --- a/poky/meta/recipes-core/meta/buildtools-extended-tarball.bb +++ b/poky/meta/recipes-core/meta/buildtools-extended-tarball.bb @@ -28,11 +28,21 @@ TOOLCHAIN_HOST_TASK += "\ nativesdk-libtool \ nativesdk-pkgconfig \ nativesdk-glibc-utils \ + nativesdk-glibc-gconv-ibm850 \ + nativesdk-glibc-gconv-iso8859-1 \ + nativesdk-glibc-gconv-utf-16 \ + nativesdk-glibc-gconv-cp1250 \ + nativesdk-glibc-gconv-cp1251 \ + nativesdk-glibc-gconv-cp1252 \ + nativesdk-glibc-gconv-euc-jp \ + nativesdk-glibc-gconv-libjis \ nativesdk-libxcrypt-dev \ nativesdk-parted \ nativesdk-dosfstools \ nativesdk-gptfdisk \ " +# gconv-cp1250, cp1251 and euc-jp needed for iconv to work in vim builds +# also copied list from uninative TOOLCHAIN_OUTPUTNAME = "${SDK_ARCH}-buildtools-extended-nativesdk-standalone-${DISTRO_VERSION}" diff --git a/poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb b/poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb index cfa41c4ae..4909401c5 100644 --- a/poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb +++ b/poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb @@ -17,13 +17,19 @@ DUMMYPROVIDES_PACKAGES = "\ nativesdk-perl-module-file-path \ nativesdk-perl-module-file-spec \ nativesdk-perl-module-file-stat \ + nativesdk-perl-module-file-temp \ nativesdk-perl-module-getopt-long \ nativesdk-perl-module-io-file \ + nativesdk-perl-module-list-util \ nativesdk-perl-module-overloading \ nativesdk-perl-module-posix \ + nativesdk-perl-module-scalar-util \ + nativesdk-perl-module-strict \ + nativesdk-perl-module-text-parsewords \ nativesdk-perl-module-thread-queue \ nativesdk-perl-module-threads \ nativesdk-perl-module-warnings \ + nativesdk-perl-module-vars \ " DUMMYPROVIDES = "\ 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 deleted file mode 100644 index 35c8b6574..000000000 --- a/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch +++ /dev/null @@ -1,241 +0,0 @@ -From b0124f3c4f2a353506621d387135ebea6b8c6609 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 29 Oct 2020 22:40:53 -0700 -Subject: [PATCH] crt: Add .file directive - -Musl linked binaries come out to be not reproducible because -absolute build path is seen in debug info of crti.o and crtn.o -This is due to the fact that these objects are built from assembly -source files and they are missing .file directive -if we add .file <filename>.s in them then debug info encodes this -value instead of absolute path in debug_line section - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - crt/aarch64/crti.s | 1 + - crt/aarch64/crtn.s | 1 + - crt/arm/crti.s | 1 + - crt/arm/crtn.s | 1 + - crt/i386/crti.s | 1 + - crt/i386/crtn.s | 1 + - crt/microblaze/crti.s | 1 + - crt/microblaze/crtn.s | 1 + - crt/mips/crti.s | 1 + - crt/mips/crtn.s | 1 + - crt/mips64/crti.s | 1 + - crt/mips64/crtn.s | 1 + - crt/mipsn32/crti.s | 1 + - crt/mipsn32/crtn.s | 1 + - crt/or1k/crti.s | 1 + - crt/or1k/crtn.s | 1 + - crt/powerpc/crti.s | 1 + - crt/powerpc/crtn.s | 1 + - crt/powerpc64/crti.s | 1 + - crt/powerpc64/crtn.s | 1 + - crt/s390x/crti.s | 1 + - crt/s390x/crtn.s | 1 + - crt/sh/crti.s | 1 + - crt/sh/crtn.s | 1 + - crt/x32/crti.s | 1 + - crt/x32/crtn.s | 1 + - crt/x86_64/crti.s | 1 + - crt/x86_64/crtn.s | 1 + - 28 files changed, 28 insertions(+) - ---- a/crt/aarch64/crti.s -+++ b/crt/aarch64/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .section .init - .global _init - .type _init,%function ---- a/crt/aarch64/crtn.s -+++ b/crt/aarch64/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .section .init - ldp x29,x30,[sp],#16 - ret ---- a/crt/arm/crti.s -+++ b/crt/arm/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .syntax unified - - .section .init ---- a/crt/arm/crtn.s -+++ b/crt/arm/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .syntax unified - - .section .init ---- a/crt/i386/crti.s -+++ b/crt/i386/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .section .init - .global _init - _init: ---- a/crt/i386/crtn.s -+++ b/crt/i386/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .section .init - add $12,%esp - ret ---- a/crt/microblaze/crti.s -+++ b/crt/microblaze/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .section .init - .global _init - .align 2 ---- a/crt/microblaze/crtn.s -+++ b/crt/microblaze/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .section .init - lwi r15, r1, 0 - rtsd r15, 8 ---- a/crt/mips/crti.s -+++ b/crt/mips/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .set noreorder - - .section .init ---- a/crt/mips/crtn.s -+++ b/crt/mips/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .set noreorder - - .section .init ---- a/crt/mips64/crti.s -+++ b/crt/mips64/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .set noreorder - - .section .init ---- a/crt/mips64/crtn.s -+++ b/crt/mips64/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .set noreorder - - .section .init ---- a/crt/mipsn32/crti.s -+++ b/crt/mipsn32/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .set noreorder - .section .init - .global _init ---- a/crt/mipsn32/crtn.s -+++ b/crt/mipsn32/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .set noreorder - .section .init - ld $gp, 16($sp) ---- a/crt/or1k/crti.s -+++ b/crt/or1k/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .section .init - .global _init - _init: ---- a/crt/or1k/crtn.s -+++ b/crt/or1k/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .section .init - l.lwz r9,0(r1) - l.jr r9 ---- a/crt/powerpc/crti.s -+++ b/crt/powerpc/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .section .init - .align 2 - .global _init ---- a/crt/powerpc/crtn.s -+++ b/crt/powerpc/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .section .init - .align 2 - lwz 0,36(1) ---- a/crt/powerpc64/crti.s -+++ b/crt/powerpc64/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .section .init - .align 2 - .global _init ---- a/crt/powerpc64/crtn.s -+++ b/crt/powerpc64/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .section .init - .align 2 - addi 1, 1, 32 ---- a/crt/s390x/crti.s -+++ b/crt/s390x/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .section .init - .align 2 - .global _init ---- a/crt/s390x/crtn.s -+++ b/crt/s390x/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .section .init - .align 2 - lmg %r14, %r15, 272(%r15) ---- a/crt/sh/crti.s -+++ b/crt/sh/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .section .init - .global _init - .type _init, @function ---- a/crt/sh/crtn.s -+++ b/crt/sh/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .section .init - lds.l @r15+, pr - mov.l @r15+, r14 ---- a/crt/x32/crti.s -+++ b/crt/x32/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .section .init - .global _init - _init: ---- a/crt/x32/crtn.s -+++ b/crt/x32/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .section .init - pop %rax - ret ---- a/crt/x86_64/crti.s -+++ b/crt/x86_64/crti.s -@@ -1,3 +1,4 @@ -+.file "crti.s" - .section .init - .global _init - _init: ---- a/crt/x86_64/crtn.s -+++ b/crt/x86_64/crtn.s -@@ -1,3 +1,4 @@ -+.file "crtn.s" - .section .init - pop %rax - ret diff --git a/poky/meta/recipes-core/musl/musl_git.bb b/poky/meta/recipes-core/musl/musl_git.bb index d4e75f918..e6f9e2441 100644 --- a/poky/meta/recipes-core/musl/musl_git.bb +++ b/poky/meta/recipes-core/musl/musl_git.bb @@ -4,9 +4,9 @@ require musl.inc inherit linuxloader -SRCREV = "1e4204d522670a1d8b8ab85f1cfefa960547e8af" +SRCREV = "e5d2823631bbfebacf48e1a34ed28f28d7cb2570" -BASEVER = "1.2.1" +BASEVER = "1.2.2" PV = "${BASEVER}+git${SRCPV}" @@ -15,7 +15,6 @@ PV = "${BASEVER}+git${SRCPV}" SRC_URI = "git://git.musl-libc.org/musl \ file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ - file://0001-crt-Add-.file-directive.patch \ " S = "${WORKDIR}/git" @@ -63,7 +62,7 @@ do_compile() { do_install() { oe_runmake install DESTDIR='${D}' - install -d ${D}${bindir} ${D}${base_libdir} ${D}${sysconfdir} + install -d ${D}${bindir} ${D}/lib ${D}${sysconfdir} echo "${base_libdir}" > ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} diff --git a/poky/meta/recipes-core/ncurses/ncurses.inc b/poky/meta/recipes-core/ncurses/ncurses.inc index fe4e8a5d6..ef59bc3b0 100644 --- a/poky/meta/recipes-core/ncurses/ncurses.inc +++ b/poky/meta/recipes-core/ncurses/ncurses.inc @@ -324,3 +324,8 @@ FILES_${PN}-terminfo-base = "\ RSUGGESTS_${PN}-libtinfo = "${PN}-terminfo" RRECOMMENDS_${PN}-libtinfo = "${PN}-terminfo-base" + +# Putting terminfo into the sysroot adds around 2800 files to +# each recipe specific sysroot. We can live without this, particularly +# as many recipes may have native and target copies. +SYSROOT_DIRS_remove = "${datadir}" diff --git a/poky/meta/recipes-core/newlib/libgloss_3.3.0.bb b/poky/meta/recipes-core/newlib/libgloss_4.1.0.bb index c9ed30d98..c9ed30d98 100644 --- a/poky/meta/recipes-core/newlib/libgloss_3.3.0.bb +++ b/poky/meta/recipes-core/newlib/libgloss_4.1.0.bb diff --git a/poky/meta/recipes-core/newlib/newlib.inc b/poky/meta/recipes-core/newlib/newlib.inc index 96e230f98..0aba21fae 100644 --- a/poky/meta/recipes-core/newlib/newlib.inc +++ b/poky/meta/recipes-core/newlib/newlib.inc @@ -8,15 +8,15 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LIBGLOSS;md5=54b778d585443cd7fbfa1b47cbd63a89 \ + file://COPYING.LIBGLOSS;md5=7b7615de0ecda0ff8d705966ac3b8950 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://COPYING.NEWLIB;md5=ac17c68751aad7a5298ce3f249121070 \ + file://COPYING.NEWLIB;md5=b8dda70da54e0efb49b1074f349d7749 \ file://newlib/libc/posix/COPYRIGHT;md5=103468ff1982be840fdf4ee9f8b51bbf \ file://newlib/libc/sys/linux/linuxthreads/LICENSE;md5=73640207fbc79b198c7ffd4ad4d97aa0 \ " SRC_URI = "https://sourceware.org/pub/newlib/newlib-${PV}.tar.gz" -SRC_URI[sha256sum] = "58dd9e3eaedf519360d92d84205c3deef0b3fc286685d1c562e245914ef72c66" +SRC_URI[sha256sum] = "f296e372f51324224d387cc116dc37a6bd397198756746f93a2b02e9a5d40154" INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "virtual/${TARGET_PREFIX}gcc" diff --git a/poky/meta/recipes-core/newlib/newlib_3.3.0.bb b/poky/meta/recipes-core/newlib/newlib_4.1.0.bb index 7ab5b2b94..7ab5b2b94 100644 --- a/poky/meta/recipes-core/newlib/newlib_3.3.0.bb +++ b/poky/meta/recipes-core/newlib/newlib_4.1.0.bb diff --git a/poky/meta/recipes-core/ovmf/ovmf-shell-image.bb b/poky/meta/recipes-core/ovmf/ovmf-shell-image.bb index 0d2b8bf52..fd4fb5b73 100644 --- a/poky/meta/recipes-core/ovmf/ovmf-shell-image.bb +++ b/poky/meta/recipes-core/ovmf/ovmf-shell-image.bb @@ -1,4 +1,5 @@ DESCRIPTION = "boot image with UEFI shell and tools" +COMPATIBLE_HOST_class-target='(i.86|x86_64).*' # For this image recipe, only the wic format with a # single vfat partition makes sense. Because we have no diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-base.bb b/poky/meta/recipes-core/packagegroups/packagegroup-base.bb index 90b79adfd..c882e1526 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -157,11 +157,13 @@ RDEPENDS_packagegroup-base-apm = "\ SUMMARY_packagegroup-base-ext2 = "ext2 filesystem support" RDEPENDS_packagegroup-base-ext2 = "\ - hdparm \ - e2fsprogs \ e2fsprogs-e2fsck \ e2fsprogs-mke2fs" +RRECOMMENDS_packagegroup-base-ext2 = "\ + hdparm \ + e2fsprogs" + SUMMARY_packagegroup-base-vfat = "FAT filesystem support" RRECOMMENDS_packagegroup-base-vfat = "\ kernel-module-msdos \ @@ -173,7 +175,7 @@ RRECOMMENDS_packagegroup-base-vfat = "\ SUMMARY_packagegroup-base-alsa = "ALSA sound support" RDEPENDS_packagegroup-base-alsa = "\ alsa-utils-alsactl \ - alsa-utils-alsamixer \ + alsa-utils-amixer \ ${VIRTUAL-RUNTIME_alsa-state}" RRECOMMENDS_packagegroup-base-alsa = "\ diff --git a/poky/meta/recipes-core/systemd/systemd-boot_247.2.bb b/poky/meta/recipes-core/systemd/systemd-boot_247.3.bb index 249e620f4..249e620f4 100644 --- a/poky/meta/recipes-core/systemd/systemd-boot_247.2.bb +++ b/poky/meta/recipes-core/systemd/systemd-boot_247.3.bb diff --git a/poky/meta/recipes-core/systemd/systemd-conf_247.2.bb b/poky/meta/recipes-core/systemd/systemd-conf_247.3.bb index 944b56ff8..944b56ff8 100644 --- a/poky/meta/recipes-core/systemd/systemd-conf_247.2.bb +++ b/poky/meta/recipes-core/systemd/systemd-conf_247.3.bb diff --git a/poky/meta/recipes-core/systemd/systemd-serialgetty.bb b/poky/meta/recipes-core/systemd/systemd-serialgetty.bb index d142b30f7..34defeb3b 100644 --- a/poky/meta/recipes-core/systemd/systemd-serialgetty.bb +++ b/poky/meta/recipes-core/systemd/systemd-serialgetty.bb @@ -1,7 +1,7 @@ SUMMARY = "Serial terminal support for systemd" HOMEPAGE = "https://www.freedesktop.org/wiki/Software/systemd/" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" PR = "r5" diff --git a/poky/meta/recipes-core/systemd/systemd.inc b/poky/meta/recipes-core/systemd/systemd.inc index cb7d782b7..ccff8c8b9 100644 --- a/poky/meta/recipes-core/systemd/systemd.inc +++ b/poky/meta/recipes-core/systemd/systemd.inc @@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "937118a5b2f27a7913c421ad76893cdda01c5566" +SRCREV = "551dd873b0bdfb9e7e47431b2933c8b910228f0c" SRCBRANCH = "v247-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" diff --git a/poky/meta/recipes-core/systemd/systemd/00-hostnamed-network-user.conf b/poky/meta/recipes-core/systemd/systemd/00-hostnamed-network-user.conf new file mode 100644 index 000000000..6b224ba9b --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/00-hostnamed-network-user.conf @@ -0,0 +1,6 @@ +[Service] +# By running with these options instead of root, networkd is allowed to request +# a hostname change via DBUS when policykit is not present +User=systemd-network +Group=systemd-hostname +AmbientCapabilities=CAP_SYS_ADMIN diff --git a/poky/meta/recipes-core/systemd/systemd/0001-analyze-resolve-executable-path-if-it-is-relative.patch b/poky/meta/recipes-core/systemd/systemd/0001-analyze-resolve-executable-path-if-it-is-relative.patch new file mode 100644 index 000000000..fd7f94a61 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0001-analyze-resolve-executable-path-if-it-is-relative.patch @@ -0,0 +1,39 @@ +From b9b7a8e3825f0433e120f7a6d7d5d635a839cab9 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 21 Jan 2021 06:19:44 +0000 +Subject: [PATCH] analyze: resolve executable path if it is relative + +Upstream-Status: Backport [https://github.com/systemd/systemd/commit/f1fb046a985521f7d4a662f02546686ff20b7e5d] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + src/analyze/analyze-verify.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c +index a9c89173bf..969523df18 100644 +--- a/src/analyze/analyze-verify.c ++++ b/src/analyze/analyze-verify.c +@@ -115,14 +115,17 @@ static int verify_socket(Unit *u) { + } + + int verify_executable(Unit *u, const ExecCommand *exec) { ++ int r; ++ + if (!exec) + return 0; + + if (exec->flags & EXEC_COMMAND_IGNORE_FAILURE) + return 0; + +- if (access(exec->path, X_OK) < 0) +- return log_unit_error_errno(u, errno, "Command %s is not executable: %m", exec->path); ++ r = find_executable_full(exec->path, false, NULL); ++ if (r < 0) ++ return log_unit_error_errno(u, r, "Command %s is not executable: %m", exec->path); + + return 0; + } +-- +2.26.2 + 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 154e57b54..d63e3c0d0 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 @@ -70,8 +70,6 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> src/udev/udev-rules.c | 1 + 50 files changed, 61 insertions(+) -diff --git a/meson.build b/meson.build -index 6aa47fc755..0d0fa4963c 100644 --- a/meson.build +++ b/meson.build @@ -535,6 +535,7 @@ foreach ident : [ @@ -82,8 +80,6 @@ index 6aa47fc755..0d0fa4963c 100644 ] have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') -diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c -index d1b6a81e33..38b7008371 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -19,6 +19,7 @@ @@ -94,8 +90,6 @@ index d1b6a81e33..38b7008371 100644 static int help(void) { _cleanup_free_ char *link = NULL; -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index f28bf1866a..bb960f183c 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -38,6 +38,7 @@ @@ -106,8 +100,6 @@ index f28bf1866a..bb960f183c 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 a84863ff22..d4f5d57231 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -15,6 +15,7 @@ @@ -118,8 +110,6 @@ index a84863ff22..d4f5d57231 100644 /* 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 d4054cf46a..b608863e45 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -36,6 +36,7 @@ @@ -130,8 +120,6 @@ index d4054cf46a..b608863e45 100644 #define SNDBUF_SIZE (8*1024*1024) -diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h -index 8c76f93eb2..9068bfb4f0 100644 --- a/src/basic/missing_stdlib.h +++ b/src/basic/missing_stdlib.h @@ -11,3 +11,15 @@ @@ -150,8 +138,6 @@ index 8c76f93eb2..9068bfb4f0 100644 + (char *)memcpy(__new, __old, __len); \ + }) +#endif -diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c -index f91f8f7a08..fb31596216 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c @@ -14,6 +14,7 @@ @@ -162,8 +148,6 @@ index f91f8f7a08..fb31596216 100644 int mkdir_safe_internal( const char *path, -diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index 5d4dafe3a5..70749750d4 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c @@ -22,6 +22,7 @@ @@ -174,8 +158,6 @@ index 5d4dafe3a5..70749750d4 100644 int parse_boolean(const char *v) { if (!v) -diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 96b82170d0..71342b46af 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c @@ -15,6 +15,7 @@ @@ -186,8 +168,6 @@ index 96b82170d0..71342b46af 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 0b6fb137bd..e8e8c7b270 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -15,6 +15,7 @@ @@ -198,8 +178,6 @@ index 0b6fb137bd..e8e8c7b270 100644 int proc_cmdline(char **ret) { const char *e; -diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index ccab71f7d2..8f9eee8d36 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c @@ -11,6 +11,7 @@ @@ -210,8 +188,6 @@ index ccab71f7d2..8f9eee8d36 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 4989f4f37c..ca00bf99d8 100644 --- a/src/basic/selinux-util.c +++ b/src/basic/selinux-util.c @@ -27,6 +27,7 @@ @@ -222,8 +198,6 @@ index 4989f4f37c..ca00bf99d8 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 5318d6378d..23c2f77675 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -27,6 +27,7 @@ @@ -234,8 +208,6 @@ index 5318d6378d..23c2f77675 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 cd34f88bb9..3a77b6f2ca 100644 --- a/src/boot/bless-boot.c +++ b/src/boot/bless-boot.c @@ -18,6 +18,7 @@ @@ -246,8 +218,6 @@ index cd34f88bb9..3a77b6f2ca 100644 static char **arg_path = NULL; -diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index 37c581fb22..e02789d689 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -16,6 +16,7 @@ @@ -258,8 +228,6 @@ index 37c581fb22..e02789d689 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 abe009c395..0451e58d1c 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -41,6 +41,7 @@ @@ -270,8 +238,6 @@ index abe009c395..0451e58d1c 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 d6223db305..3654c344ee 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c @@ -7,6 +7,7 @@ @@ -282,8 +248,6 @@ index d6223db305..3654c344ee 100644 int bus_property_get_triggered_unit( sd_bus *bus, -diff --git a/src/core/execute.c b/src/core/execute.c -index c992b8d5d3..89632e0582 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -96,6 +96,7 @@ @@ -294,8 +258,6 @@ index c992b8d5d3..89632e0582 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 a56f12f47f..6b8729ef67 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -11,6 +11,7 @@ @@ -306,8 +268,6 @@ index a56f12f47f..6b8729ef67 100644 #if HAVE_KMOD #include "module-util.h" -diff --git a/src/core/service.c b/src/core/service.c -index d7bdeb7cca..bfd483b2c0 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -41,6 +41,7 @@ @@ -318,8 +278,6 @@ index d7bdeb7cca..bfd483b2c0 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 30c67ffe7c..595bc30726 100644 --- a/src/coredump/coredump-vacuum.c +++ b/src/coredump/coredump-vacuum.c @@ -16,6 +16,7 @@ @@ -330,8 +288,6 @@ index 30c67ffe7c..595bc30726 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 d2aa1815c2..a851aa203f 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -22,6 +22,7 @@ @@ -342,8 +298,6 @@ index d2aa1815c2..a851aa203f 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 bcf2e01d5c..5394d1dc01 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -73,6 +73,7 @@ @@ -354,8 +308,6 @@ index bcf2e01d5c..5394d1dc01 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 cb1ab88ca5..7f35759540 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -40,6 +40,7 @@ @@ -366,8 +318,6 @@ index cb1ab88ca5..7f35759540 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 86ff5bdfa2..3fd053a358 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -21,6 +21,7 @@ @@ -378,8 +328,6 @@ index 86ff5bdfa2..3fd053a358 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 275c4318a1..5ffee59d17 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -13,6 +13,7 @@ @@ -390,8 +338,6 @@ index 275c4318a1..5ffee59d17 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 4881fd0d32..c865f1133b 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -28,6 +28,7 @@ @@ -402,8 +348,6 @@ index 4881fd0d32..c865f1133b 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 b8d4dc8d95..a8bac2665d 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -41,6 +41,7 @@ @@ -414,8 +358,6 @@ index b8d4dc8d95..a8bac2665d 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 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,8 +368,6 @@ index 8c6711797a..fac178823a 100644 #define MAX_SIZE (2*1024*1024) -diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c -index cb8153f4fe..d52a56019d 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c @@ -21,6 +21,7 @@ @@ -438,8 +378,6 @@ index cb8153f4fe..d52a56019d 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 8e7a94db55..b5c368c6d1 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -31,6 +31,7 @@ @@ -450,8 +388,6 @@ index 8e7a94db55..b5c368c6d1 100644 #include "pam-util.h" #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 2fa21a067a..2e9995aa62 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -13,6 +13,7 @@ @@ -462,8 +398,6 @@ index 2fa21a067a..2e9995aa62 100644 /* # .network -diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c -index 92bb5120ab..eeca905c75 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -16,6 +16,7 @@ @@ -474,8 +408,6 @@ index 92bb5120ab..eeca905c75 100644 Settings *settings_new(void) { Settings *s; -diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c -index 53f0492116..c71941fdd7 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/nss-mymachines/nss-mymachines.c @@ -19,6 +19,7 @@ @@ -486,8 +418,6 @@ index 53f0492116..c71941fdd7 100644 NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); NSS_GETPW_PROTOTYPES(mymachines); -diff --git a/src/portable/portable.c b/src/portable/portable.c -index ed7eac0291..78986977f8 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -31,6 +31,7 @@ @@ -498,8 +428,6 @@ index ed7eac0291..78986977f8 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 b479335769..212d0bed20 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c @@ -37,6 +37,7 @@ @@ -510,8 +438,6 @@ index b479335769..212d0bed20 100644 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 32f68d5e6a..bda1e1ef4f 100644 --- a/src/shared/bus-get-properties.c +++ b/src/shared/bus-get-properties.c @@ -4,6 +4,7 @@ @@ -522,8 +448,6 @@ index 32f68d5e6a..bda1e1ef4f 100644 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 3e97be9671..2b8ca838f7 100644 --- a/src/shared/bus-unit-procs.c +++ b/src/shared/bus-unit-procs.c @@ -10,6 +10,7 @@ @@ -534,8 +458,6 @@ index 3e97be9671..2b8ca838f7 100644 struct CGroupInfo { char *cgroup_path; -diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c -index 2bab2299fb..62afdc7973 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -44,6 +44,7 @@ @@ -546,8 +468,6 @@ index 2bab2299fb..62afdc7973 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 fbda218b3b..aae0be75c6 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -21,6 +21,7 @@ @@ -558,8 +478,6 @@ index fbda218b3b..aae0be75c6 100644 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 8bd1e3a6ac..f8d6eab9bd 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c @@ -17,6 +17,7 @@ @@ -570,8 +488,6 @@ index 8bd1e3a6ac..f8d6eab9bd 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 e95b638f4d..a1bf15baa8 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c @@ -14,6 +14,7 @@ @@ -582,8 +498,6 @@ index e95b638f4d..a1bf15baa8 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 bf574d32a5..a09c79d2fb 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -41,6 +41,7 @@ @@ -594,8 +508,6 @@ index bf574d32a5..a09c79d2fb 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 f689d9f28f..aae3957c2f 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c @@ -26,6 +26,7 @@ @@ -606,8 +518,6 @@ index f689d9f28f..aae3957c2f 100644 static pid_t pager_pid = 0; -diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c -index 5d5bf7f21d..f1002ffa6c 100644 --- a/src/shared/uid-range.c +++ b/src/shared/uid-range.c @@ -9,6 +9,7 @@ @@ -618,8 +528,6 @@ index 5d5bf7f21d..f1002ffa6c 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 4391d9f1f5..9b73cd0aeb 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -26,6 +26,7 @@ @@ -630,8 +538,6 @@ index 4391d9f1f5..9b73cd0aeb 100644 #define BUFFER_SIZE (256 * 1024) -diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c -index f0f9679769..128fc164da 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -6,6 +6,7 @@ @@ -642,8 +548,6 @@ index f0f9679769..128fc164da 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 0da59e2c75..66da3741ee 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -22,6 +22,7 @@ @@ -654,8 +558,6 @@ index 0da59e2c75..66da3741ee 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 5159d19a38..0ed5b65844 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -34,6 +34,7 @@ @@ -666,8 +568,6 @@ index 5159d19a38..0ed5b65844 100644 typedef struct Spawn { sd_device *device; -diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index ef6a0c112c..422fc19127 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -30,6 +30,7 @@ @@ -678,6 +578,13 @@ index ef6a0c112c..422fc19127 100644 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") --- -2.27.0 - +--- a/src/basic/mountpoint-util.c ++++ b/src/basic/mountpoint-util.c +@@ -10,6 +10,7 @@ + #include "fs-util.h" + #include "missing_stat.h" + #include "missing_syscall.h" ++#include "missing_stdlib.h" + #include "mountpoint-util.h" + #include "parse-util.h" + #include "path-util.h" 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 deleted file mode 100644 index ea4a024b8..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 359e7a38824a906b0a24f5775f41a2ae3358bf06 Mon Sep 17 00:00:00 2001 -From: Scott Murray <scott.murray@konsulko.com> -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 <scott.murray@konsulko.com> ---- - 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 <sys/wait.h> - #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 deleted file mode 100644 index 2820d7b32..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0592da08e16a17ceef0949ec9901397d8ec5af92 Mon Sep 17 00:00:00 2001 -From: Scott Murray <scott.murray@konsulko.com> -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 <scott.murray@konsulko.com> ---- - 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 <sys/sendfile.h> - #include <sys/xattr.h> - #include <unistd.h> -+#include <signal.h> - - #include "alloc-util.h" - #include "btrfs-util.h" --- -2.27.0 - diff --git a/poky/meta/recipes-core/systemd/systemd/0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch b/poky/meta/recipes-core/systemd/systemd/0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch new file mode 100644 index 000000000..94a4c307b --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch @@ -0,0 +1,97 @@ +From 297aba739cd689e4dc9f43bb1422ec88d481099a Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Wed, 13 Jan 2021 21:09:33 +0000 +Subject: [PATCH] proc: dont trigger mount error with invalid options on old + kernels + +As of commit 4e39995371738b04d98d27b0d34ea8fe09ec9fab ("core: introduce +ProtectProc= and ProcSubset= to expose hidepid= and subset= procfs +mount options") kernels older than v5.8 generate multple warnings at +boot, as seen in this Yocto build from today: + + qemux86-64 login: root + [ 65.829009] proc: Bad value for 'hidepid' + root@qemux86-64:~# dmesg|grep proc: + [ 16.990706] proc: Bad value for 'hidepid' + [ 28.060178] proc: Bad value for 'hidepid' + [ 28.874229] proc: Bad value for 'hidepid' + [ 32.685107] proc: Bad value for 'hidepid' + [ 65.829009] proc: Bad value for 'hidepid' + root@qemux86-64:~# + +The systemd maintainer has dismissed this as something people should +simply ignore[1] and has no interest in trying to avoid it by +proactively checking the kernel version, so people can safely assume +that they will never see this version check commit upstream. + +However, as can be seen above, telling people to just ignore it is not +an option, as we'll end up answering the same question and dealing with +the same bug over and over again. + +The commit that triggers this is systemd v247-rc1~378^2~3 -- so any +systemd 247 and above plus kernel v5.7 or older will need this. + +[1] https://github.com/systemd/systemd/issues/16896 + +Upstream-Status: Denied [https://github.com/systemd/systemd/issues/16896] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> + +Index: git/src/core/namespace.c +=================================================================== +--- git.orig/src/core/namespace.c ++++ git/src/core/namespace.c +@@ -4,7 +4,9 @@ + #include <linux/loop.h> + #include <sched.h> + #include <stdio.h> ++#include <stdlib.h> + #include <sys/mount.h> ++#include <sys/utsname.h> + #include <unistd.h> + #include <linux/fs.h> + +@@ -860,13 +862,32 @@ static int mount_sysfs(const MountEntry + + static int mount_procfs(const MountEntry *m, const NamespaceInfo *ns_info) { + const char *entry_path; +- int r; ++ int r, major, minor; ++ struct utsname uts; ++ bool old = false; + + assert(m); + assert(ns_info); + + entry_path = mount_entry_path(m); + ++ /* If uname says that the system is older than v5.8, then the textual hidepid= stuff is not ++ * supported by the kernel, and thus the per-instance hidepid= neither, which means we ++ * really don't want to use it, since it would affect our host's /proc * mount. Hence let's ++ * gracefully fallback to a classic, unrestricted version. */ ++ ++ r = uname(&uts); ++ if (r < 0) ++ return errno; ++ ++ major = atoi(uts.release); ++ minor = atoi(strchr(uts.release, '.') + 1); ++ ++ if (major < 5 || (major == 5 && minor < 8)) { ++ log_debug("Pre v5.8 kernel detected [v%d.%d] - skipping hidepid=", major, minor); ++ old = true; ++ } ++ + /* Mount a new instance, so that we get the one that matches our user namespace, if we are running in + * one. i.e we don't reuse existing mounts here under any condition, we want a new instance owned by + * our user namespace and with our hidepid= settings applied. Hence, let's get rid of everything +@@ -875,8 +896,8 @@ static int mount_procfs(const MountEntry + (void) mkdir_p_label(entry_path, 0755); + (void) umount_recursive(entry_path, 0); + +- if (ns_info->protect_proc != PROTECT_PROC_DEFAULT || +- ns_info->proc_subset != PROC_SUBSET_ALL) { ++ if (!old && (ns_info->protect_proc != PROTECT_PROC_DEFAULT || ++ ns_info->proc_subset != PROC_SUBSET_ALL)) { + _cleanup_free_ char *opts = NULL; + + /* Starting with kernel 5.8 procfs' hidepid= logic is truly per-instance (previously it diff --git a/poky/meta/recipes-core/systemd/systemd/org.freedesktop.hostname1_no_polkit.conf b/poky/meta/recipes-core/systemd/systemd/org.freedesktop.hostname1_no_polkit.conf new file mode 100644 index 000000000..f4d0271cd --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/org.freedesktop.hostname1_no_polkit.conf @@ -0,0 +1,11 @@ +<?xml version="1.0"?> <!--*-nxml-*--> +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> + +<busconfig> + <policy group="systemd-hostname"> + <allow own="org.freedesktop.hostname1"/> + <allow send_destination="org.freedesktop.hostname1"/> + <allow receive_sender="org.freedesktop.hostname1"/> + </policy> +</busconfig> diff --git a/poky/meta/recipes-core/systemd/systemd_247.2.bb b/poky/meta/recipes-core/systemd/systemd_247.3.bb index 5eea78eff..c0073ad7b 100644 --- a/poky/meta/recipes-core/systemd/systemd_247.2.bb +++ b/poky/meta/recipes-core/systemd/systemd_247.3.bb @@ -16,6 +16,8 @@ REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ + ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', d)} \ file://init \ file://99-default.preset \ file://systemd-pager.sh \ @@ -23,6 +25,8 @@ SRC_URI += "file://touchscreen.rules \ 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 \ + file://0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch \ + file://0001-analyze-resolve-executable-path-if-it-is-relative.patch \ " # patches needed by musl @@ -49,8 +53,6 @@ SRC_URI_MUSL = "\ 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 \ " @@ -139,7 +141,7 @@ 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 +# importd requires journal-upload/xz/zlib/bzip2/gcrypt PACKAGECONFIG[importd] = "-Dimportd=true,-Dimportd=false" # Update NAT firewall rules PACKAGECONFIG[iptc] = "-Dlibiptc=true,-Dlibiptc=false,iptables" @@ -164,6 +166,10 @@ 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" +# If polkit is disabled and networkd+hostnamed are in use, enabling this option and +# using dbus-broker will allow networkd to be authorized to change the +# hostname without acquiring additional privileges +PACKAGECONFIG[polkit_hostnamed_fallback] = ",,,,dbus-broker,polkit" PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false" PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode,,qrencode" PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false" @@ -306,6 +312,15 @@ do_install() { fi fi + # If polkit is not available and a fallback was requested, install a drop-in that allows networkd to + # request hostname changes via DBUS without elevating its privileges + if ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system/systemd-hostnamed.service.d/ + install -m 0644 ${WORKDIR}/00-hostnamed-network-user.conf ${D}${systemd_unitdir}/system/systemd-hostnamed.service.d/ + install -d ${D}${datadir}/dbus-1/system.d/ + install -m 0644 ${WORKDIR}/org.freedesktop.hostname1_no_polkit.conf ${D}${datadir}/dbus-1/system.d/ + fi + # create link for existing udev rules ln -s ${base_bindir}/udevadm ${D}${base_sbindir}/udevadm @@ -370,16 +385,17 @@ USERADD_PACKAGES = "${PN} ${PN}-extra-utils \ ${@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)}" +GROUPADD_PARAM_${PN} = "-r systemd-journal;" +GROUPADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}" +USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}" +USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /sbin/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" +USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /sbin/nologin systemd-resolve;', '', d)}" +USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /sbin/nologin systemd-timesync;', '', d)}" +USERADD_PARAM_${PN}-extra-utils = "--system -d / -M --shell /sbin/nologin systemd-bus-proxy" +USERADD_PARAM_${PN}-journal-gateway = "--system -d / -M --shell /sbin/nologin systemd-journal-gateway" +USERADD_PARAM_${PN}-journal-remote = "--system -d / -M --shell /sbin/nologin systemd-journal-remote" +USERADD_PARAM_${PN}-journal-upload = "--system -d / -M --shell /sbin/nologin systemd-journal-upload" FILES_${PN}-analyze = "${bindir}/systemd-analyze" @@ -589,6 +605,7 @@ FILES_${PN} = " ${base_bindir}/* \ ${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 \ + ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '${datadir}/dbus-1/system.d/org.freedesktop.hostname1_no_polkit.conf', '', d)} \ ${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 \ diff --git a/poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index 8781492d4..d95d1a63f 100644 --- a/poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb @@ -1,6 +1,6 @@ SUMMARY = "Inittab configuration for SysVinit" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" PR = "r10" diff --git a/poky/meta/recipes-core/sysvinit/sysvinit_2.98.bb b/poky/meta/recipes-core/sysvinit/sysvinit_2.99.bb index 41009bc18..e39f22a8b 100644 --- a/poky/meta/recipes-core/sysvinit/sysvinit_2.98.bb +++ b/poky/meta/recipes-core/sysvinit/sysvinit_2.99.bb @@ -21,7 +21,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ file://bootlogd.init \ file://01_bootlogd \ " -SRC_URI[sha256sum] = "7b2c3ffaf19eaf1ca80268762f85f9e4eb8e3c973213d49f9802605b72caa7dc" +SRC_URI[sha256sum] = "b05c3677bb698afe64c997968b00c49b2a9bd320ce963523230ee7ea41197757" S = "${WORKDIR}/sysvinit-${PV}" diff --git a/poky/meta/recipes-core/udev/eudev_3.2.9.bb b/poky/meta/recipes-core/udev/eudev_3.2.10.bb index f96f8cbe7..a5d2115f8 100644 --- a/poky/meta/recipes-core/udev/eudev_3.2.9.bb +++ b/poky/meta/recipes-core/udev/eudev_3.2.10.bb @@ -1,5 +1,6 @@ SUMMARY = "eudev is a fork of systemd's udev" HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" +DESCRIPTION = "eudev is Gentoo's fork of udev, systemd's device file manager for the Linux kernel. It manages device nodes in /dev and handles all user space actions when adding or removing devices." LICENSE = "GPLv2.0+ & LGPL-2.1+" LICENSE_libudev = "LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" @@ -20,8 +21,8 @@ SRC_URI = "https://dev.gentoo.org/~blueness/${BPN}/${BP}.tar.gz \ file://udev.rules \ " -SRC_URI[md5sum] = "dedfb1964f6098fe9320de827957331f" -SRC_URI[sha256sum] = "89618619084a19e1451d373c43f141b469c9fd09767973d73dd268b92074d4fc" +SRC_URI[md5sum] = "60b135a189523f333cea5f71a3345c8d" +SRC_URI[sha256sum] = "87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034" inherit autotools update-rc.d qemu pkgconfig features_check 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 deleted file mode 100644 index f3ae5ef94..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5547316c85cd45c0ea29c4c7c48eecd616783cd5 Mon Sep 17 00:00:00 2001 -From: Pino Toscano <toscano.pino@tiscali.it> -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 <toscano.pino@tiscali.it> ---- - 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 deleted file mode 100644 index 3e818470f..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 367972fae13d170675768d63678577cae1890143 Mon Sep 17 00:00:00 2001 -From: Pino Toscano <toscano.pino@tiscali.it> -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 <toscano.pino@tiscali.it> ---- - 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.2.bb index bf4692227..19950a272 100644 --- a/poky/meta/recipes-core/util-linux/util-linux_2.36.1.bb +++ b/poky/meta/recipes-core/util-linux/util-linux_2.36.2.bb @@ -39,10 +39,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz 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" +SRC_URI[sha256sum] = "f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f" PACKAGES =+ "${PN}-swaponoff" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}" diff --git a/poky/meta/recipes-devtools/apt/apt_1.8.2.1.bb b/poky/meta/recipes-devtools/apt/apt_1.8.2.2.bb index de0e150a2..6cda61a7d 100644 --- a/poky/meta/recipes-devtools/apt/apt_1.8.2.1.bb +++ b/poky/meta/recipes-devtools/apt/apt_1.8.2.2.bb @@ -1,4 +1,6 @@ SUMMARY = "Advanced front-end for dpkg" +DESCRIPTION = "APT is the Advanced Package Tool, an advanced interface to the Debian packaging system which provides the apt-get program." +HOMEPAGE = "https://packages.debian.org/jessie/apt" LICENSE = "GPLv2.0+" SECTION = "base" @@ -17,20 +19,34 @@ SRC_URI_append_class-native = " \ file://0001-Do-not-configure-packages-on-installation.patch \ " -SRC_URI[sha256sum] = "6d447f2e9437ec24e78350b63bb0592bee1f050811d51990b0c783183b0983f8" +SRC_URI_append_class-nativesdk = " \ + file://0001-Do-not-init-tables-from-dpkg-configuration.patch \ + file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ + file://0001-Do-not-configure-packages-on-installation.patch \ + " + +SRC_URI[sha256sum] = "f5030de22a5cc80db6fe0d42373b5df25d7dc56e94d9155f2eaa80dbd65e82fa" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # the package is taken from snapshots.debian.org; that source is static and goes stale # so we check the latest upstream from a directory that does get updated UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" -inherit cmake perlnative bash-completion upstream-version-is-even +inherit cmake perlnative bash-completion upstream-version-is-even useradd + +# User is added to allow apt to drop privs, will runtime warn without +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --home /nonexistent --no-create-home _apt" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" DEPENDS += "virtual/libiconv virtual/libintl db gnutls lz4 zlib bzip2 xz" -EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False -DUSE_NLS=False -DDPKG_DATADIR=${datadir}/dpkg -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash" +EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ + -DUSE_NLS=False -DDPKG_DATADIR=${datadir}/dpkg \ + -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ + -DCMAKE_DISABLE_FIND_PACKAGE_Zstd=True \ +" do_configure_prepend () { echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH )" >> ${WORKDIR}/toolchain.cmake @@ -41,7 +57,7 @@ do_configure_prepend () { FILES_${PN} += "${prefix}/lib/dpkg ${prefix}/lib/apt" RDEPENDS_${PN} += "bash perl dpkg" -do_install_append_class-native() { +customize_apt_conf_sample() { cat > ${D}${sysconfdir}/apt/apt.conf.sample << EOF Dir "${STAGING_DIR_NATIVE}/" { @@ -94,6 +110,15 @@ DPkg::Path ""; EOF } +do_install_append_class-native() { + customize_apt_conf_sample +} + +do_install_append_class-nativesdk() { + customize_apt_conf_sample +} + + do_install_append_class-target() { #Write the correct apt-architecture to apt.conf APT_CONF=${D}/etc/apt/apt.conf diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/AC_HEADER_MAJOR-port-to-glibc-2.25.patch b/poky/meta/recipes-devtools/autoconf/autoconf/AC_HEADER_MAJOR-port-to-glibc-2.25.patch deleted file mode 100644 index b2d7dc0e2..000000000 --- a/poky/meta/recipes-devtools/autoconf/autoconf/AC_HEADER_MAJOR-port-to-glibc-2.25.patch +++ /dev/null @@ -1,101 +0,0 @@ -From b859ab1b211d348b46eca9158b7742f050c8115e Mon Sep 17 00:00:00 2001 -From: Eric Blake <eblake@redhat.com> -Date: Wed, 14 Sep 2016 08:17:06 -0500 -Subject: [PATCH] AC_HEADER_MAJOR: port to glibc 2.25 - -glibc 2.25 is deprecating the namespace pollution of <sys/types.h> -injecting major(), minor(), and makedev() into the compilation -environment, with a warning that insists that users include -<sys/sysmacros.h> instead. However, because the expansion of -AC_HEADER_MAJOR didn't bother checking sys/sysmacros.h until -after probing whether sys/types.h pollutes the namespace, it was -not defining MAJOR_IN_SYSMACROS, with the result that code -compiled with -Werror chokes on the deprecation warnings because -it was not including sysmacros.h. - -In addition to fixing autoconf (which only benefits projects -that rebuild configure after this fix is released), we can also -give a hint to distros on how they can populate config.site with -a cache variable to force pre-existing configure scripts without -the updated macro to behave sanely in the presence of glibc 2.25 -(the documentation is especially useful since that cache variable -is no longer present in autoconf after this patch). - -Note that mingw lacks major/minor/makedev in any of its standard -headers; for that platform, the behavior of this macro is unchanged -(code using the recommended include formula will get a compile error -when trying to use major(), whether before or after this patch); but -for now, it is assumed that programs actually concerned with -creating devices are not worried about portability to mingw. If -desired, a later patch could tighten AC_HEADER_MAJOR to fail at -configure time if the macros are unavailable in any of the three -system headers, but that semantic change is not worth mixing into -this patch. - -* lib/autoconf/headers.m4 (AC_HEADER_MAJOR): Drop check for -major within sys/types.h; it interferes with the need to check -sysmacros.h first. - -Signed-off-by: Eric Blake <eblake@redhat.com> - -Remove the documentation change from the patch -Upstream-Status: Backport - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - lib/autoconf/headers.m4 | 30 ++++++++++++++---------------- - 1 file changed, 14 insertions(+), 16 deletions(-) - -diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4 -index 81a7fa2..a57d0d3 100644 ---- a/lib/autoconf/headers.m4 -+++ b/lib/autoconf/headers.m4 -@@ -502,31 +502,29 @@ fi - - # AC_HEADER_MAJOR - # --------------- -+# Thanks to glibc 2.25 deprecating macros in sys/types.h, coupled with -+# back-compat to autoconf 2.69, we need the following logic: -+# Check whether <sys/types.h> compiles. -+# If <sys/mkdev.h> compiles, assume it provides major/minor/makedev. -+# Otherwise, if <sys/sysmacros.h> compiles, assume it provides the macros. -+# Otherwise, either the macros were provided by <sys/types.h>, or do -+# not exist on the platform. Code trying to use these three macros is -+# assumed to not care about platforms that lack the macros. - AN_FUNCTION([major], [AC_HEADER_MAJOR]) - AN_FUNCTION([makedev], [AC_HEADER_MAJOR]) - AN_FUNCTION([minor], [AC_HEADER_MAJOR]) - AN_HEADER([sys/mkdev.h], [AC_HEADER_MAJOR]) - AC_DEFUN([AC_HEADER_MAJOR], --[AC_CACHE_CHECK(whether sys/types.h defines makedev, -- ac_cv_header_sys_types_h_makedev, --[AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <sys/types.h>]], -- [[return makedev(0, 0);]])], -- [ac_cv_header_sys_types_h_makedev=yes], -- [ac_cv_header_sys_types_h_makedev=no]) --]) -- --if test $ac_cv_header_sys_types_h_makedev = no; then -+[AC_CHECK_HEADERS_ONCE([sys/types.h]) - AC_CHECK_HEADER(sys/mkdev.h, - [AC_DEFINE(MAJOR_IN_MKDEV, 1, - [Define to 1 if `major', `minor', and `makedev' are - declared in <mkdev.h>.])]) -- -- if test $ac_cv_header_sys_mkdev_h = no; then -- AC_CHECK_HEADER(sys/sysmacros.h, -- [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, -- [Define to 1 if `major', `minor', and `makedev' -- are declared in <sysmacros.h>.])]) -- fi -+if test $ac_cv_header_sys_mkdev_h = no; then -+ AC_CHECK_HEADER(sys/sysmacros.h, -+ [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, -+ [Define to 1 if `major', `minor', and `makedev' -+ are declared in <sysmacros.h>.])]) - fi - ])# AC_HEADER_MAJOR - --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/add_musl_config.patch b/poky/meta/recipes-devtools/autoconf/autoconf/add_musl_config.patch deleted file mode 100644 index a9094d212..000000000 --- a/poky/meta/recipes-devtools/autoconf/autoconf/add_musl_config.patch +++ /dev/null @@ -1,26 +0,0 @@ -backport http://git.savannah.gnu.org/cgit/config.git/commit/config.sub?id=062587eaa891396c936555ae51f7e77eeb71a5fe - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport -Index: autoconf-2.69/build-aux/config.sub -=================================================================== ---- autoconf-2.69.orig/build-aux/config.sub -+++ autoconf-2.69/build-aux/config.sub -@@ -123,7 +123,7 @@ esac - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) -@@ -1360,7 +1360,7 @@ case $os in - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ -- | -linux-newlib* | -linux-uclibc* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/autoconf-replace-w-option-in-shebangs-with-modern-use-warnings.patch b/poky/meta/recipes-devtools/autoconf/autoconf/autoconf-replace-w-option-in-shebangs-with-modern-use-warnings.patch deleted file mode 100644 index ae0e3825f..000000000 --- a/poky/meta/recipes-devtools/autoconf/autoconf/autoconf-replace-w-option-in-shebangs-with-modern-use-warnings.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 236552ff5b9f1ebf666d8d0e9850007dcce03d26 Mon Sep 17 00:00:00 2001 -From: Serhii Popovych <spopovyc@cisco.com> -Date: Wed, 10 Feb 2016 16:32:44 +0000 -Subject: [PATCH] perl: Replace -w option in shebangs with modern "use - warnings" - -In some builds we might provide ac_cv_path_PERL as /usr/bin/env perl -to use newer version of the perl from users PATH rather than -older from standard system path. - -However using /usr/bin/env perl -w from shebang line isn't -possible because it translates to something like -/usr/bin/env -w perl and env complains about illegal option. - -To address this we can remove -w option from perl shebang -line and add "use warnings" statement. - -Upstream-Status: Pending -Signed-off-by: Serhii Popovych <spopovyc@cisco.com> ---- - bin/autom4te.in | 3 ++- - bin/autoreconf.in | 3 ++- - bin/autoscan.in | 3 ++- - bin/autoupdate.in | 3 ++- - bin/ifnames.in | 3 ++- - 5 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/bin/autom4te.in b/bin/autom4te.in -index 11773c9..a8f5e41 100644 ---- a/bin/autom4te.in -+++ b/bin/autom4te.in -@@ -1,4 +1,4 @@ --#! @PERL@ -w -+#! @PERL@ - # -*- perl -*- - # @configure_input@ - -@@ -42,6 +42,7 @@ use Autom4te::General; - use Autom4te::XFile; - use File::Basename; - use strict; -+use warnings; - - # Data directory. - my $pkgdatadir = $ENV{'AC_MACRODIR'} || '@pkgdatadir@'; -diff --git a/bin/autoreconf.in b/bin/autoreconf.in -index e245db4..1a318cb 100644 ---- a/bin/autoreconf.in -+++ b/bin/autoreconf.in -@@ -1,4 +1,4 @@ --#! @PERL@ -w -+#! @PERL@ - # -*- perl -*- - # @configure_input@ - -@@ -45,6 +45,7 @@ use Autom4te::XFile; - # Do not use Cwd::chdir, since it might hang. - use Cwd 'cwd'; - use strict; -+use warnings; - - ## ----------- ## - ## Variables. ## -diff --git a/bin/autoscan.in b/bin/autoscan.in -index a67c48d..b931249 100644 ---- a/bin/autoscan.in -+++ b/bin/autoscan.in -@@ -1,4 +1,4 @@ --#! @PERL@ -w -+#! @PERL@ - # -*- perl -*- - # @configure_input@ - -@@ -43,6 +43,7 @@ use Autom4te::XFile; - use File::Basename; - use File::Find; - use strict; -+use warnings; - - use vars qw(@cfiles @makefiles @shfiles @subdirs %printed); - -diff --git a/bin/autoupdate.in b/bin/autoupdate.in -index 9737d49..92cb147 100644 ---- a/bin/autoupdate.in -+++ b/bin/autoupdate.in -@@ -1,4 +1,4 @@ --#! @PERL@ -w -+#! @PERL@ - # -*- perl -*- - # @configure_input@ - -@@ -44,6 +44,7 @@ use Autom4te::General; - use Autom4te::XFile; - use File::Basename; - use strict; -+use warnings; - - # Lib files. - my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@'; -diff --git a/bin/ifnames.in b/bin/ifnames.in -index ba2cd05..74b0278 100644 ---- a/bin/ifnames.in -+++ b/bin/ifnames.in -@@ -1,4 +1,4 @@ --#! @PERL@ -w -+#! @PERL@ - # -*- perl -*- - # @configure_input@ - -@@ -44,6 +44,7 @@ BEGIN - use Autom4te::General; - use Autom4te::XFile; - use Autom4te::FileUtils; -+use warnings; - - # $HELP - # ----- --- -2.3.0 - diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch b/poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch index d1bd3a2a3..374b93940 100644 --- a/poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch +++ b/poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch @@ -1,18 +1,25 @@ -Upstream-Status: Pending +From 0071d28e304745a16871561f23117fdb00dd2559 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 12 Mar 2020 17:25:23 +0000 +Subject: [PATCH 4/7] autoreconf-exclude.patch -Index: autoconf-2.63/bin/autoreconf.in -=================================================================== ---- autoconf-2.63.orig/bin/autoreconf.in 2008-12-31 17:39:01.000000000 +0000 -+++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:43:38.000000000 +0000 -@@ -76,6 +76,7 @@ - -i, --install copy missing auxiliary files +--- + bin/autoreconf.in | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/bin/autoreconf.in b/bin/autoreconf.in +index bb9f316d..7da3005b 100644 +--- a/bin/autoreconf.in ++++ b/bin/autoreconf.in +@@ -82,6 +82,7 @@ Operation modes: + -i, --install copy missing standard auxiliary files --no-recursive don't rebuild sub-packages -s, --symlink with -i, install symbolic links instead of copies + -x, --exclude=STEPS steps we should not run -m, --make when applicable, re-run ./configure && make -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] -@@ -136,6 +137,13 @@ +@@ -141,6 +142,10 @@ my $run_make = 0; # Recurse into subpackages my $recursive = 1; @@ -20,13 +27,10 @@ Index: autoconf-2.63/bin/autoreconf.in +my @exclude; +my @ex; + -+my $uses_gettext; -+my $configure_ac; -+ ## ---------- ## ## Routines. ## ## ---------- ## -@@ -153,6 +161,7 @@ +@@ -161,6 +166,7 @@ sub parse_args () 'B|prepend-include=s' => \@prepend_include, 'i|install' => \$install, 's|symlink' => \$symlink, @@ -34,106 +38,85 @@ Index: autoconf-2.63/bin/autoreconf.in 'm|make' => \$run_make, 'recursive!' => \$recursive); -@@ -162,6 +171,8 @@ +@@ -170,6 +176,8 @@ sub parse_args () parse_WARNINGS; - parse_warnings '--warnings', @warning; + parse_warnings @warning; + @exclude = map { split /,/ } @exclude; + # Even if the user specified a configure.ac, trim to get the # directory, and look for configure.ac again. Because (i) the code # is simpler, and (ii) we are still able to diagnose simultaneous -@@ -255,6 +266,11 @@ - { - my ($aclocal, $flags) = @_; - -+ @ex = grep (/^aclocal$/, @exclude); -+ if ($#ex != -1) { -+ return; -+ } -+ - # aclocal 1.8+ does all this for free. It can be recognized by its - # --force support. - if ($aclocal_supports_force) -@@ -368,7 +384,10 @@ +@@ -493,8 +501,11 @@ sub autoreconf_current_directory ($) } else { -- xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); + @ex = grep (/^autopoint$/, @exclude); + if ($#ex == -1) { -+ xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); + xsystem_hint ("autopoint is needed because this package uses Gettext", + $autopoint); + } } -@@ -532,16 +551,17 @@ +@@ -687,9 +698,12 @@ sub autoreconf_current_directory ($) { $libtoolize .= " --ltdl"; } -- xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); -- $rerun_aclocal = 1; + @ex = grep (/^libtoolize$/, @exclude); + if ($#ex == -1) { -+ xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); -+ $rerun_aclocal = 1; + xsystem_hint ("libtoolize is needed because this package uses Libtool", + $libtoolize); + $rerun_aclocal = 1; + } } else { - verb "$configure_ac: not running libtoolize: --install not given"; +@@ -726,8 +740,11 @@ sub autoreconf_current_directory ($) } - -- -- - # ------------------- # - # Rerunning aclocal. # - # ------------------- # -@@ -572,7 +592,10 @@ + elsif ($install) + { ++ @ex = grep (/^gtkdocize$/, @exclude); ++ if ($#ex == -1) { + xsystem_hint ("gtkdocize is needed because this package uses Gtkdoc", + $gtkdocize); ++ } + } + else + { +@@ -765,7 +782,10 @@ sub autoreconf_current_directory ($) # latter runs the former, and (ii) autoconf is stricter than # autoheader. So all in all, autoconf should give better error # messages. -- xsystem ($autoconf); + @ex = grep (/^autoconf$/, @exclude); + if ($#ex == -1) { -+ xsystem ("$autoconf"); + xsystem ($autoconf); + } # -------------------- # -@@ -593,7 +616,10 @@ +@@ -786,7 +806,10 @@ sub autoreconf_current_directory ($) } else { -- xsystem ($autoheader); + @ex = grep (/^autoheader$/, @exclude); + if ($#ex == -1) { -+ xsystem ("$autoheader"); + xsystem ($autoheader); + } } -@@ -610,7 +636,10 @@ +@@ -803,7 +826,10 @@ sub autoreconf_current_directory ($) # We should always run automake, and let it decide whether it shall - # update the file or not. In fact, the effect of `$force' is already - # included in `$automake' via `--no-force'. -- xsystem ($automake); + # update the file or not. In fact, the effect of '$force' is already + # included in '$automake' via '--no-force'. + @ex = grep (/^automake$/, @exclude); + if ($#ex == -1) { -+ xsystem ("$automake"); + xsystem ($automake); + } } - -@@ -634,7 +663,10 @@ - } - else - { -- xsystem ("$make"); -+ @ex = grep (/^make$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$make"); -+ } - } - } - } + # ---------------------------------------------------- # +-- +2.25.1 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch b/poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch deleted file mode 100644 index 5ff18c235..000000000 --- a/poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Pending - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: autoconf-2.63/bin/autoreconf.in -=================================================================== ---- autoconf-2.63.orig/bin/autoreconf.in 2008-12-31 17:43:55.000000000 +0000 -+++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:46:16.000000000 +0000 -@@ -58,7 +58,7 @@ - $help = "Usage: $0 [OPTION]... [DIRECTORY]... - - Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint' --(formerly `gettextize'), and `libtoolize' where appropriate) -+(formerly `gettextize'), `libtoolize', and `gnu-configize' where appropriate) - repeatedly to remake the GNU Build System files in specified - DIRECTORIES and their subdirectories (defaulting to `.'). - -@@ -115,6 +115,7 @@ - my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; - my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; - my $make = $ENV{'MAKE'} || 'make'; -+my $gnuconfigize = $ENV{'GNUCONFIGIZE'} || 'gnu-configize'; - - # --install -- as --add-missing in other tools. - my $install = 0; -@@ -644,6 +645,10 @@ - } - } - -+ @ex = grep (/^gnu-configize$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$gnuconfigize"); -+ } - - # -------------- # - # Running make. # diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch b/poky/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch index b5e8174ef..de048d23d 100644 --- a/poky/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch +++ b/poky/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch @@ -1,22 +1,14 @@ -From a7e722f974e2529d3e564d8d94c86cc8bdbc40e7 Mon Sep 17 00:00:00 2001 -From: Radu Patriu <radu.patriu@enea.com> -Date: Mon, 24 Mar 2014 16:33:19 +0200 -Subject: [PATCH] autotest: new testsuite option to enable automake test - result format +From 8c0f24404bebffdaf3132d81e2b9560d34ff1677 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 12 Mar 2020 17:25:45 +0000 +Subject: [PATCH 6/7] autotest-automake-result-format.patch -* lib/autotest/general.m4: added "--am-fmt | -A" command line -parameter for testsuite script to enable "RESULT: testname" output; -will be used by yocto ptest packages. - -Upstream-Status: Pending - -Signed-off-by: Radu Patriu <radu.patriu@enea.com> --- - lib/autotest/general.m4 | 39 +++++++++++++++++++++++++++++---------- + lib/autotest/general.m4 | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4 -index 60c0352..c1f5a9b 100644 +index 0c0e3c5b..17590e96 100644 --- a/lib/autotest/general.m4 +++ b/lib/autotest/general.m4 @@ -412,6 +412,9 @@ at_recheck= @@ -29,7 +21,7 @@ index 60c0352..c1f5a9b 100644 # The directory we run the suite in. Default to . if no -C option. at_dir=`pwd` # An absolute reference to this testsuite script. -@@ -530,6 +533,10 @@ do +@@ -525,6 +528,10 @@ do at_check_filter_trace=at_fn_filter_trace ;; @@ -40,7 +32,7 @@ index 60c0352..c1f5a9b 100644 [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]]) at_fn_validate_ranges at_option AS_VAR_APPEND([at_groups], ["$at_option$as_nl"]) -@@ -718,10 +725,10 @@ m4_divert_push([HELP_MODES])dnl +@@ -713,10 +720,10 @@ m4_divert_push([HELP_MODES])dnl cat <<_ATEOF || at_write_fail=1 Operation modes: @@ -55,7 +47,7 @@ index 60c0352..c1f5a9b 100644 _ATEOF m4_divert_pop([HELP_MODES])dnl m4_wrap([m4_divert_push([HELP_TUNING_BEGIN])dnl -@@ -747,6 +754,7 @@ Execution tuning: +@@ -742,6 +749,7 @@ Execution tuning: -d, --debug inhibit clean up and top-level logging [ default for debugging scripts] -x, --trace enable tests shell tracing @@ -63,7 +55,7 @@ index 60c0352..c1f5a9b 100644 _ATEOF m4_divert_pop([HELP_TUNING_BEGIN])])dnl m4_divert_push([HELP_END])dnl -@@ -1162,7 +1170,9 @@ at_fn_group_banner () +@@ -1129,7 +1137,9 @@ at_fn_group_banner () [*]) at_desc_line="$[1]: " ;; esac AS_VAR_APPEND([at_desc_line], ["$[3]$[4]"]) @@ -74,7 +66,7 @@ index 60c0352..c1f5a9b 100644 echo "# -*- compilation -*-" >> "$at_group_log" } -@@ -1188,42 +1198,51 @@ _ATEOF +@@ -1155,42 +1165,51 @@ _ATEOF case $at_xfail:$at_status in yes:0) at_msg="UNEXPECTED PASS" @@ -132,5 +124,5 @@ index 60c0352..c1f5a9b 100644 at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg" case $at_status in -- -1.7.9.5 +2.25.1 diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch b/poky/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch deleted file mode 100644 index 73394d7d5..000000000 --- a/poky/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch +++ /dev/null @@ -1,34 +0,0 @@ -Use --warning=cross only if supported by automake - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - ---- a/bin/autoreconf.in -+++ b/bin/autoreconf.in -@@ -127,6 +127,8 @@ my $aclocal_supports_warnings = 0; - my $automake_supports_force_missing = 0; - # Does automake support -Wfoo? - my $automake_supports_warnings = 0; -+# Does automake support --warning=cross -+my $automake_supports_cross_warning = 0; - - my @prepend_include; - my @include; -@@ -191,6 +193,7 @@ sub parse_args () - $aclocal_supports_warnings = $aclocal_help =~ /--warnings/; - $automake_supports_force_missing = $automake_help =~ /--force-missing/; - $automake_supports_warnings = $automake_help =~ /--warnings/; -+ $automake_supports_cross_warning = $automake_help =~ /cross/; - - # Dispatch autoreconf's option to the tools. - # --include; -@@ -244,6 +247,8 @@ sub parse_args () - $libtoolize .= ' --debug'; - } - # --warnings; -+ @warning = grep { $_ ne "cross" } @warning -+ if ! $automake_supports_cross_warning; - if (@warning) - { - my $warn = ' --warnings=' . join (',', @warning); diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/config_site.patch b/poky/meta/recipes-devtools/autoconf/autoconf/config_site.patch deleted file mode 100644 index 9f044404d..000000000 --- a/poky/meta/recipes-devtools/autoconf/autoconf/config_site.patch +++ /dev/null @@ -1,40 +0,0 @@ -Upstream-Status: Pending - -Poky provides a list of site files in CONFIG_SITE whereas autoconf -only expects one file. This patch changes autoconf to accept a list of -them. - -RP 1/2/10 - -Updated for 2.68 version: the CONFIG_SITE var was not getting used at all -fixed the 2.68 code -Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/27 - -Index: autoconf-2.68/lib/autoconf/general.m4 -=================================================================== ---- autoconf-2.68.orig/lib/autoconf/general.m4 -+++ autoconf-2.68/lib/autoconf/general.m4 -@@ -1878,7 +1878,6 @@ AU_DEFUN([AC_VALIDATE_CACHED_SYSTEM_TUPL - m4_define([AC_SITE_LOAD], - [# Prefer an explicitly selected file to automatically selected ones. - ac_site_file1=NONE --ac_site_file2=NONE - if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in @%:@(( -@@ -1886,14 +1885,8 @@ if test -n "$CONFIG_SITE"; then - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac --elif test "x$prefix" != xNONE; then -- ac_site_file1=$prefix/share/config.site -- ac_site_file2=$prefix/etc/config.site --else -- ac_site_file1=$ac_default_prefix/share/config.site -- ac_site_file2=$ac_default_prefix/etc/config.site - fi --for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+for ac_site_file in $ac_site_file1 - do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch b/poky/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch deleted file mode 100644 index 65df88f8f..000000000 --- a/poky/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch +++ /dev/null @@ -1,120 +0,0 @@ -Upstream-Status: Pending - -We don't build xmkmf so any values returned from it are going to be wrong. -Using any paths in /usr/ for x headers/libs is a bad idea when cross compiling. -This patch removes them to stop any confusion. - -RP - 20071115 - -Index: autoconf-2.68/lib/autoconf/libs.m4 -=================================================================== ---- autoconf-2.68.orig/lib/autoconf/libs.m4 -+++ autoconf-2.68/lib/autoconf/libs.m4 -@@ -159,53 +159,6 @@ m4_popdef([AC_Lib_Name])dnl - # --------------------- # - - --# _AC_PATH_X_XMKMF --# ---------------- --# Internal subroutine of _AC_PATH_X. --# Set ac_x_includes and/or ac_x_libraries. --m4_define([_AC_PATH_X_XMKMF], --[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl --rm -f -r conftest.dir --if mkdir conftest.dir; then -- cd conftest.dir -- cat >Imakefile <<'_ACEOF' --incroot: -- @echo incroot='${INCROOT}' --usrlibdir: -- @echo usrlibdir='${USRLIBDIR}' --libdir: -- @echo libdir='${LIBDIR}' --_ACEOF -- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then -- # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -- for ac_var in incroot usrlibdir libdir; do -- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" -- done -- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -- for ac_extension in a so sl dylib la dll; do -- if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && -- test -f "$ac_im_libdir/libX11.$ac_extension"; then -- ac_im_usrlibdir=$ac_im_libdir; break -- fi -- done -- # Screen out bogus values from the imake configuration. They are -- # bogus both because they are the default anyway, and because -- # using them would break gcc on systems where it needs fixed includes. -- case $ac_im_incroot in -- /usr/include) ac_x_includes= ;; -- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; -- esac -- case $ac_im_usrlibdir in -- /usr/lib | /usr/lib64 | /lib | /lib64) ;; -- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; -- esac -- fi -- cd .. -- rm -f -r conftest.dir --fi --])# _AC_PATH_X_XMKMF -- -- - # _AC_PATH_X_DIRECT - # ----------------- - # Internal subroutine of _AC_PATH_X. -@@ -213,44 +166,7 @@ fi - m4_define([_AC_PATH_X_DIRECT], - [# Standard set of common directories for X headers. - # Check X11 before X11Rn because it is often a symlink to the current release. --ac_x_header_dirs=' --/usr/X11/include --/usr/X11R7/include --/usr/X11R6/include --/usr/X11R5/include --/usr/X11R4/include -- --/usr/include/X11 --/usr/include/X11R7 --/usr/include/X11R6 --/usr/include/X11R5 --/usr/include/X11R4 -- --/usr/local/X11/include --/usr/local/X11R7/include --/usr/local/X11R6/include --/usr/local/X11R5/include --/usr/local/X11R4/include -- --/usr/local/include/X11 --/usr/local/include/X11R7 --/usr/local/include/X11R6 --/usr/local/include/X11R5 --/usr/local/include/X11R4 -- --/usr/X386/include --/usr/x386/include --/usr/XFree86/include/X11 -- --/usr/include --/usr/local/include --/usr/unsupported/include --/usr/athena/include --/usr/local/x11r5/include --/usr/lpp/Xamples/include -- --/usr/openwin/include --/usr/openwin/share/include' -+ac_x_header_dirs='' - - if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. -@@ -299,7 +215,6 @@ AC_DEFUN([_AC_PATH_X], - [AC_CACHE_VAL(ac_cv_have_x, - [# One or both of the vars are not set, and there is no cached value. - ac_x_includes=no ac_x_libraries=no --_AC_PATH_X_XMKMF - _AC_PATH_X_DIRECT - case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/man-host-perl.patch b/poky/meta/recipes-devtools/autoconf/autoconf/man-host-perl.patch new file mode 100644 index 000000000..c6c135625 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/man-host-perl.patch @@ -0,0 +1,24 @@ +Don't use the target perl when regenerating the man pages. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/man/local.mk b/man/local.mk +index e69858b1..78c68ab5 100644 +--- a/man/local.mk ++++ b/man/local.mk +@@ -67,13 +67,12 @@ SUFFIXES += .w .1 + @echo "Updating man page $@" + $(MKDIR_P) $(@D) + PATH="$(top_srcdir)/man$(PATH_SEPARATOR)$$PATH"; \ +- PERL="$(PERL)"; \ + PACKAGE_NAME="$(PACKAGE_NAME)"; \ + VERSION="$(VERSION)"; \ + RELEASE_YEAR="$(RELEASE_YEAR)"; \ + top_srcdir="$(top_srcdir)"; \ + channeldefs_pm="$(channeldefs_pm)"; \ +- export PATH PERL PACKAGE_NAME VERSION RELEASE_YEAR; \ ++ export PATH PACKAGE_NAME VERSION RELEASE_YEAR; \ + export top_srcdir channeldefs_pm; \ + $(HELP2MAN) \ + --include=$(srcdir)/$*.x \ diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/no-man.patch b/poky/meta/recipes-devtools/autoconf/autoconf/no-man.patch new file mode 100644 index 000000000..2c44375f4 --- /dev/null +++ b/poky/meta/recipes-devtools/autoconf/autoconf/no-man.patch @@ -0,0 +1,21 @@ +For native builds we don't care about the documentation, and this would +otherwise pull in a dependency on help2man. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/Makefile.in b/Makefile.in +index 146e8e3..a1827c1 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -763,10 +762,0 @@ dist_buildaux_SCRIPTS = \ +-dist_man_MANS = \ +- man/autoconf.1 \ +- man/autoheader.1 \ +- man/autom4te.1 \ +- man/autoreconf.1 \ +- man/autoscan.1 \ +- man/autoupdate.1 \ +- man/ifnames.1 +- +- diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/performance.patch b/poky/meta/recipes-devtools/autoconf/autoconf/performance.patch deleted file mode 100644 index 1842fe92b..000000000 --- a/poky/meta/recipes-devtools/autoconf/autoconf/performance.patch +++ /dev/null @@ -1,60 +0,0 @@ -The check for solaris 'print' causes significant problems on a linux machine -with dash as /bin/sh since it triggers the execution of "print" which on some -linux systems is a perl script which is part of mailcap. Worse, this perl -script calls "which file" and if successful ignores the path file was found -in and just runs "file" without a path. Each exection causes PATH to be searched. - -Simply assuming the shell's printf function works cuts out all the fork overhead -and when parallel tasks are running, this overhead appears to be significant. - -RP -2015/11/28 -Upstream-Status: Inappropriate - -Index: autoconf-2.69/lib/m4sugar/m4sh.m4 -=================================================================== ---- autoconf-2.69.orig/lib/m4sugar/m4sh.m4 -+++ autoconf-2.69/lib/m4sugar/m4sh.m4 -@@ -1045,40 +1045,8 @@ m4_defun([_AS_ECHO_PREPARE], - [[as_nl=' - ' - export as_nl --# Printing a long string crashes Solaris 7 /usr/bin/printf. --as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --# Prefer a ksh shell builtin over an external printf program on Solaris, --# but without wasting forks for bash or zsh. --if test -z "$BASH_VERSION$ZSH_VERSION" \ -- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -- as_echo='print -r --' -- as_echo_n='print -rn --' --elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -- as_echo='printf %s\n' -- as_echo_n='printf %s' --else -- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -- as_echo_body='eval /usr/ucb/echo -n "$][1$as_nl"' -- as_echo_n='/usr/ucb/echo -n' -- else -- as_echo_body='eval expr "X$][1" : "X\\(.*\\)"' -- as_echo_n_body='eval -- arg=$][1; -- case $arg in @%:@( -- *"$as_nl"*) -- expr "X$arg" : "X\\(.*\\)$as_nl"; -- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -- esac; -- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -- ' -- export as_echo_n_body -- as_echo_n='sh -c $as_echo_n_body as_echo' -- fi -- export as_echo_body -- as_echo='sh -c $as_echo_body as_echo' --fi -+as_echo='printf %s\n' -+as_echo_n='printf %s' - ]])# _AS_ECHO_PREPARE - - diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/preferbash.patch b/poky/meta/recipes-devtools/autoconf/autoconf/preferbash.patch index fa76ee9bd..3979e83f7 100644 --- a/poky/meta/recipes-devtools/autoconf/autoconf/preferbash.patch +++ b/poky/meta/recipes-devtools/autoconf/autoconf/preferbash.patch @@ -1,25 +1,36 @@ -This value is used to determine CONFIG_SHELL and SHELL which may get exported into -scripts shared via sstate onto other systems. +From 0aac3047cd7681d610b22d79501c297fa3433148 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 12 Mar 2020 17:25:41 +0000 +Subject: [PATCH 2/7] m4sh: prefer bash over sh -Some systems have /bin/sh -> dash and others /bin/sh -> bash. Bash is preferred -but sometimes we can sometimes end up exporting /bin/sh yet use bashisms. +_AS_DETECT_BETTER_SHELL looks for a good shell to use, and tries to look for +'sh' before 'bash'. Whilst for many systems sh is a symlink to bash, +there are many where sh is a symlink to a more minimal sh implementation. -This patch puts bash first in the search results which avoids the bash/dash confusion. +For example, Debian by default has /bin/sh -> /bin/dash: dash is a faster +shell to start (which makes a notable difference to boot speed) but is not +as fast as bash at executing long scripts (and configure scripts are not +known for their conciseness). -RP 2012/9/23 +Change the search order to bash then sh, so that a known-good shell (bash) +is used if available over something which is merely POSIX compliant. +--- + lib/m4sugar/m4sh.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Upstream-Status: Inappropriate [OE specific configuration] - -Index: autoconf-2.69/lib/m4sugar/m4sh.m4 -=================================================================== ---- autoconf-2.69.orig/lib/m4sugar/m4sh.m4 2012-03-07 17:35:26.000000000 +0000 -+++ autoconf-2.69/lib/m4sugar/m4sh.m4 2013-09-23 16:12:38.853597515 +0000 -@@ -229,7 +229,7 @@ +diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 +index 9d543952..84ef84a9 100644 +--- a/lib/m4sugar/m4sh.m4 ++++ b/lib/m4sugar/m4sh.m4 +@@ -230,7 +230,7 @@ dnl Remove any tests from suggested that are also required [_AS_PATH_WALK([/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH], [case $as_dir in @%:@( /*) - for as_base in sh bash ksh sh5; do + for as_base in bash sh ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base AS_IF([{ test -f "$as_shell" || test -f "$as_shell.exe"; } && +-- +2.25.1 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch b/poky/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch index 978a401f0..4ff535fc1 100644 --- a/poky/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch +++ b/poky/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch @@ -1,20 +1,26 @@ -Upstream-Status: Pending +From f4f19a5c03e8ae3b9cc93d24b76694f4b7b2eb76 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 12 Mar 2020 17:28:38 +0000 +Subject: [PATCH 3/7] program_prefix.patch -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# +Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + lib/autoconf/general.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ---- autoconf-2.57/lib/autoconf/general.m4~program_prefix -+++ autoconf-2.57/lib/autoconf/general.m4 -@@ -1676,8 +1676,9 @@ +diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 +index 16f0d074..4c5e0b36 100644 +--- a/lib/autoconf/general.m4 ++++ b/lib/autoconf/general.m4 +@@ -2070,7 +2070,7 @@ _AC_CANONICAL_SPLIT([target]) + # The aliases save the names the user supplied, while $host etc. # will get canonicalized. - test -n "$target_alias" && -- test "$program_prefix$program_suffix$program_transform_name" = \ -- NONENONEs,x,x, && -+ test "$target_alias" != "$host_alias" && -+ test "$program_prefix$program_suffix$program_transform_name" = \ -+ NONENONEs,x,x, && +-test -n "$target_alias" && ++test -n "$target_alias" && test "$target_alias" != "$host_alias" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && program_prefix=${target_alias}-[]dnl - ])# AC_CANONICAL_TARGET - +-- +2.25.1 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch b/poky/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch index 55d2e2fe7..b842f14f4 100644 --- a/poky/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch +++ b/poky/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch @@ -1,17 +1,18 @@ -We have problem using hardcoded directories like /usr/local here -which will be checked for cross builds. This is a special case which -is valid for AIX only. We do not have AIX as one of our supported -build host or target. Therefore we get rid of the hardcoded paths -and make life easier for cross compilation process. +From a08643ac3fef884900d6cfa161f0acec3ef104d1 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 12 Mar 2020 17:25:37 +0000 +Subject: [PATCH 1/7] remove-usr-local-lib-from-m4.patch -Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + lib/autoconf/functions.m4 | 9 --------- + 1 file changed, 9 deletions(-) -Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] -Index: autoconf-2.68/lib/autoconf/functions.m4 -=================================================================== ---- autoconf-2.68.orig/lib/autoconf/functions.m4 2010-09-22 14:52:19.000000000 -0700 -+++ autoconf-2.68/lib/autoconf/functions.m4 2011-08-03 11:57:05.822199513 -0700 -@@ -749,15 +749,6 @@ if test $ac_have_func = no; then +diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 +index 12f60b99..07da7941 100644 +--- a/lib/autoconf/functions.m4 ++++ b/lib/autoconf/functions.m4 +@@ -801,15 +801,6 @@ if test $ac_have_func = no; then [LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes]) fi @@ -27,3 +28,6 @@ Index: autoconf-2.68/lib/autoconf/functions.m4 # Make sure it is really in the library, if we think we found it, # otherwise set up the replacement function. AC_CHECK_FUNCS(getloadavg, [], +-- +2.25.1 + diff --git a/poky/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/poky/meta/recipes-devtools/autoconf/autoconf_2.69.bb deleted file mode 100644 index 2e1b9bdc9..000000000 --- a/poky/meta/recipes-devtools/autoconf/autoconf_2.69.bb +++ /dev/null @@ -1,31 +0,0 @@ -require autoconf.inc - -PR = "r11" - -LICENSE = "GPLv2 & GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \ - file://program_prefix.patch \ - file://check-automake-cross-warning.patch \ - file://autoreconf-exclude.patch \ - file://autoreconf-gnuconfigize.patch \ - file://config_site.patch \ - file://remove-usr-local-lib-from-m4.patch \ - file://preferbash.patch \ - file://autotest-automake-result-format.patch \ - file://add_musl_config.patch \ - file://performance.patch \ - file://AC_HEADER_MAJOR-port-to-glibc-2.25.patch \ - file://autoconf-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ - " - -SRC_URI[md5sum] = "82d05e03b93e45f5a39b828dc9c6c29b" -SRC_URI[sha256sum] = "954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969" - -SRC_URI_append_class-native = " file://fix_path_xtra.patch" - -EXTRA_OECONF += "ac_cv_path_M4=m4 ac_cv_prog_TEST_EMACS=no" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/autoconf/autoconf.inc b/poky/meta/recipes-devtools/autoconf/autoconf_2.71.bb index 787f30a09..852606720 100644 --- a/poky/meta/recipes-devtools/autoconf/autoconf.inc +++ b/poky/meta/recipes-devtools/autoconf/autoconf_2.71.bb @@ -2,10 +2,26 @@ SUMMARY = "A GNU tool that produce shell scripts to automatically configure soft DESCRIPTION = "Autoconf is an extensible package of M4 macros that produce shell scripts to automatically \ configure software source code packages. Autoconf creates a configuration script for a package from a template \ file that lists the operating system features that the package can use, in the form of M4 macro calls." -LICENSE = "GPLv3" +LICENSE = "GPLv3+" HOMEPAGE = "http://www.gnu.org/software/autoconf/" SECTION = "devel" -DEPENDS = "m4-native gnu-config-native" +DEPENDS = "m4-native autoconf-native automake-native gnu-config-native help2man-native" +DEPENDS_remove_class-native = "autoconf-native automake-native help2man-native" + +LIC_FILES_CHKSUM = "file://COPYING;md5=cc3f3a7596cb558bbd9eb7fbaa3ef16c \ + file://COPYINGv3;md5=1ebbd3e34237af26da5dc08a4e440464" + +SRC_URI = "${GNU_MIRROR}/autoconf/${BP}.tar.gz \ + file://program_prefix.patch \ + file://autoreconf-exclude.patch \ + file://remove-usr-local-lib-from-m4.patch \ + file://preferbash.patch \ + file://autotest-automake-result-format.patch \ + file://man-host-perl.patch \ + " +SRC_URI_append_class-native = " file://no-man.patch" + +SRC_URI[sha256sum] = "431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c" RDEPENDS_${PN} = "m4 gnu-config \ perl \ @@ -24,42 +40,18 @@ RDEPENDS_${PN} = "m4 gnu-config \ perl-module-file-spec \ perl-module-file-spec-unix \ perl-module-file-stat \ + perl-module-file-temp \ perl-module-getopt-long \ perl-module-io-file \ + perl-module-list-util \ perl-module-overloading \ perl-module-posix \ + perl-module-scalar-util \ perl-module-symbol \ perl-module-thread-queue \ perl-module-threads \ " -RDEPENDS_${PN}_class-native = "m4-native gnu-config-native" -RDEPENDS_${PN}_class-nativesdk = "\ - nativesdk-gnu-config \ - nativesdk-m4 \ - nativesdk-perl \ - nativesdk-perl-module-bytes \ - nativesdk-perl-module-carp \ - nativesdk-perl-module-constant \ - nativesdk-perl-module-data-dumper \ - nativesdk-perl-module-errno \ - nativesdk-perl-module-exporter \ - nativesdk-perl-module-file-basename \ - nativesdk-perl-module-file-compare \ - nativesdk-perl-module-file-copy \ - nativesdk-perl-module-file-find \ - nativesdk-perl-module-file-glob \ - nativesdk-perl-module-file-path \ - nativesdk-perl-module-file-spec \ - nativesdk-perl-module-file-spec-unix \ - nativesdk-perl-module-file-stat \ - nativesdk-perl-module-getopt-long \ - nativesdk-perl-module-io-file \ - nativesdk-perl-module-overloading \ - nativesdk-perl-module-posix \ - nativesdk-perl-module-symbol \ - nativesdk-perl-module-thread-queue \ - nativesdk-perl-module-threads \ - " +RDEPENDS_${PN}_class-native = "m4-native gnu-config-native hostperl-runtime-native" inherit autotools texinfo @@ -69,14 +61,21 @@ PERL_class-nativesdk = "/usr/bin/env perl" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" -do_configure() { - # manually install a newer config.guess/.sub +EXTRA_OECONF += "ac_cv_path_M4=m4 ac_cv_prog_TEST_EMACS=no" + +# As autoconf installs its own config.* files, ensure that they're always up to date. +update_gnu_config() { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/build-aux install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/build-aux +} +do_configure[prefuncs] += "update_gnu_config" +do_configure_class-native() { oe_runconf } do_install_append() { rm -rf ${D}${datadir}/emacs } + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/automake/automake_1.16.2.bb b/poky/meta/recipes-devtools/automake/automake_1.16.2.bb index fd8ed0ed3..08ec03462 100644 --- a/poky/meta/recipes-devtools/automake/automake_1.16.2.bb +++ b/poky/meta/recipes-devtools/automake/automake_1.16.2.bb @@ -17,7 +17,6 @@ RDEPENDS_${PN} += "\ perl-module-vars " RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native" -RDEPENDS_${PN}_class-nativesdk = "nativesdk-autoconf" SRC_URI += "file://python-libdir.patch \ file://buildtest.patch \ diff --git a/poky/meta/recipes-devtools/binutils/binutils-2.35.inc b/poky/meta/recipes-devtools/binutils/binutils-2.36.inc index aa02063b1..296829188 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-2.35.inc +++ b/poky/meta/recipes-devtools/binutils/binutils-2.36.inc @@ -14,17 +14,17 @@ def binutils_branch_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] -# When upgrading to 2.35, please make sure there is no trailing .0, so +# When upgrading to 2.37, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.35" -CVE_VERSION = "2.35" +PV = "2.36.1" +CVE_VERSION = "2.36.1" BINUPV = "${@binutils_branch_version(d)}" #BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_35-branch" +BRANCH ?= "binutils-2_36-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" -SRCREV ?= "89a9065674a14a8bd94bb326b27d19a2f3583efb" +SRCREV ?= "7651a4871c225925ffdfda0a8c91a6ed370cd9a1" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ @@ -41,7 +41,5 @@ SRC_URI = "\ file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ file://0015-sync-with-OE-libtool-changes.patch \ file://0016-Check-for-clang-before-checking-gcc-version.patch \ - file://0017-gas-improve-reproducibility-for-stabs-debugging-data.patch \ - file://0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.35.bb b/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.36.bb index 5dbaa0301..5dbaa0301 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.35.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.36.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.35.bb b/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.36.bb index 07a8e7c41..07a8e7c41 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.35.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.36.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross_2.35.bb b/poky/meta/recipes-devtools/binutils/binutils-cross_2.36.bb index fbd1f7d25..fbd1f7d25 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-cross_2.35.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-cross_2.36.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.35.bb b/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.36.bb index 37f4d6d2e..37f4d6d2e 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.35.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.36.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils.inc b/poky/meta/recipes-devtools/binutils/binutils.inc index e93cd50b2..81891963c 100644 --- a/poky/meta/recipes-devtools/binutils/binutils.inc +++ b/poky/meta/recipes-devtools/binutils/binutils.inc @@ -18,6 +18,7 @@ inherit autotools gettext multilib_header texinfo FILES_${PN} = " \ ${bindir}/${TARGET_PREFIX}* \ ${libdir}/lib*.so.* \ + ${libdir}/bfd-plugins/lib*.so \ ${libdir}/lib*-${PV}*.so \ ${prefix}/${TARGET_SYS}/bin/* \ ${bindir}/embedspu" diff --git a/poky/meta/recipes-devtools/binutils/binutils/0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch b/poky/meta/recipes-devtools/binutils/binutils/0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch deleted file mode 100644 index f46ddab41..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch +++ /dev/null @@ -1,135 +0,0 @@ -From c7cd291722779c9d4703ed0010388fe394c644c8 Mon Sep 17 00:00:00 2001 -From: Siddhesh Poyarekar <siddesh.poyarekar@arm.com> -Date: Tue, 1 Sep 2020 14:25:52 +0530 -Subject: [PATCH] aarch64: Return an error on conditional branch to an undefined symbol - -The fix in 7e05773767820b441b23a16628b55c98cb1aef46 introduced a PLT -for conditional jumps when the target symbol is undefined. This is -incorrect because conditional branch relocations are not allowed to -clobber IP0/IP1 and hence, should not result in a dynamic relocation. - -Revert that change and in its place, issue an error when the target -symbol is undefined. - -bfd/ - - 2020-09-10 Siddhesh Poyarekar <siddesh.poyarekar@arm.com> - - * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Revert - changes in 7e05773767820b441b23a16628b55c98cb1aef46. Set - error for undefined symbol in BFD_RELOC_AARCH64_BRANCH19 and - BFD_RELOC_AARCH64_TSTBR14 relocations. - -ld/ - - 2020-09-10 Siddhesh Poyarekar <siddesh.poyarekar@arm.com> - - * testsuite/ld-aarch64/emit-relocs-560.d: Expect error instead - of valid output. ---- -Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=c7cd291722779c9d4703ed0010388fe394c644c8] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - bfd/ChangeLog | 7 +++++ - bfd/elfnn-aarch64.c | 37 ++++++++++++----------- - ld/ChangeLog | 5 +++ - ld/testsuite/ld-aarch64/emit-relocs-560.d | 7 +---- - 4 files changed, 32 insertions(+), 24 deletions(-) - -diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c -index 5b4c189b593..a9924e7ec56 100644 ---- a/bfd/elfnn-aarch64.c -+++ b/bfd/elfnn-aarch64.c -@@ -5447,7 +5447,6 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, - bfd_vma orig_value = value; - bfd_boolean resolved_to_zero; - bfd_boolean abs_symbol_p; -- bfd_boolean via_plt_p; - - globals = elf_aarch64_hash_table (info); - -@@ -5469,8 +5468,6 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, - : bfd_is_und_section (sym_sec)); - abs_symbol_p = h != NULL && bfd_is_abs_symbol (&h->root); - -- via_plt_p = (globals->root.splt != NULL && h != NULL -- && h->plt.offset != (bfd_vma) - 1); - - /* Since STT_GNU_IFUNC symbol must go through PLT, we handle - it here if it is defined in a non-shared object. */ -@@ -5806,23 +5803,12 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, - value += signed_addend; - break; - -- case BFD_RELOC_AARCH64_BRANCH19: -- case BFD_RELOC_AARCH64_TSTBR14: -- /* A conditional branch to an undefined weak symbol is converted to a -- branch to itself. */ -- if (weak_undef_p && !via_plt_p) -- { -- value = _bfd_aarch64_elf_resolve_relocation (input_bfd, bfd_r_type, -- place, value, -- signed_addend, -- weak_undef_p); -- break; -- } -- /* Fall through. */ - case BFD_RELOC_AARCH64_CALL26: - case BFD_RELOC_AARCH64_JUMP26: - { - asection *splt = globals->root.splt; -+ bfd_boolean via_plt_p = -+ splt != NULL && h != NULL && h->plt.offset != (bfd_vma) - 1; - - /* A call to an undefined weak symbol is converted to a jump to - the next instruction unless a PLT entry will be created. -@@ -5903,6 +5889,23 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, - bfd_set_error (bfd_error_bad_value); - return bfd_reloc_notsupported; - } -+ value = _bfd_aarch64_elf_resolve_relocation (input_bfd, bfd_r_type, -+ place, value, -+ signed_addend, -+ weak_undef_p); -+ break; -+ -+ case BFD_RELOC_AARCH64_BRANCH19: -+ case BFD_RELOC_AARCH64_TSTBR14: -+ if (h && h->root.type == bfd_link_hash_undefined) -+ { -+ _bfd_error_handler -+ /* xgettext:c-format */ -+ (_("%pB: conditional branch to undefined symbol `%s' " -+ "not allowed"), input_bfd, h->root.root.string); -+ bfd_set_error (bfd_error_bad_value); -+ return bfd_reloc_notsupported; -+ } - /* Fall through. */ - - case BFD_RELOC_AARCH64_16: -@@ -7968,8 +7971,6 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, - break; - } - -- case BFD_RELOC_AARCH64_BRANCH19: -- case BFD_RELOC_AARCH64_TSTBR14: - case BFD_RELOC_AARCH64_CALL26: - case BFD_RELOC_AARCH64_JUMP26: - /* If this is a local symbol then we resolve it -diff --git a/ld/testsuite/ld-aarch64/emit-relocs-560.d b/ld/testsuite/ld-aarch64/emit-relocs-560.d -index 153532457b4..8751b743bd4 100644 ---- a/ld/testsuite/ld-aarch64/emit-relocs-560.d -+++ b/ld/testsuite/ld-aarch64/emit-relocs-560.d -@@ -1,8 +1,3 @@ - #source: emit-relocs-560.s - #ld: -shared --#readelf: -r -- --Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 2 entries: -- Offset Info Type Sym. Value Sym. Name \+ Addend --[0-9a-f]+ 000100000402 R_AARCH64_JUMP_SL 0000000000000000 baz \+ 0 --[0-9a-f]+ 000200000402 R_AARCH64_JUMP_SL 0000000000000000 bar \+ 0 -+#error: .*: conditional branch to undefined symbol `bar' not allowed --- -2.29.2 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 4c1d11291..49dacfef8 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,7 +1,7 @@ -From a0b23b160d6cfa7be4437c6e623633d76395f2ad Mon Sep 17 00:00:00 2001 +From 3b278a56a0e98d50ec62735598ee5f4b1834e8b3 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:58:54 +0000 -Subject: [PATCH 01/16] binutils-crosssdk: Generate relocatable SDKs +Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs This patch will modify the ELF linker scripts so that the crosssdk linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries @@ -21,10 +21,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gold/layout.cc b/gold/layout.cc -index 13e533aaf21..b0afff16e2e 100644 +index a27cb071c75..32b52890b39 100644 --- a/gold/layout.cc +++ b/gold/layout.cc -@@ -5019,7 +5019,7 @@ Layout::create_interp(const Target* target) +@@ -5032,7 +5032,7 @@ Layout::create_interp(const Target* target) gold_assert(interp != NULL); } @@ -34,7 +34,7 @@ index 13e533aaf21..b0afff16e2e 100644 Output_section_data* odata = new Output_data_const(interp, len, 1); diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index 03392d265c7..435689ea144 100755 +index 088417ef2d5..46a2db7005c 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" @@ -59,10 +59,10 @@ index 03392d265c7..435689ea144 100755 DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index eb74743e5c3..c9a8a47615f 100644 +index 29a8f0781d5..75e46f4adaf 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc -@@ -143,8 +143,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then +@@ -147,8 +147,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);" fi fi @@ -73,6 +73,3 @@ index eb74743e5c3..c9a8a47615f 100644 fi if test -z "$PLT"; then IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index 41dff05b2..d07947404 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,8 +1,7 @@ -From 0d14f8f333a9b519202246ce779f3e380491826c Mon Sep 17 00:00:00 2001 +From cf4c8a97b7dc1fe36a7d5dabed417fe18b15ad6b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 6 Mar 2017 23:37:05 -0800 -Subject: [PATCH 02/17] binutils-cross: Do not generate linker script - directories +Subject: [PATCH] binutils-cross: Do not generate linker script directories We don't place target libraries within ${exec_prefix}, we'd always place these within the target sysroot within the standard library directories. Worse, the @@ -23,7 +22,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 25 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index 435689ea144..cff8a1467f9 100755 +index 46a2db7005c..4bb7c33f560 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -235,31 +235,6 @@ append_to_lib_path() @@ -58,6 +57,3 @@ index 435689ea144..cff8a1467f9 100755 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then libs=${NATIVE_LIB_DIRS} if [ "x${NATIVE}" = "xyes" ] ; then --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 28daf58f7..cc37d30c5 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -1,8 +1,8 @@ -From 3bbec749ec9fe681ade6812c48c541a752fcffd5 Mon Sep 17 00:00:00 2001 +From 9701cab0fdf6a0c011978ae140c4c12a962956f6 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Wed, 19 Feb 2020 09:51:16 -0800 -Subject: [PATCH 03/17] binutils-nativesdk: Search for alternative ld.so.conf - in SDK installation +Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK + installation We need binutils to look at our ld.so.conf file within the SDK to ensure we search the SDK's libdirs as well as those from the host system. @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index 02c4fc16395..a5762227f0a 100644 +index 2c9a487335c..3b01357b651 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ @@ -43,10 +43,10 @@ index 02c4fc16395..a5762227f0a 100644 NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) diff --git a/ld/Makefile.in b/ld/Makefile.in -index 2fe12e14f63..8f0c83ac8d2 100644 +index b41941c89e2..a6382bf2a45 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -548,7 +548,8 @@ ZLIB = @zlibdir@ -lz +@@ -554,7 +554,8 @@ ZLIB = @zlibdir@ -lz ZLIBINC = @zlibinc@ ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ @@ -57,7 +57,7 @@ index 2fe12e14f63..8f0c83ac8d2 100644 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) diff --git a/ld/ldelf.c b/ld/ldelf.c -index bada3ade2d7..b4784009d7a 100644 +index f7407ab55a7..b25781cc0c4 100644 --- a/ld/ldelf.c +++ b/ld/ldelf.c @@ -911,7 +911,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, @@ -70,7 +70,7 @@ index bada3ade2d7..b4784009d7a 100644 if (!ldelf_parse_ld_so_conf (&info, tmppath)) { diff --git a/ld/ldmain.c b/ld/ldmain.c -index 08be9030cb5..f5c5a336320 100644 +index 863df0293ea..080b1c4c6c2 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -70,6 +70,7 @@ char *program_name; @@ -82,7 +82,7 @@ index 08be9030cb5..f5c5a336320 100644 /* The canonical representation of ld_sysroot. */ char *ld_canon_sysroot; diff --git a/ld/ldmain.h b/ld/ldmain.h -index ac7db5720d5..1cbe1771912 100644 +index 38e63922d31..0966914938c 100644 --- a/ld/ldmain.h +++ b/ld/ldmain.h @@ -23,6 +23,7 @@ @@ -93,6 +93,3 @@ index ac7db5720d5..1cbe1771912 100644 extern char *ld_canon_sysroot; extern int ld_canon_sysroot_len; extern FILE *saved_script_handle; --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/poky/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch index 2381c7b85..1cd459ae8 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch @@ -1,7 +1,7 @@ -From 361c2c313196c095d12d17cecf0a069107dd629b Mon Sep 17 00:00:00 2001 +From 7e7512c82402363688cca6f1febea2c01cb03409 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:07:33 +0000 -Subject: [PATCH 04/17] configure: widen the regexp for SH architectures +Subject: [PATCH] configure: widen the regexp for SH architectures gprof needs to know about uclibc @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 54d0339ab9e..6782f8b6ab8 100755 +index 68779feb42b..7b369071141 100755 --- a/configure +++ b/configure -@@ -3937,7 +3937,7 @@ case "${target}" in +@@ -3887,7 +3887,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -27,10 +27,10 @@ index 54d0339ab9e..6782f8b6ab8 100755 sh*-*-elf) ;; diff --git a/configure.ac b/configure.ac -index a910c4fd6ba..55beb1dea46 100644 +index d16a2757689..92f01fb3ed7 100644 --- a/configure.ac +++ b/configure.ac -@@ -1178,7 +1178,7 @@ case "${target}" in +@@ -1177,7 +1177,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -39,6 +39,3 @@ index a910c4fd6ba..55beb1dea46 100644 case "${target}" in sh*-*-elf) ;; --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch b/poky/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch index c31a0bc9a..dde0cb5d6 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch @@ -1,7 +1,7 @@ -From 39b478b7e52fb1b892a392f3c3750b9023cfabc8 Mon Sep 17 00:00:00 2001 +From 6a67d277941228d997b527990960413f8444fb81 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:09:58 +0000 -Subject: [PATCH 05/17] Point scripts location to libdir +Subject: [PATCH] Point scripts location to libdir Upstream-Status: Inappropriate [debian patch] @@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index a5762227f0a..e1c665898f3 100644 +index 3b01357b651..b7a1f7491b0 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) @@ -25,10 +25,10 @@ index a5762227f0a..e1c665898f3 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index 8f0c83ac8d2..acc24ec4130 100644 +index a6382bf2a45..5ee3a4971be 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -556,7 +556,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -562,7 +562,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -37,6 +37,3 @@ index 8f0c83ac8d2..acc24ec4130 100644 BASEDIR = $(srcdir)/.. BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/poky/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 654b64ff7..caa5f0bdd 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,8 +1,7 @@ -From 59640ddf11104a604ccf7c078a48359d711c2f9c Mon Sep 17 00:00:00 2001 +From 8ad249270414a23a3e65c74fd67a8e4adaebec78 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:27:17 +0000 -Subject: [PATCH 06/17] Only generate an RPATH entry if LD_RUN_PATH is not - empty +Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty for cases where -rpath isn't specified. debian (#151024) @@ -15,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 4 insertions(+) diff --git a/ld/ldelf.c b/ld/ldelf.c -index b4784009d7a..541772f4604 100644 +index b25781cc0c4..77d7fb8ff03 100644 --- a/ld/ldelf.c +++ b/ld/ldelf.c -@@ -1247,6 +1247,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, +@@ -1248,6 +1248,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, && command_line.rpath == NULL) { path = (const char *) getenv ("LD_RUN_PATH"); @@ -27,7 +26,7 @@ index b4784009d7a..541772f4604 100644 if (path && ldelf_search_needed (path, &n, force, is_linux, elfsize)) -@@ -1605,6 +1607,8 @@ ldelf_before_allocation (char *audit, char *depaudit, +@@ -1608,6 +1610,8 @@ ldelf_before_allocation (char *audit, char *depaudit, rpath = command_line.rpath; if (rpath == NULL) rpath = (const char *) getenv ("LD_RUN_PATH"); @@ -36,6 +35,3 @@ index b4784009d7a..541772f4604 100644 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/poky/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index 7f8fc9a5c..b13a35e02 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,8 +1,8 @@ -From 2b81508b9af76db292cd756432b03035cb8157e0 Mon Sep 17 00:00:00 2001 +From 091870218f192a5698c4420adf938e7178553c07 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:39:01 +0000 -Subject: [PATCH 07/17] don't let the distro compiler point to the wrong - installation location +Subject: [PATCH] don't let the distro compiler point to the wrong installation + location Thanks to RP for helping find the source code causing the issue. @@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 895f701bcd0..97a53f15bb6 100644 +index 788590957e1..1bca4aafeb7 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -367,7 +367,8 @@ install-strip: install @@ -30,6 +30,3 @@ index 895f701bcd0..97a53f15bb6 100644 install_to_libdir: all if test -n "${target_header_dir}"; then \ ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/poky/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch index 2356c6a60..3f83d48f6 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,7 +1,7 @@ -From 413075afbdb16e7cc05511682ca9e3c880acb5a7 Mon Sep 17 00:00:00 2001 +From a1d0ca24d3bbdf4cb37537cd84d04a17bf0f813b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 15 Jan 2016 06:31:09 +0000 -Subject: [PATCH 08/17] warn for uses of system directories when cross linking +Subject: [PATCH] warn for uses of system directories when cross linking 2008-07-02 Joseph Myers <joseph@codesourcery.com> @@ -57,13 +57,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> ld/ld.h | 8 ++++++++ ld/ld.texi | 12 ++++++++++++ ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 5 +++++ + ld/ldlex.h | 2 ++ ld/ldmain.c | 2 ++ - ld/lexsup.c | 27 +++++++++++++++++++++++++++ - 9 files changed, 100 insertions(+) + ld/lexsup.c | 15 +++++++++++++++ + 9 files changed, 85 insertions(+) diff --git a/ld/config.in b/ld/config.in -index f1712107367..308e0173c16 100644 +index 7b60d778587..37b8e9b6f6c 100644 --- a/ld/config.in +++ b/ld/config.in @@ -40,6 +40,9 @@ @@ -77,10 +77,10 @@ index f1712107367..308e0173c16 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index f08ce9969ea..1c872c0db5f 100755 +index d399d08d0c4..8355c433c76 100755 --- a/ld/configure +++ b/ld/configure -@@ -826,6 +826,7 @@ with_lib_path +@@ -828,6 +828,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -88,7 +88,7 @@ index f08ce9969ea..1c872c0db5f 100755 enable_gold enable_got enable_compressed_debug_sections -@@ -1493,6 +1494,8 @@ Optional Features: +@@ -1496,6 +1497,8 @@ Optional Features: --disable-largefile omit support for large files --enable-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) @@ -97,7 +97,7 @@ index f08ce9969ea..1c872c0db5f 100755 --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got=<type> GOT handling scheme (target, single, negative, multigot) -@@ -15793,6 +15796,19 @@ fi +@@ -15820,6 +15823,19 @@ fi @@ -118,7 +118,7 @@ index f08ce9969ea..1c872c0db5f 100755 if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in diff --git a/ld/configure.ac b/ld/configure.ac -index 5a4938afdb0..dbbbde74b04 100644 +index c9c69ab9245..59dab0a6ac4 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) @@ -139,7 +139,7 @@ index 5a4938afdb0..dbbbde74b04 100644 dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. diff --git a/ld/ld.h b/ld/ld.h -index 1790dc81a66..73f832eb169 100644 +index 93f5af92c7d..ff7f71a7b66 100644 --- a/ld/ld.h +++ b/ld/ld.h @@ -166,6 +166,14 @@ typedef struct @@ -158,10 +158,10 @@ index 1790dc81a66..73f832eb169 100644 enum endian_enum endian; diff --git a/ld/ld.texi b/ld/ld.texi -index 2a93e9456ac..3eeb70607fd 100644 +index 7a602b9c6ab..cccbfbab3bb 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2655,6 +2655,18 @@ string identifying the original linked file does not change. +@@ -2810,6 +2810,18 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -181,7 +181,7 @@ index 2a93e9456ac..3eeb70607fd 100644 @c man end diff --git a/ld/ldfile.c b/ld/ldfile.c -index e39170b5d94..fadc248a140 100644 +index 81cb86d51e2..cd5c2752679 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) @@ -209,26 +209,23 @@ index e39170b5d94..fadc248a140 100644 /* Try to open a BFD for a lang_input_statement. */ diff --git a/ld/ldlex.h b/ld/ldlex.h -index 5ea083ebeb3..941dc5f3dc8 100644 +index b0101028321..77f5accb5d9 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -155,6 +155,11 @@ enum option_values - OPTION_NON_CONTIGUOUS_REGIONS, - OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, - OPTION_DEPENDENCY_FILE, -+ OPTION_CTF_VARIABLES, -+ OPTION_NO_CTF_VARIABLES, -+ OPTION_CTF_SHARE_TYPES, +@@ -161,6 +161,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, + OPTION_NO_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, }; /* The initial parser states. */ diff --git a/ld/ldmain.c b/ld/ldmain.c -index f5c5a336320..516ba0360e2 100644 +index 080b1c4c6c2..78d8a2df278 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -322,6 +322,8 @@ main (int argc, char **argv) +@@ -324,6 +324,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -238,25 +235,13 @@ index f5c5a336320..516ba0360e2 100644 /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the diff --git a/ld/lexsup.c b/ld/lexsup.c -index 58c6c078325..879e7bb7658 100644 +index f005a58a045..c83292a9427 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -572,6 +572,26 @@ static const struct ld_option ld_options[] = - { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, - '\0', NULL, N_("Do not show discarded sections in map file output"), +@@ -591,6 +591,14 @@ static const struct ld_option ld_options[] = + " <method> is: share-unconflicted (default),\n" + " share-duplicated"), TWO_DASHES }, -+ { {"ctf-variables", no_argument, NULL, OPTION_CTF_VARIABLES}, -+ '\0', NULL, N_("Emit names and types of static variables in CTF"), -+ TWO_DASHES }, -+ { {"no-ctf-variables", no_argument, NULL, OPTION_NO_CTF_VARIABLES}, -+ '\0', NULL, N_("Do not emit names and types of static variables in CTF"), -+ TWO_DASHES }, -+ { {"ctf-share-types=<method>", required_argument, NULL, -+ OPTION_CTF_SHARE_TYPES}, -+ '\0', NULL, N_("How to share CTF types between translation units.\n" -+ " <method> is: share-unconflicted (default),\n" -+ " share-duplicated"), -+ TWO_DASHES }, + { {"no-poison-system-directories", no_argument, NULL, + OPTION_NO_POISON_SYSTEM_DIRECTORIES}, + '\0', NULL, N_("Do not warn for -L options using system directories"), @@ -268,7 +253,7 @@ index 58c6c078325..879e7bb7658 100644 }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1632,6 +1652,13 @@ parse_args (unsigned argc, char **argv) +@@ -1674,6 +1682,13 @@ parse_args (unsigned argc, char **argv) case OPTION_PRINT_MAP_DISCARDED: config.print_map_discarded = TRUE; @@ -282,6 +267,3 @@ index 58c6c078325..879e7bb7658 100644 break; case OPTION_DEPENDENCY_FILE: --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch b/poky/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch index fb5276e18..b8a1939d3 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch @@ -1,7 +1,7 @@ -From 13a67e9040c01abd284fe506471e0eab668ee3dc Mon Sep 17 00:00:00 2001 +From 5bd94030de598d3a13091dafaed3b956e0ab708f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:44:14 +0000 -Subject: [PATCH 09/17] Change default emulation for mips64*-*-linux +Subject: [PATCH] Change default emulation for mips64*-*-linux we change the default emulations to be N64 instead of N32 @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bfd/config.bfd b/bfd/config.bfd -index 14523caf0c5..e5233cd1f7e 100644 +index e7b55b0dd78..2caf492e172 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -894,12 +894,12 @@ case "${targ}" in +@@ -896,12 +896,12 @@ case "${targ}" in targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" ;; mips64*el-*-linux*) @@ -35,7 +35,7 @@ index 14523caf0c5..e5233cd1f7e 100644 mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec diff --git a/ld/configure.tgt b/ld/configure.tgt -index 87c7d9a4cad..9b4bf2ca964 100644 +index 0c780b24d57..47431770a17 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -531,12 +531,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks @@ -55,6 +55,3 @@ index 87c7d9a4cad..9b4bf2ca964 100644 targ_extra_libpath=$targ_extra_emuls ;; mips*el-*-linux-*) targ_emul=elf32ltsmip --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch b/poky/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch index 277db4ec5..fe2d02f29 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch @@ -1,7 +1,7 @@ -From 69ab45c16f80f18fa78121f6e774750b9e9a200b Mon Sep 17 00:00:00 2001 +From c64a5ca02a55b748311032e2c7d9c4f87bd74c63 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 14 Feb 2016 17:06:19 +0000 -Subject: [PATCH 10/17] Add support for Netlogic XLP +Subject: [PATCH] Add support for Netlogic XLP Patch From: Nebu Philips <nphilips@netlogicmicro.com> @@ -35,7 +35,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 15 files changed, 65 insertions(+), 21 deletions(-) diff --git a/bfd/aoutx.h b/bfd/aoutx.h -index d352a1a3e44..2e2c3c1af86 100644 +index 8025b8c5241..cdcb7876896 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -810,6 +810,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, @@ -47,7 +47,7 @@ index d352a1a3e44..2e2c3c1af86 100644 arch_flags = M_MIPS2; break; diff --git a/bfd/archures.c b/bfd/archures.c -index 551ec8732f0..2665b378623 100644 +index 8c1d32ca930..b4b2927ebc0 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -185,6 +185,7 @@ DESCRIPTION @@ -59,10 +59,10 @@ index 551ec8732f0..2665b378623 100644 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa32r3 34 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index 35ef4d755bb..48db00af80b 100644 +index 7eff85b7eaa..6c9eb12865e 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -1585,6 +1585,7 @@ enum bfd_architecture +@@ -1590,6 +1590,7 @@ enum bfd_architecture #define bfd_mach_mips_octeon3 6503 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ @@ -71,10 +71,10 @@ index 35ef4d755bb..48db00af80b 100644 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa32r3 34 diff --git a/bfd/config.bfd b/bfd/config.bfd -index e5233cd1f7e..2e4ae6bbdff 100644 +index 2caf492e172..e75417da4d8 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -877,6 +877,11 @@ case "${targ}" in +@@ -879,6 +879,11 @@ case "${targ}" in targ_defvec=mips_elf32_le_vec targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; @@ -87,7 +87,7 @@ index e5233cd1f7e..2e4ae6bbdff 100644 targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c -index 802acb45f1e..fd9ec4c0ad4 100644 +index 5a944ceee81..c57d12ba3dd 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c @@ -108,7 +108,8 @@ enum @@ -111,10 +111,10 @@ index 802acb45f1e..fd9ec4c0ad4 100644 /* The default architecture is mips:3000, but with a machine number of diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c -index 160febec94c..4c9499cc2cf 100644 +index 3cbb3cf9495..0c6cd47b40c 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c -@@ -6982,6 +6982,9 @@ _bfd_elf_mips_mach (flagword flags) +@@ -6980,6 +6980,9 @@ _bfd_elf_mips_mach (flagword flags) case E_MIPS_MACH_IAMR2: return bfd_mach_mips_interaptiv_mr2; @@ -124,7 +124,7 @@ index 160febec94c..4c9499cc2cf 100644 default: switch (flags & EF_MIPS_ARCH) { -@@ -12356,6 +12359,10 @@ mips_set_isa_flags (bfd *abfd) +@@ -12335,6 +12338,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -135,7 +135,7 @@ index 160febec94c..4c9499cc2cf 100644 case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -14373,6 +14380,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = +@@ -14352,6 +14359,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, @@ -144,10 +144,10 @@ index 160febec94c..4c9499cc2cf 100644 /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, diff --git a/binutils/readelf.c b/binutils/readelf.c -index 6057515a89b..ea119b0b254 100644 +index ad16b4571c9..4bf2b732502 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c -@@ -3483,6 +3483,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) +@@ -3502,6 +3502,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; @@ -156,7 +156,7 @@ index 6057515a89b..ea119b0b254 100644 /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c -index 31acb77d78a..0ead168d51e 100644 +index 538b69710f5..b021b64f14b 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -568,6 +568,7 @@ static int mips_32bitmode = 0; @@ -175,7 +175,7 @@ index 31acb77d78a..0ead168d51e 100644 ) /* Whether the processor uses hardware interlocks to protect reads -@@ -20174,7 +20176,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = +@@ -20156,7 +20158,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ @@ -185,10 +185,10 @@ index 31acb77d78a..0ead168d51e 100644 /* MIPS 64 Release 6. */ { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, diff --git a/gas/configure b/gas/configure -index 5bccfd9d1b7..d4b13e6fc8b 100755 +index d03432c6dc6..d5ae54925e9 100755 --- a/gas/configure +++ b/gas/configure -@@ -12722,6 +12722,9 @@ _ACEOF +@@ -12761,6 +12761,9 @@ _ACEOF mipsisa64r6 | mipsisa64r6el) mips_cpu=mips64r6 ;; @@ -199,10 +199,10 @@ index 5bccfd9d1b7..d4b13e6fc8b 100755 mips_cpu=r3900 ;; diff --git a/gas/configure.ac b/gas/configure.ac -index b65108fecb2..ce1f2dad9bc 100644 +index 82706561886..f1c27bf2878 100644 --- a/gas/configure.ac +++ b/gas/configure.ac -@@ -325,6 +325,9 @@ changequote([,])dnl +@@ -332,6 +332,9 @@ changequote([,])dnl mipsisa64r6 | mipsisa64r6el) mips_cpu=mips64r6 ;; @@ -213,7 +213,7 @@ index b65108fecb2..ce1f2dad9bc 100644 mips_cpu=r3900 ;; diff --git a/include/elf/mips.h b/include/elf/mips.h -index cc08ebd4318..bb518575ce1 100644 +index 4bd86307120..2d7df22abf2 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) @@ -225,7 +225,7 @@ index cc08ebd4318..bb518575ce1 100644 #define E_MIPS_MACH_OCTEON3 0x008e0000 #define E_MIPS_MACH_5400 0x00910000 diff --git a/include/opcode/mips.h b/include/opcode/mips.h -index fd031f37588..a96a44df840 100644 +index d1b4a2574ac..879c68fcfd4 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h @@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { @@ -256,7 +256,7 @@ index fd031f37588..a96a44df840 100644 return FALSE; } diff --git a/ld/configure.tgt b/ld/configure.tgt -index 9b4bf2ca964..f6d7171dff7 100644 +index 47431770a17..f714744eab3 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -510,6 +510,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) @@ -270,7 +270,7 @@ index 9b4bf2ca964..f6d7171dff7 100644 targ_extra_emuls="elf32lr5900" targ_extra_libpath=$targ_extra_emuls diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c -index 755bbe294bd..ce22ef683a6 100644 +index 317ced51204..6869f890656 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c @@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = @@ -293,7 +293,7 @@ index 755bbe294bd..ce22ef683a6 100644 /* This entry, mips16, is here only for ISA/processor selection; do not print its name. */ diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c -index 5270aeefa80..d17dc78cd71 100644 +index b45eb40bf69..2f4eb5c0354 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) @@ -404,6 +404,3 @@ index 5270aeefa80..d17dc78cd71 100644 {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/poky/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index 10c3d8086..1041b7301 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,7 +1,7 @@ -From 7836f8aa56ef0f18c8658dc7e4952a9d097ba7e8 Mon Sep 17 00:00:00 2001 +From 7f4938d062146e40b4e6d427a5eca6cc6acaaeee Mon Sep 17 00:00:00 2001 From: Zhenhua Luo <zhenhua.luo@nxp.com> Date: Sat, 11 Jun 2016 22:08:29 -0500 -Subject: [PATCH 11/17] fix the incorrect assembling for ppc wait mnemonic +Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> @@ -11,10 +11,10 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c -index 5e20d617664..4c9656ecf08 100644 +index bbbadffad8f..72092355e12 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c -@@ -6265,8 +6265,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { +@@ -6302,8 +6302,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, 0, {0}}, {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, 0, {0}}, @@ -23,7 +23,7 @@ index 5e20d617664..4c9656ecf08 100644 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, -@@ -6326,7 +6324,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { +@@ -6363,7 +6361,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, @@ -32,6 +32,3 @@ index 5e20d617664..4c9656ecf08 100644 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch b/poky/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch index ef8b253b6..659ae799a 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch @@ -1,7 +1,7 @@ -From dbff6bdf2123f5495b8be930304d9aa5e88006a7 Mon Sep 17 00:00:00 2001 +From bb229568e505f2276ca58b72fef6781034fa839f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017 11:42:03 -0700 -Subject: [PATCH 12/17] Detect 64-bit MIPS targets +Subject: [PATCH] Detect 64-bit MIPS targets Add mips64 target triplets and default to N64 @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 14 insertions(+) diff --git a/gold/configure.tgt b/gold/configure.tgt -index aa7ec552aec..470515062e4 100644 +index cac0866e628..24fbf641456 100644 --- a/gold/configure.tgt +++ b/gold/configure.tgt @@ -153,6 +153,13 @@ aarch64*-*) @@ -45,6 +45,3 @@ index aa7ec552aec..470515062e4 100644 mips*-*-*) targ_obj=mips targ_machine=EM_MIPS --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch b/poky/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch index 987a96f4b..d4067691c 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch @@ -1,7 +1,7 @@ -From 7e2ddee8704c9c3b73760dd9464b18fade563d85 Mon Sep 17 00:00:00 2001 +From a1031fca1b6c1348c078bb8a9df6e7d29148dae1 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 14 Feb 2016 17:04:07 +0000 -Subject: [PATCH 13/17] Use libtool 2.4 +Subject: [PATCH] Use libtool 2.4 get libtool sysroot support @@ -26,10 +26,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 14 files changed, 10931 insertions(+), 4028 deletions(-) diff --git a/bfd/configure b/bfd/configure -index 0340ed541b5..2012656b3b7 100755 +index b3665c68c13..376b951d496 100755 --- a/bfd/configure +++ b/bfd/configure -@@ -704,6 +704,9 @@ OTOOL +@@ -705,6 +705,9 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -39,7 +39,7 @@ index 0340ed541b5..2012656b3b7 100755 OBJDUMP LN_S NM -@@ -822,6 +825,7 @@ enable_static +@@ -823,6 +826,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -47,7 +47,7 @@ index 0340ed541b5..2012656b3b7 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1504,6 +1508,8 @@ Optional Packages: +@@ -1505,6 +1509,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -56,7 +56,7 @@ index 0340ed541b5..2012656b3b7 100755 --with-mmap try using mmap for BFD input files if available --with-separate-debug-dir=DIR Look for global separate debug info in DIR -@@ -5693,8 +5699,8 @@ esac +@@ -5694,8 +5700,8 @@ esac @@ -67,7 +67,7 @@ index 0340ed541b5..2012656b3b7 100755 -@@ -5734,7 +5740,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5735,7 +5741,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -76,7 +76,7 @@ index 0340ed541b5..2012656b3b7 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6421,8 +6427,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -87,7 +87,7 @@ index 0340ed541b5..2012656b3b7 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6470,6 +6476,80 @@ esac +@@ -6471,6 +6477,80 @@ esac @@ -168,7 +168,7 @@ index 0340ed541b5..2012656b3b7 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6486,6 +6566,11 @@ case $reload_flag in +@@ -6487,6 +6567,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -180,7 +180,7 @@ index 0340ed541b5..2012656b3b7 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6654,7 +6739,8 @@ mingw* | pw32*) +@@ -6655,7 +6740,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -190,7 +190,7 @@ index 0340ed541b5..2012656b3b7 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6808,6 +6894,21 @@ esac +@@ -6809,6 +6895,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -212,7 +212,7 @@ index 0340ed541b5..2012656b3b7 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6821,11 +6922,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6822,11 +6923,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -379,7 +379,7 @@ index 0340ed541b5..2012656b3b7 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6841,7 +7095,7 @@ do +@@ -6842,7 +7096,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -388,7 +388,7 @@ index 0340ed541b5..2012656b3b7 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6861,11 +7115,15 @@ $as_echo "no" >&6; } +@@ -6862,11 +7116,15 @@ $as_echo "no" >&6; } fi @@ -407,7 +407,7 @@ index 0340ed541b5..2012656b3b7 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6881,7 +7139,7 @@ do +@@ -6882,7 +7140,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -416,7 +416,7 @@ index 0340ed541b5..2012656b3b7 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6900,6 +7158,10 @@ else +@@ -6901,6 +7159,10 @@ else $as_echo "no" >&6; } fi @@ -427,7 +427,7 @@ index 0340ed541b5..2012656b3b7 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;; +@@ -6912,16 +7174,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -504,7 +504,7 @@ index 0340ed541b5..2012656b3b7 100755 -@@ -7262,8 +7580,8 @@ esac +@@ -7263,8 +7581,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -515,7 +515,7 @@ index 0340ed541b5..2012656b3b7 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7299,6 +7617,7 @@ for ac_symprfx in "" "_"; do +@@ -7300,6 +7618,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -523,7 +523,7 @@ index 0340ed541b5..2012656b3b7 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7340,6 +7659,18 @@ _LT_EOF +@@ -7341,6 +7660,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -542,7 +542,7 @@ index 0340ed541b5..2012656b3b7 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7351,7 +7682,7 @@ _LT_EOF +@@ -7352,7 +7683,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -551,7 +551,7 @@ index 0340ed541b5..2012656b3b7 100755 const char *name; void *address; } -@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() { +@@ -7378,8 +7709,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -562,7 +562,7 @@ index 0340ed541b5..2012656b3b7 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7388,8 +7719,8 @@ _LT_EOF +@@ -7389,8 +7720,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -573,7 +573,7 @@ index 0340ed541b5..2012656b3b7 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7426,6 +7757,16 @@ else +@@ -7427,6 +7758,16 @@ else $as_echo "ok" >&6; } fi @@ -590,7 +590,7 @@ index 0340ed541b5..2012656b3b7 100755 -@@ -7442,6 +7783,45 @@ fi +@@ -7443,6 +7784,45 @@ fi @@ -636,7 +636,7 @@ index 0340ed541b5..2012656b3b7 100755 -@@ -7653,6 +8033,123 @@ esac +@@ -7654,6 +8034,123 @@ esac need_locks="$enable_libtool_lock" @@ -760,7 +760,7 @@ index 0340ed541b5..2012656b3b7 100755 case $host_os in rhapsody* | darwin*) -@@ -8216,6 +8713,8 @@ _LT_EOF +@@ -8217,6 +8714,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -769,7 +769,7 @@ index 0340ed541b5..2012656b3b7 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8380,7 +8879,8 @@ fi +@@ -8381,7 +8880,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -779,7 +779,7 @@ index 0340ed541b5..2012656b3b7 100755 -@@ -8469,7 +8969,7 @@ aix3*) +@@ -8470,7 +8970,7 @@ aix3*) esac # Global variables: @@ -788,7 +788,7 @@ index 0340ed541b5..2012656b3b7 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8767,8 +9267,6 @@ fi +@@ -8768,8 +9268,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -797,7 +797,7 @@ index 0340ed541b5..2012656b3b7 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8935,6 +9433,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -810,7 +810,7 @@ index 0340ed541b5..2012656b3b7 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8997,7 +9501,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -819,7 +819,7 @@ index 0340ed541b5..2012656b3b7 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -9053,13 +9557,17 @@ case $host_os in +@@ -9054,13 +9558,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -843,7 +843,7 @@ index 0340ed541b5..2012656b3b7 100755 # # Check to make sure the PIC flag actually works. -@@ -9120,6 +9628,11 @@ fi +@@ -9121,6 +9629,11 @@ fi @@ -855,7 +855,7 @@ index 0340ed541b5..2012656b3b7 100755 # # Check to make sure the static flag actually works. # -@@ -9470,7 +9983,8 @@ _LT_EOF +@@ -9471,7 +9984,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -865,7 +865,7 @@ index 0340ed541b5..2012656b3b7 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9569,12 +10083,12 @@ _LT_EOF +@@ -9570,12 +10084,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -880,7 +880,7 @@ index 0340ed541b5..2012656b3b7 100755 fi ;; esac -@@ -9588,8 +10102,8 @@ _LT_EOF +@@ -9589,8 +10103,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -891,7 +891,7 @@ index 0340ed541b5..2012656b3b7 100755 fi ;; -@@ -9607,8 +10121,8 @@ _LT_EOF +@@ -9608,8 +10122,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -902,7 +902,7 @@ index 0340ed541b5..2012656b3b7 100755 else ld_shlibs=no fi -@@ -9654,8 +10168,8 @@ _LT_EOF +@@ -9655,8 +10169,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -913,7 +913,7 @@ index 0340ed541b5..2012656b3b7 100755 else ld_shlibs=no fi -@@ -9785,7 +10299,13 @@ _LT_EOF +@@ -9786,7 +10300,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -928,7 +928,7 @@ index 0340ed541b5..2012656b3b7 100755 /* end confdefs.h. */ int -@@ -9798,22 +10318,29 @@ main () +@@ -9799,22 +10319,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -971,7 +971,7 @@ index 0340ed541b5..2012656b3b7 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9826,7 +10353,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -986,7 +986,7 @@ index 0340ed541b5..2012656b3b7 100755 /* end confdefs.h. */ int -@@ -9838,22 +10371,29 @@ main () +@@ -9839,22 +10372,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -1029,7 +1029,7 @@ index 0340ed541b5..2012656b3b7 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9899,20 +10439,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -1107,7 +1107,7 @@ index 0340ed541b5..2012656b3b7 100755 ;; darwin* | rhapsody*) -@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9973,7 +10556,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -1116,7 +1116,7 @@ index 0340ed541b5..2012656b3b7 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9981,7 +10564,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -1125,7 +1125,7 @@ index 0340ed541b5..2012656b3b7 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9997,7 +10580,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -1134,7 +1134,7 @@ index 0340ed541b5..2012656b3b7 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10021,10 +10604,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -1147,7 +1147,7 @@ index 0340ed541b5..2012656b3b7 100755 ;; esac else -@@ -10102,23 +10685,36 @@ fi +@@ -10103,23 +10686,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -1192,7 +1192,7 @@ index 0340ed541b5..2012656b3b7 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10204,7 +10800,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -1201,7 +1201,7 @@ index 0340ed541b5..2012656b3b7 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10223,9 +10819,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -1213,7 +1213,7 @@ index 0340ed541b5..2012656b3b7 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10801,8 +11397,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -1225,7 +1225,7 @@ index 0340ed541b5..2012656b3b7 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10834,13 +11431,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10835,13 +11432,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -1298,7 +1298,7 @@ index 0340ed541b5..2012656b3b7 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10932,7 +11587,7 @@ haiku*) +@@ -10923,7 +11578,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -1307,16 +1307,16 @@ index 0340ed541b5..2012656b3b7 100755 hardcode_into_libs=yes ;; -@@ -11728,7 +12383,7 @@ else +@@ -11719,7 +12374,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11731 "configure" +-#line 11722 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11772,10 +12427,10 @@ else +@@ -11763,10 +12418,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -1329,16 +1329,16 @@ index 0340ed541b5..2012656b3b7 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11834,7 +12489,7 @@ else +@@ -11825,7 +12480,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11837 "configure" +-#line 11828 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11878,10 +12533,10 @@ else +@@ -11869,10 +12524,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -1351,7 +1351,7 @@ index 0340ed541b5..2012656b3b7 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14578,7 +15233,7 @@ SHARED_LDFLAGS= +@@ -14599,7 +15254,7 @@ SHARED_LDFLAGS= if test "$enable_shared" = "yes"; then x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` if test -n "$x"; then @@ -1360,7 +1360,7 @@ index 0340ed541b5..2012656b3b7 100755 fi case "${host}" in -@@ -17197,13 +17852,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -17199,13 +17854,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -1381,7 +1381,7 @@ index 0340ed541b5..2012656b3b7 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17218,14 +17880,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -17220,14 +17882,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -1400,7 +1400,7 @@ index 0340ed541b5..2012656b3b7 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17258,12 +17923,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -17260,12 +17925,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -1414,7 +1414,7 @@ index 0340ed541b5..2012656b3b7 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17318,8 +17983,13 @@ reload_flag \ +@@ -17320,8 +17985,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -1428,7 +1428,7 @@ index 0340ed541b5..2012656b3b7 100755 STRIP \ RANLIB \ CC \ -@@ -17329,12 +17999,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -17331,12 +18001,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -1444,7 +1444,7 @@ index 0340ed541b5..2012656b3b7 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -17350,7 +18022,6 @@ no_undefined_flag \ +@@ -17352,7 +18024,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -1452,7 +1452,7 @@ index 0340ed541b5..2012656b3b7 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -17386,6 +18057,7 @@ module_cmds \ +@@ -17388,6 +18059,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -1460,7 +1460,7 @@ index 0340ed541b5..2012656b3b7 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18174,7 +18846,8 @@ $as_echo X"$file" | +@@ -18176,7 +18848,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -1470,7 +1470,7 @@ index 0340ed541b5..2012656b3b7 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -18277,19 +18950,42 @@ SP2NL=$lt_lt_SP2NL +@@ -18279,19 +18952,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -1514,7 +1514,7 @@ index 0340ed541b5..2012656b3b7 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -18319,6 +19015,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -18321,6 +19017,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -1527,7 +1527,7 @@ index 0340ed541b5..2012656b3b7 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -18328,6 +19030,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -18330,6 +19032,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -1537,7 +1537,7 @@ index 0340ed541b5..2012656b3b7 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -18442,12 +19147,12 @@ with_gcc=$GCC +@@ -18444,12 +19149,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -1553,7 +1553,7 @@ index 0340ed541b5..2012656b3b7 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -18534,9 +19239,6 @@ inherit_rpath=$inherit_rpath +@@ -18536,9 +19241,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -1563,7 +1563,7 @@ index 0340ed541b5..2012656b3b7 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -18552,6 +19254,9 @@ include_expsyms=$lt_include_expsyms +@@ -18554,6 +19256,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -1573,7 +1573,7 @@ index 0340ed541b5..2012656b3b7 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -18584,210 +19289,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -18586,210 +19291,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -1948,10 +1948,10 @@ index 0340ed541b5..2012656b3b7 100755 chmod +x "$ofile" diff --git a/bfd/configure.ac b/bfd/configure.ac -index 8e86f8399ce..e8700c9d4d2 100644 +index 0797a08ff37..133d714cf18 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -314,7 +314,7 @@ changequote(,)dnl +@@ -315,7 +315,7 @@ changequote(,)dnl x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` changequote([,])dnl if test -n "$x"; then @@ -1961,10 +1961,10 @@ index 8e86f8399ce..e8700c9d4d2 100644 case "${host}" in diff --git a/binutils/configure b/binutils/configure -index 89c99abfeba..d3289a5efcd 100755 +index 83b4b0172db..2154238189e 100755 --- a/binutils/configure +++ b/binutils/configure -@@ -692,8 +692,11 @@ OTOOL +@@ -697,8 +697,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -1976,7 +1976,7 @@ index 89c99abfeba..d3289a5efcd 100755 OBJDUMP LN_S NM -@@ -810,6 +813,7 @@ enable_static +@@ -815,6 +818,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -1984,7 +1984,7 @@ index 89c99abfeba..d3289a5efcd 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1490,6 +1494,8 @@ Optional Packages: +@@ -1504,6 +1508,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -1993,7 +1993,7 @@ index 89c99abfeba..d3289a5efcd 100755 --with-debuginfod Enable debuginfo lookups with debuginfod (auto/yes/no) --with-system-zlib use installed libz -@@ -5467,8 +5473,8 @@ esac +@@ -5490,8 +5496,8 @@ esac @@ -2004,7 +2004,7 @@ index 89c99abfeba..d3289a5efcd 100755 -@@ -5508,7 +5514,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5531,7 +5537,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -2013,7 +2013,7 @@ index 89c99abfeba..d3289a5efcd 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6194,8 +6200,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6217,8 +6223,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -2024,7 +2024,7 @@ index 89c99abfeba..d3289a5efcd 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6244,6 +6250,80 @@ esac +@@ -6267,6 +6273,80 @@ esac @@ -2105,7 +2105,7 @@ index 89c99abfeba..d3289a5efcd 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6260,6 +6340,11 @@ case $reload_flag in +@@ -6283,6 +6363,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -2117,7 +2117,7 @@ index 89c99abfeba..d3289a5efcd 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6428,7 +6513,8 @@ mingw* | pw32*) +@@ -6451,7 +6536,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -2127,7 +2127,7 @@ index 89c99abfeba..d3289a5efcd 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6582,6 +6668,21 @@ esac +@@ -6605,6 +6691,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -2149,7 +2149,7 @@ index 89c99abfeba..d3289a5efcd 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6597,9 +6698,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6620,9 +6721,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -2314,7 +2314,7 @@ index 89c99abfeba..d3289a5efcd 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6615,7 +6869,7 @@ do +@@ -6638,7 +6892,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -2323,7 +2323,7 @@ index 89c99abfeba..d3289a5efcd 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6635,11 +6889,15 @@ $as_echo "no" >&6; } +@@ -6658,11 +6912,15 @@ $as_echo "no" >&6; } fi @@ -2342,7 +2342,7 @@ index 89c99abfeba..d3289a5efcd 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6655,7 +6913,7 @@ do +@@ -6678,7 +6936,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -2351,7 +2351,7 @@ index 89c99abfeba..d3289a5efcd 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6674,6 +6932,10 @@ else +@@ -6697,6 +6955,10 @@ else $as_echo "no" >&6; } fi @@ -2362,7 +2362,7 @@ index 89c99abfeba..d3289a5efcd 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6685,12 +6947,10 @@ ac_tool_warned=yes ;; +@@ -6708,12 +6970,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -2377,7 +2377,7 @@ index 89c99abfeba..d3289a5efcd 100755 -@@ -6702,6 +6962,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6725,6 +6985,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -2442,7 +2442,7 @@ index 89c99abfeba..d3289a5efcd 100755 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7036,8 +7354,8 @@ esac +@@ -7059,8 +7377,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -2453,7 +2453,7 @@ index 89c99abfeba..d3289a5efcd 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7073,6 +7391,7 @@ for ac_symprfx in "" "_"; do +@@ -7096,6 +7414,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -2461,7 +2461,7 @@ index 89c99abfeba..d3289a5efcd 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7114,6 +7433,18 @@ _LT_EOF +@@ -7137,6 +7456,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -2480,7 +2480,7 @@ index 89c99abfeba..d3289a5efcd 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7125,7 +7456,7 @@ _LT_EOF +@@ -7148,7 +7479,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -2489,7 +2489,7 @@ index 89c99abfeba..d3289a5efcd 100755 const char *name; void *address; } -@@ -7151,8 +7482,8 @@ static const void *lt_preloaded_setup() { +@@ -7174,8 +7505,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -2500,7 +2500,7 @@ index 89c99abfeba..d3289a5efcd 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7162,8 +7493,8 @@ _LT_EOF +@@ -7185,8 +7516,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -2511,7 +2511,7 @@ index 89c99abfeba..d3289a5efcd 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7200,6 +7531,21 @@ else +@@ -7223,6 +7554,21 @@ else $as_echo "ok" >&6; } fi @@ -2533,7 +2533,7 @@ index 89c99abfeba..d3289a5efcd 100755 -@@ -7216,6 +7562,40 @@ fi +@@ -7239,6 +7585,40 @@ fi @@ -2574,7 +2574,7 @@ index 89c99abfeba..d3289a5efcd 100755 -@@ -7427,6 +7807,123 @@ esac +@@ -7450,6 +7830,123 @@ esac need_locks="$enable_libtool_lock" @@ -2698,7 +2698,7 @@ index 89c99abfeba..d3289a5efcd 100755 case $host_os in rhapsody* | darwin*) -@@ -7990,6 +8487,8 @@ _LT_EOF +@@ -8013,6 +8510,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -2707,7 +2707,7 @@ index 89c99abfeba..d3289a5efcd 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8185,7 +8684,8 @@ fi +@@ -8208,7 +8707,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -2717,7 +2717,7 @@ index 89c99abfeba..d3289a5efcd 100755 -@@ -8274,7 +8774,7 @@ aix3*) +@@ -8297,7 +8797,7 @@ aix3*) esac # Global variables: @@ -2726,7 +2726,7 @@ index 89c99abfeba..d3289a5efcd 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8572,8 +9072,6 @@ fi +@@ -8595,8 +9095,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -2735,7 +2735,7 @@ index 89c99abfeba..d3289a5efcd 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8739,6 +9237,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8762,6 +9260,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -2748,7 +2748,7 @@ index 89c99abfeba..d3289a5efcd 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8801,7 +9305,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8824,7 +9328,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -2757,7 +2757,7 @@ index 89c99abfeba..d3289a5efcd 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8858,13 +9362,17 @@ case $host_os in +@@ -8881,13 +9385,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -2781,7 +2781,7 @@ index 89c99abfeba..d3289a5efcd 100755 # # Check to make sure the PIC flag actually works. -@@ -8925,6 +9433,11 @@ fi +@@ -8948,6 +9456,11 @@ fi @@ -2793,7 +2793,7 @@ index 89c99abfeba..d3289a5efcd 100755 # # Check to make sure the static flag actually works. # -@@ -9275,7 +9788,8 @@ _LT_EOF +@@ -9298,7 +9811,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -2803,7 +2803,7 @@ index 89c99abfeba..d3289a5efcd 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9374,12 +9888,12 @@ _LT_EOF +@@ -9397,12 +9911,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -2818,7 +2818,7 @@ index 89c99abfeba..d3289a5efcd 100755 fi ;; esac -@@ -9393,8 +9907,8 @@ _LT_EOF +@@ -9416,8 +9930,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -2829,7 +2829,7 @@ index 89c99abfeba..d3289a5efcd 100755 fi ;; -@@ -9412,8 +9926,8 @@ _LT_EOF +@@ -9435,8 +9949,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2840,7 +2840,7 @@ index 89c99abfeba..d3289a5efcd 100755 else ld_shlibs=no fi -@@ -9459,8 +9973,8 @@ _LT_EOF +@@ -9482,8 +9996,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2851,7 +2851,7 @@ index 89c99abfeba..d3289a5efcd 100755 else ld_shlibs=no fi -@@ -9590,7 +10104,13 @@ _LT_EOF +@@ -9613,7 +10127,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -2866,7 +2866,7 @@ index 89c99abfeba..d3289a5efcd 100755 /* end confdefs.h. */ int -@@ -9603,22 +10123,29 @@ main () +@@ -9626,22 +10146,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2909,7 +2909,7 @@ index 89c99abfeba..d3289a5efcd 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9630,7 +10157,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9653,7 +10180,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -2924,7 +2924,7 @@ index 89c99abfeba..d3289a5efcd 100755 /* end confdefs.h. */ int -@@ -9643,22 +10176,29 @@ main () +@@ -9666,22 +10199,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2967,7 +2967,7 @@ index 89c99abfeba..d3289a5efcd 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9703,20 +10243,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9726,20 +10266,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -3045,7 +3045,7 @@ index 89c99abfeba..d3289a5efcd 100755 ;; darwin* | rhapsody*) -@@ -9777,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9800,7 +10383,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -3054,7 +3054,7 @@ index 89c99abfeba..d3289a5efcd 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9785,7 +10368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9808,7 +10391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -3063,7 +3063,7 @@ index 89c99abfeba..d3289a5efcd 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9801,7 +10384,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9824,7 +10407,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -3072,7 +3072,7 @@ index 89c99abfeba..d3289a5efcd 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9825,10 +10408,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9848,10 +10431,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -3085,7 +3085,7 @@ index 89c99abfeba..d3289a5efcd 100755 ;; esac else -@@ -9907,23 +10490,36 @@ fi +@@ -9930,23 +10513,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -3130,7 +3130,7 @@ index 89c99abfeba..d3289a5efcd 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10008,7 +10604,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10031,7 +10627,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -3139,7 +3139,7 @@ index 89c99abfeba..d3289a5efcd 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10027,9 +10623,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10050,9 +10646,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -3151,7 +3151,7 @@ index 89c99abfeba..d3289a5efcd 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10605,8 +11201,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10628,8 +11224,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -3163,7 +3163,7 @@ index 89c99abfeba..d3289a5efcd 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10639,13 +11236,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10662,13 +11259,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -3236,7 +3236,7 @@ index 89c99abfeba..d3289a5efcd 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10737,7 +11392,7 @@ haiku*) +@@ -10750,7 +11405,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3245,16 +3245,16 @@ index 89c99abfeba..d3289a5efcd 100755 hardcode_into_libs=yes ;; -@@ -11533,7 +12188,7 @@ else +@@ -11546,7 +12201,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11536 "configure" +-#line 11549 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11577,10 +12232,10 @@ else +@@ -11590,10 +12245,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -3267,16 +3267,16 @@ index 89c99abfeba..d3289a5efcd 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11639,7 +12294,7 @@ else +@@ -11652,7 +12307,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11642 "configure" +-#line 11655 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11683,10 +12338,10 @@ else +@@ -11696,10 +12351,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -3289,7 +3289,7 @@ index 89c99abfeba..d3289a5efcd 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -16076,13 +16731,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -16308,13 +16963,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -3310,7 +3310,7 @@ index 89c99abfeba..d3289a5efcd 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -16097,14 +16759,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -16329,14 +16991,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -3329,7 +3329,7 @@ index 89c99abfeba..d3289a5efcd 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -16137,12 +16802,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -16369,12 +17034,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -3343,7 +3343,7 @@ index 89c99abfeba..d3289a5efcd 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16197,8 +16862,13 @@ reload_flag \ +@@ -16429,8 +17094,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -3357,7 +3357,7 @@ index 89c99abfeba..d3289a5efcd 100755 STRIP \ RANLIB \ CC \ -@@ -16208,12 +16878,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -16440,12 +17110,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -3373,7 +3373,7 @@ index 89c99abfeba..d3289a5efcd 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -16229,7 +16901,6 @@ no_undefined_flag \ +@@ -16461,7 +17133,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -3381,7 +3381,7 @@ index 89c99abfeba..d3289a5efcd 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -16265,6 +16936,7 @@ module_cmds \ +@@ -16497,6 +17168,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -3389,7 +3389,7 @@ index 89c99abfeba..d3289a5efcd 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -17031,7 +17703,8 @@ $as_echo X"$file" | +@@ -17263,7 +17935,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -3399,7 +3399,7 @@ index 89c99abfeba..d3289a5efcd 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -17134,19 +17807,42 @@ SP2NL=$lt_lt_SP2NL +@@ -17366,19 +18039,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -3443,7 +3443,7 @@ index 89c99abfeba..d3289a5efcd 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -17176,6 +17872,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -17408,6 +18104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -3456,7 +3456,7 @@ index 89c99abfeba..d3289a5efcd 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -17185,6 +17887,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -17417,6 +18119,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -3466,7 +3466,7 @@ index 89c99abfeba..d3289a5efcd 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -17299,12 +18004,12 @@ with_gcc=$GCC +@@ -17531,12 +18236,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -3482,7 +3482,7 @@ index 89c99abfeba..d3289a5efcd 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -17391,9 +18096,6 @@ inherit_rpath=$inherit_rpath +@@ -17623,9 +18328,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -3492,7 +3492,7 @@ index 89c99abfeba..d3289a5efcd 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -17409,6 +18111,9 @@ include_expsyms=$lt_include_expsyms +@@ -17641,6 +18343,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -3502,7 +3502,7 @@ index 89c99abfeba..d3289a5efcd 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -17441,210 +18146,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -17673,210 +18378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -3877,10 +3877,10 @@ index 89c99abfeba..d3289a5efcd 100755 chmod +x "$ofile" diff --git a/gas/configure b/gas/configure -index d4b13e6fc8b..dd5224c5c81 100755 +index d5ae54925e9..3ff1148d9dd 100755 --- a/gas/configure +++ b/gas/configure -@@ -681,8 +681,11 @@ OTOOL +@@ -682,8 +682,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -3892,7 +3892,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 OBJDUMP LN_S NM -@@ -799,6 +802,7 @@ enable_static +@@ -800,6 +803,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -3900,7 +3900,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1490,6 +1494,8 @@ Optional Packages: +@@ -1491,6 +1495,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -3909,7 +3909,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 --with-cpu=CPU default cpu variant is CPU (currently only supported on ARC) --with-system-zlib use installed libz -@@ -5277,8 +5283,8 @@ esac +@@ -5278,8 +5284,8 @@ esac @@ -3920,7 +3920,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 -@@ -5318,7 +5324,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5319,7 +5325,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -3929,7 +3929,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6005,8 +6011,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -3940,7 +3940,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6054,6 +6060,80 @@ esac +@@ -6055,6 +6061,80 @@ esac @@ -4021,7 +4021,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6070,6 +6150,11 @@ case $reload_flag in +@@ -6071,6 +6151,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -4033,7 +4033,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6238,7 +6323,8 @@ mingw* | pw32*) +@@ -6239,7 +6324,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -4043,7 +4043,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6392,6 +6478,21 @@ esac +@@ -6393,6 +6479,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -4065,7 +4065,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6408,9 +6509,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -4230,7 +4230,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6425,7 +6679,7 @@ do +@@ -6426,7 +6680,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -4239,7 +4239,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6445,11 +6699,15 @@ $as_echo "no" >&6; } +@@ -6446,11 +6700,15 @@ $as_echo "no" >&6; } fi @@ -4258,7 +4258,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6465,7 +6723,7 @@ do +@@ -6466,7 +6724,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -4267,7 +4267,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6484,6 +6742,10 @@ else +@@ -6485,6 +6743,10 @@ else $as_echo "no" >&6; } fi @@ -4278,7 +4278,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6495,12 +6757,10 @@ ac_tool_warned=yes ;; +@@ -6496,12 +6758,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -4293,7 +4293,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 -@@ -6512,6 +6772,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6513,6 +6773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -4358,7 +4358,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6846,8 +7164,8 @@ esac +@@ -6847,8 +7165,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -4369,7 +4369,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6883,6 +7201,7 @@ for ac_symprfx in "" "_"; do +@@ -6884,6 +7202,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -4377,7 +4377,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6924,6 +7243,18 @@ _LT_EOF +@@ -6925,6 +7244,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -4396,7 +4396,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6935,7 +7266,7 @@ _LT_EOF +@@ -6936,7 +7267,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -4405,7 +4405,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 const char *name; void *address; } -@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() { +@@ -6962,8 +7293,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -4416,7 +4416,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6972,8 +7303,8 @@ _LT_EOF +@@ -6973,8 +7304,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -4427,7 +4427,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7010,6 +7341,21 @@ else +@@ -7011,6 +7342,21 @@ else $as_echo "ok" >&6; } fi @@ -4449,7 +4449,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 -@@ -7026,6 +7372,40 @@ fi +@@ -7027,6 +7373,40 @@ fi @@ -4490,7 +4490,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 -@@ -7237,6 +7617,123 @@ esac +@@ -7238,6 +7618,123 @@ esac need_locks="$enable_libtool_lock" @@ -4614,7 +4614,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 case $host_os in rhapsody* | darwin*) -@@ -7800,6 +8297,8 @@ _LT_EOF +@@ -7801,6 +8298,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -4623,7 +4623,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7995,7 +8494,8 @@ fi +@@ -7996,7 +8495,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -4633,7 +4633,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 -@@ -8084,7 +8584,7 @@ aix3*) +@@ -8085,7 +8585,7 @@ aix3*) esac # Global variables: @@ -4642,7 +4642,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8382,8 +8882,6 @@ fi +@@ -8383,8 +8883,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -4651,7 +4651,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8550,6 +9048,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -4664,7 +4664,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8612,7 +9116,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -4673,7 +4673,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8668,13 +9172,17 @@ case $host_os in +@@ -8669,13 +9173,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -4697,7 +4697,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 # # Check to make sure the PIC flag actually works. -@@ -8735,6 +9243,11 @@ fi +@@ -8736,6 +9244,11 @@ fi @@ -4709,7 +4709,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 # # Check to make sure the static flag actually works. # -@@ -9085,7 +9598,8 @@ _LT_EOF +@@ -9086,7 +9599,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -4719,7 +4719,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9184,12 +9698,12 @@ _LT_EOF +@@ -9185,12 +9699,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -4734,7 +4734,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 fi ;; esac -@@ -9203,8 +9717,8 @@ _LT_EOF +@@ -9204,8 +9718,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -4745,7 +4745,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 fi ;; -@@ -9222,8 +9736,8 @@ _LT_EOF +@@ -9223,8 +9737,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -4756,7 +4756,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 else ld_shlibs=no fi -@@ -9269,8 +9783,8 @@ _LT_EOF +@@ -9270,8 +9784,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -4767,7 +4767,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 else ld_shlibs=no fi -@@ -9400,7 +9914,13 @@ _LT_EOF +@@ -9401,7 +9915,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -4782,7 +4782,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 /* end confdefs.h. */ int -@@ -9413,22 +9933,29 @@ main () +@@ -9414,22 +9934,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4825,7 +4825,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9441,7 +9968,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -4840,7 +4840,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 /* end confdefs.h. */ int -@@ -9453,22 +9986,29 @@ main () +@@ -9454,22 +9987,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4883,7 +4883,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9514,20 +10054,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -4961,7 +4961,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 ;; darwin* | rhapsody*) -@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9588,7 +10171,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -4970,7 +4970,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9596,7 +10179,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -4979,7 +4979,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9612,7 +10195,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -4988,7 +4988,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9636,10 +10219,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -5001,7 +5001,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 ;; esac else -@@ -9717,23 +10300,36 @@ fi +@@ -9718,23 +10301,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -5046,7 +5046,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9819,7 +10415,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -5055,7 +5055,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9838,9 +10434,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -5067,7 +5067,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10415,8 +11011,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10416,8 +11012,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -5079,7 +5079,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10449,13 +11046,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10450,13 +11047,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -5152,7 +5152,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10547,7 +11202,7 @@ haiku*) +@@ -10538,7 +11193,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -5161,16 +5161,16 @@ index d4b13e6fc8b..dd5224c5c81 100755 hardcode_into_libs=yes ;; -@@ -11343,7 +11998,7 @@ else +@@ -11334,7 +11989,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11346 "configure" +-#line 11337 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11387,10 +12042,10 @@ else +@@ -11378,10 +12033,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -5183,16 +5183,16 @@ index d4b13e6fc8b..dd5224c5c81 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11449,7 +12104,7 @@ else +@@ -11440,7 +12095,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11452 "configure" +-#line 11443 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11493,10 +12148,10 @@ else +@@ -11484,10 +12139,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -5205,7 +5205,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15981,13 +16636,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -16020,13 +16675,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -5226,7 +5226,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -16002,14 +16664,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -16041,14 +16703,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -5245,7 +5245,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -16042,12 +16707,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -16081,12 +16746,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -5259,7 +5259,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16102,8 +16767,13 @@ reload_flag \ +@@ -16141,8 +16806,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -5273,7 +5273,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 STRIP \ RANLIB \ CC \ -@@ -16113,12 +16783,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -16152,12 +16822,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -5289,7 +5289,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -16134,7 +16806,6 @@ no_undefined_flag \ +@@ -16173,7 +16845,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -5297,7 +5297,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -16170,6 +16841,7 @@ module_cmds \ +@@ -16209,6 +16880,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -5305,7 +5305,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16943,7 +17615,8 @@ $as_echo X"$file" | +@@ -16982,7 +17654,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -5315,7 +5315,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -17046,19 +17719,42 @@ SP2NL=$lt_lt_SP2NL +@@ -17085,19 +17758,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -5359,7 +5359,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -17088,6 +17784,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -17127,6 +17823,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -5372,7 +5372,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -17097,6 +17799,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -17136,6 +17838,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -5382,7 +5382,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -17211,12 +17916,12 @@ with_gcc=$GCC +@@ -17250,12 +17955,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -5398,7 +5398,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -17303,9 +18008,6 @@ inherit_rpath=$inherit_rpath +@@ -17342,9 +18047,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -5408,7 +5408,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -17321,6 +18023,9 @@ include_expsyms=$lt_include_expsyms +@@ -17360,6 +18062,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -5418,7 +5418,7 @@ index d4b13e6fc8b..dd5224c5c81 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -17353,210 +18058,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -17392,210 +18097,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -5793,10 +5793,10 @@ index d4b13e6fc8b..dd5224c5c81 100755 chmod +x "$ofile" diff --git a/gprof/configure b/gprof/configure -index 3cf41b79116..e5d57f52912 100755 +index b12ec2e472f..57986ca995a 100755 --- a/gprof/configure +++ b/gprof/configure -@@ -662,8 +662,11 @@ OTOOL +@@ -663,8 +663,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -5808,7 +5808,7 @@ index 3cf41b79116..e5d57f52912 100755 OBJDUMP LN_S NM -@@ -780,6 +783,7 @@ enable_static +@@ -781,6 +784,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -5816,7 +5816,7 @@ index 3cf41b79116..e5d57f52912 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1442,6 +1446,8 @@ Optional Packages: +@@ -1443,6 +1447,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -5825,7 +5825,7 @@ index 3cf41b79116..e5d57f52912 100755 Some influential environment variables: CC C compiler command -@@ -5124,8 +5130,8 @@ esac +@@ -5125,8 +5131,8 @@ esac @@ -5836,7 +5836,7 @@ index 3cf41b79116..e5d57f52912 100755 -@@ -5165,7 +5171,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5166,7 +5172,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -5845,7 +5845,7 @@ index 3cf41b79116..e5d57f52912 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5852,8 +5858,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -5856,7 +5856,7 @@ index 3cf41b79116..e5d57f52912 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5901,6 +5907,80 @@ esac +@@ -5902,6 +5908,80 @@ esac @@ -5937,7 +5937,7 @@ index 3cf41b79116..e5d57f52912 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5917,6 +5997,11 @@ case $reload_flag in +@@ -5918,6 +5998,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -5949,7 +5949,7 @@ index 3cf41b79116..e5d57f52912 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6085,7 +6170,8 @@ mingw* | pw32*) +@@ -6086,7 +6171,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -5959,7 +5959,7 @@ index 3cf41b79116..e5d57f52912 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6239,6 +6325,21 @@ esac +@@ -6240,6 +6326,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -5981,7 +5981,7 @@ index 3cf41b79116..e5d57f52912 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6252,11 +6353,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6253,11 +6354,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -6148,7 +6148,7 @@ index 3cf41b79116..e5d57f52912 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6272,7 +6526,7 @@ do +@@ -6273,7 +6527,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -6157,7 +6157,7 @@ index 3cf41b79116..e5d57f52912 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6292,11 +6546,15 @@ $as_echo "no" >&6; } +@@ -6293,11 +6547,15 @@ $as_echo "no" >&6; } fi @@ -6176,7 +6176,7 @@ index 3cf41b79116..e5d57f52912 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6312,7 +6570,7 @@ do +@@ -6313,7 +6571,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -6185,7 +6185,7 @@ index 3cf41b79116..e5d57f52912 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6331,6 +6589,10 @@ else +@@ -6332,6 +6590,10 @@ else $as_echo "no" >&6; } fi @@ -6196,7 +6196,7 @@ index 3cf41b79116..e5d57f52912 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6342,16 +6604,72 @@ ac_tool_warned=yes ;; +@@ -6343,16 +6605,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -6273,7 +6273,7 @@ index 3cf41b79116..e5d57f52912 100755 -@@ -6693,8 +7011,8 @@ esac +@@ -6694,8 +7012,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -6284,7 +6284,7 @@ index 3cf41b79116..e5d57f52912 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6730,6 +7048,7 @@ for ac_symprfx in "" "_"; do +@@ -6731,6 +7049,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -6292,7 +6292,7 @@ index 3cf41b79116..e5d57f52912 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6771,6 +7090,18 @@ _LT_EOF +@@ -6772,6 +7091,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -6311,7 +6311,7 @@ index 3cf41b79116..e5d57f52912 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6782,7 +7113,7 @@ _LT_EOF +@@ -6783,7 +7114,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -6320,7 +6320,7 @@ index 3cf41b79116..e5d57f52912 100755 const char *name; void *address; } -@@ -6808,8 +7139,8 @@ static const void *lt_preloaded_setup() { +@@ -6809,8 +7140,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -6331,7 +6331,7 @@ index 3cf41b79116..e5d57f52912 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6819,8 +7150,8 @@ _LT_EOF +@@ -6820,8 +7151,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -6342,7 +6342,7 @@ index 3cf41b79116..e5d57f52912 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6857,6 +7188,20 @@ else +@@ -6858,6 +7189,20 @@ else $as_echo "ok" >&6; } fi @@ -6363,7 +6363,7 @@ index 3cf41b79116..e5d57f52912 100755 -@@ -6873,6 +7218,41 @@ fi +@@ -6874,6 +7219,41 @@ fi @@ -6405,7 +6405,7 @@ index 3cf41b79116..e5d57f52912 100755 -@@ -7084,6 +7464,123 @@ esac +@@ -7085,6 +7465,123 @@ esac need_locks="$enable_libtool_lock" @@ -6529,7 +6529,7 @@ index 3cf41b79116..e5d57f52912 100755 case $host_os in rhapsody* | darwin*) -@@ -7647,6 +8144,8 @@ _LT_EOF +@@ -7648,6 +8145,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -6538,7 +6538,7 @@ index 3cf41b79116..e5d57f52912 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7842,7 +8341,8 @@ fi +@@ -7843,7 +8342,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -6548,7 +6548,7 @@ index 3cf41b79116..e5d57f52912 100755 -@@ -7931,7 +8431,7 @@ aix3*) +@@ -7932,7 +8432,7 @@ aix3*) esac # Global variables: @@ -6557,7 +6557,7 @@ index 3cf41b79116..e5d57f52912 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8229,8 +8729,6 @@ fi +@@ -8230,8 +8730,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -6566,7 +6566,7 @@ index 3cf41b79116..e5d57f52912 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8396,6 +8894,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8397,6 +8895,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -6579,7 +6579,7 @@ index 3cf41b79116..e5d57f52912 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8458,7 +8962,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8459,7 +8963,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -6588,7 +6588,7 @@ index 3cf41b79116..e5d57f52912 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8515,13 +9019,17 @@ case $host_os in +@@ -8516,13 +9020,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -6612,7 +6612,7 @@ index 3cf41b79116..e5d57f52912 100755 # # Check to make sure the PIC flag actually works. -@@ -8582,6 +9090,11 @@ fi +@@ -8583,6 +9091,11 @@ fi @@ -6624,7 +6624,7 @@ index 3cf41b79116..e5d57f52912 100755 # # Check to make sure the static flag actually works. # -@@ -8932,7 +9445,8 @@ _LT_EOF +@@ -8933,7 +9446,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -6634,7 +6634,7 @@ index 3cf41b79116..e5d57f52912 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9031,12 +9545,12 @@ _LT_EOF +@@ -9032,12 +9546,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -6649,7 +6649,7 @@ index 3cf41b79116..e5d57f52912 100755 fi ;; esac -@@ -9050,8 +9564,8 @@ _LT_EOF +@@ -9051,8 +9565,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -6660,7 +6660,7 @@ index 3cf41b79116..e5d57f52912 100755 fi ;; -@@ -9069,8 +9583,8 @@ _LT_EOF +@@ -9070,8 +9584,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -6671,7 +6671,7 @@ index 3cf41b79116..e5d57f52912 100755 else ld_shlibs=no fi -@@ -9116,8 +9630,8 @@ _LT_EOF +@@ -9117,8 +9631,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -6682,7 +6682,7 @@ index 3cf41b79116..e5d57f52912 100755 else ld_shlibs=no fi -@@ -9247,7 +9761,13 @@ _LT_EOF +@@ -9248,7 +9762,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -6697,7 +6697,7 @@ index 3cf41b79116..e5d57f52912 100755 /* end confdefs.h. */ int -@@ -9260,22 +9780,29 @@ main () +@@ -9261,22 +9781,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -6740,7 +6740,7 @@ index 3cf41b79116..e5d57f52912 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9287,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9288,7 +9815,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -6755,7 +6755,7 @@ index 3cf41b79116..e5d57f52912 100755 /* end confdefs.h. */ int -@@ -9300,22 +9833,29 @@ main () +@@ -9301,22 +9834,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -6798,7 +6798,7 @@ index 3cf41b79116..e5d57f52912 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9360,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9361,20 +9901,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -6876,7 +6876,7 @@ index 3cf41b79116..e5d57f52912 100755 ;; darwin* | rhapsody*) -@@ -9434,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9435,7 +10018,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -6885,7 +6885,7 @@ index 3cf41b79116..e5d57f52912 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9442,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9443,7 +10026,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -6894,7 +6894,7 @@ index 3cf41b79116..e5d57f52912 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9458,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9459,7 +10042,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -6903,7 +6903,7 @@ index 3cf41b79116..e5d57f52912 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9482,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9483,10 +10066,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -6916,7 +6916,7 @@ index 3cf41b79116..e5d57f52912 100755 ;; esac else -@@ -9564,23 +10147,36 @@ fi +@@ -9565,23 +10148,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -6961,7 +6961,7 @@ index 3cf41b79116..e5d57f52912 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9665,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9666,7 +10262,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -6970,7 +6970,7 @@ index 3cf41b79116..e5d57f52912 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9684,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9685,9 +10281,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -6982,7 +6982,7 @@ index 3cf41b79116..e5d57f52912 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10262,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10263,8 +10859,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -6994,7 +6994,7 @@ index 3cf41b79116..e5d57f52912 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10296,13 +10893,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10297,13 +10894,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -7067,7 +7067,7 @@ index 3cf41b79116..e5d57f52912 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10394,7 +11049,7 @@ haiku*) +@@ -10385,7 +11040,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -7076,16 +7076,16 @@ index 3cf41b79116..e5d57f52912 100755 hardcode_into_libs=yes ;; -@@ -11190,7 +11845,7 @@ else +@@ -11181,7 +11836,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11193 "configure" +-#line 11184 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11234,10 +11889,10 @@ else +@@ -11225,10 +11880,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -7098,16 +7098,16 @@ index 3cf41b79116..e5d57f52912 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11296,7 +11951,7 @@ else +@@ -11287,7 +11942,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11299 "configure" +-#line 11290 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11340,10 +11995,10 @@ else +@@ -11331,10 +11986,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -7120,7 +7120,7 @@ index 3cf41b79116..e5d57f52912 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13309,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -13341,13 +13996,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -7141,7 +7141,7 @@ index 3cf41b79116..e5d57f52912 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13330,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -13362,14 +14024,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -7160,7 +7160,7 @@ index 3cf41b79116..e5d57f52912 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13370,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -13402,12 +14067,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -7174,7 +7174,7 @@ index 3cf41b79116..e5d57f52912 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13430,8 +14095,13 @@ reload_flag \ +@@ -13462,8 +14127,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -7188,7 +7188,7 @@ index 3cf41b79116..e5d57f52912 100755 STRIP \ RANLIB \ CC \ -@@ -13441,12 +14111,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13473,12 +14143,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -7204,7 +7204,7 @@ index 3cf41b79116..e5d57f52912 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13462,7 +14134,6 @@ no_undefined_flag \ +@@ -13494,7 +14166,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -7212,7 +7212,7 @@ index 3cf41b79116..e5d57f52912 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13498,6 +14169,7 @@ module_cmds \ +@@ -13530,6 +14201,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -7220,7 +7220,7 @@ index 3cf41b79116..e5d57f52912 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -14263,7 +14935,8 @@ $as_echo X"$file" | +@@ -14295,7 +14967,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -7230,7 +7230,7 @@ index 3cf41b79116..e5d57f52912 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14366,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14398,19 +15071,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -7274,7 +7274,7 @@ index 3cf41b79116..e5d57f52912 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -14408,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -14440,6 +15136,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -7287,7 +7287,7 @@ index 3cf41b79116..e5d57f52912 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14417,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14449,6 +15151,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -7297,7 +7297,7 @@ index 3cf41b79116..e5d57f52912 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14531,12 +15236,12 @@ with_gcc=$GCC +@@ -14563,12 +15268,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -7313,7 +7313,7 @@ index 3cf41b79116..e5d57f52912 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -14623,9 +15328,6 @@ inherit_rpath=$inherit_rpath +@@ -14655,9 +15360,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -7323,7 +7323,7 @@ index 3cf41b79116..e5d57f52912 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -14641,6 +15343,9 @@ include_expsyms=$lt_include_expsyms +@@ -14673,6 +15375,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -7333,7 +7333,7 @@ index 3cf41b79116..e5d57f52912 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -14673,210 +15378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -14705,210 +15410,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -7708,10 +7708,10 @@ index 3cf41b79116..e5d57f52912 100755 chmod +x "$ofile" diff --git a/ld/configure b/ld/configure -index 1c872c0db5f..fe938e6c99f 100755 +index 8355c433c76..a49ab3d1f09 100755 --- a/ld/configure +++ b/ld/configure -@@ -691,8 +691,11 @@ OTOOL +@@ -693,8 +693,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -7723,7 +7723,7 @@ index 1c872c0db5f..fe938e6c99f 100755 OBJDUMP LN_S NM -@@ -819,6 +822,7 @@ enable_static +@@ -821,6 +824,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -7731,7 +7731,7 @@ index 1c872c0db5f..fe938e6c99f 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1520,6 +1524,8 @@ Optional Packages: +@@ -1526,6 +1530,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -7740,7 +7740,7 @@ index 1c872c0db5f..fe938e6c99f 100755 --with-lib-path=dir1:dir2... set default LIB_PATH --with-sysroot=DIR Search for usr/lib et al within DIR. --with-system-zlib use installed libz -@@ -5973,8 +5979,8 @@ esac +@@ -5979,8 +5985,8 @@ esac @@ -7751,7 +7751,7 @@ index 1c872c0db5f..fe938e6c99f 100755 -@@ -6014,7 +6020,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -6020,7 +6026,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -7760,7 +7760,7 @@ index 1c872c0db5f..fe938e6c99f 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6700,8 +6706,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6706,8 +6712,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -7771,7 +7771,7 @@ index 1c872c0db5f..fe938e6c99f 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6750,6 +6756,80 @@ esac +@@ -6756,6 +6762,80 @@ esac @@ -7852,7 +7852,7 @@ index 1c872c0db5f..fe938e6c99f 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6766,6 +6846,11 @@ case $reload_flag in +@@ -6772,6 +6852,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -7864,7 +7864,7 @@ index 1c872c0db5f..fe938e6c99f 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6934,7 +7019,8 @@ mingw* | pw32*) +@@ -6940,7 +7025,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -7874,7 +7874,7 @@ index 1c872c0db5f..fe938e6c99f 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -7088,6 +7174,21 @@ esac +@@ -7094,6 +7180,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -7896,7 +7896,7 @@ index 1c872c0db5f..fe938e6c99f 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7103,9 +7204,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -7109,9 +7210,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -8061,7 +8061,7 @@ index 1c872c0db5f..fe938e6c99f 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -7121,7 +7375,7 @@ do +@@ -7127,7 +7381,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -8070,7 +8070,7 @@ index 1c872c0db5f..fe938e6c99f 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7141,11 +7395,15 @@ $as_echo "no" >&6; } +@@ -7147,11 +7401,15 @@ $as_echo "no" >&6; } fi @@ -8089,7 +8089,7 @@ index 1c872c0db5f..fe938e6c99f 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7161,7 +7419,7 @@ do +@@ -7167,7 +7425,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -8098,7 +8098,7 @@ index 1c872c0db5f..fe938e6c99f 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7180,6 +7438,10 @@ else +@@ -7186,6 +7444,10 @@ else $as_echo "no" >&6; } fi @@ -8109,7 +8109,7 @@ index 1c872c0db5f..fe938e6c99f 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -7191,12 +7453,12 @@ ac_tool_warned=yes ;; +@@ -7197,12 +7459,12 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -8126,7 +8126,7 @@ index 1c872c0db5f..fe938e6c99f 100755 -@@ -7206,6 +7468,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -7212,6 +7474,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -8189,7 +8189,7 @@ index 1c872c0db5f..fe938e6c99f 100755 if test -n "$ac_tool_prefix"; then -@@ -7542,8 +7860,8 @@ esac +@@ -7548,8 +7866,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -8200,7 +8200,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7579,6 +7897,7 @@ for ac_symprfx in "" "_"; do +@@ -7585,6 +7903,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -8208,7 +8208,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7620,6 +7939,18 @@ _LT_EOF +@@ -7626,6 +7945,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -8227,7 +8227,7 @@ index 1c872c0db5f..fe938e6c99f 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7631,7 +7962,7 @@ _LT_EOF +@@ -7637,7 +7968,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -8236,7 +8236,7 @@ index 1c872c0db5f..fe938e6c99f 100755 const char *name; void *address; } -@@ -7657,8 +7988,8 @@ static const void *lt_preloaded_setup() { +@@ -7663,8 +7994,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -8247,7 +8247,7 @@ index 1c872c0db5f..fe938e6c99f 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7668,8 +7999,8 @@ _LT_EOF +@@ -7674,8 +8005,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -8258,7 +8258,7 @@ index 1c872c0db5f..fe938e6c99f 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7706,6 +8037,19 @@ else +@@ -7712,6 +8043,19 @@ else $as_echo "ok" >&6; } fi @@ -8278,7 +8278,7 @@ index 1c872c0db5f..fe938e6c99f 100755 -@@ -7722,6 +8066,42 @@ fi +@@ -7728,6 +8072,42 @@ fi @@ -8321,7 +8321,7 @@ index 1c872c0db5f..fe938e6c99f 100755 -@@ -7933,6 +8313,123 @@ esac +@@ -7939,6 +8319,123 @@ esac need_locks="$enable_libtool_lock" @@ -8445,7 +8445,7 @@ index 1c872c0db5f..fe938e6c99f 100755 case $host_os in rhapsody* | darwin*) -@@ -8496,6 +8993,8 @@ _LT_EOF +@@ -8502,6 +8999,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -8454,7 +8454,7 @@ index 1c872c0db5f..fe938e6c99f 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8564,6 +9063,16 @@ done +@@ -8570,6 +9069,16 @@ done @@ -8471,7 +8471,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Set options -@@ -8692,7 +9201,8 @@ fi +@@ -8698,7 +9207,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -8481,7 +8481,7 @@ index 1c872c0db5f..fe938e6c99f 100755 -@@ -8781,7 +9291,7 @@ aix3*) +@@ -8787,7 +9297,7 @@ aix3*) esac # Global variables: @@ -8490,7 +8490,7 @@ index 1c872c0db5f..fe938e6c99f 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -9079,8 +9589,6 @@ fi +@@ -9085,8 +9595,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -8499,7 +8499,7 @@ index 1c872c0db5f..fe938e6c99f 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -9246,6 +9754,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -9252,6 +9760,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -8512,7 +8512,7 @@ index 1c872c0db5f..fe938e6c99f 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -9308,7 +9822,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -9314,7 +9828,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -8521,7 +8521,7 @@ index 1c872c0db5f..fe938e6c99f 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -9365,13 +9879,17 @@ case $host_os in +@@ -9371,13 +9885,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -8545,7 +8545,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # # Check to make sure the PIC flag actually works. -@@ -9432,6 +9950,11 @@ fi +@@ -9438,6 +9956,11 @@ fi @@ -8557,7 +8557,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # # Check to make sure the static flag actually works. # -@@ -9782,7 +10305,8 @@ _LT_EOF +@@ -9788,7 +10311,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -8567,7 +8567,7 @@ index 1c872c0db5f..fe938e6c99f 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9881,12 +10405,12 @@ _LT_EOF +@@ -9887,12 +10411,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -8582,7 +8582,7 @@ index 1c872c0db5f..fe938e6c99f 100755 fi ;; esac -@@ -9900,8 +10424,8 @@ _LT_EOF +@@ -9906,8 +10430,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -8593,7 +8593,7 @@ index 1c872c0db5f..fe938e6c99f 100755 fi ;; -@@ -9919,8 +10443,8 @@ _LT_EOF +@@ -9925,8 +10449,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8604,7 +8604,7 @@ index 1c872c0db5f..fe938e6c99f 100755 else ld_shlibs=no fi -@@ -9966,8 +10490,8 @@ _LT_EOF +@@ -9972,8 +10496,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8615,7 +8615,7 @@ index 1c872c0db5f..fe938e6c99f 100755 else ld_shlibs=no fi -@@ -10097,7 +10621,13 @@ _LT_EOF +@@ -10103,7 +10627,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -8630,7 +8630,7 @@ index 1c872c0db5f..fe938e6c99f 100755 /* end confdefs.h. */ int -@@ -10110,22 +10640,29 @@ main () +@@ -10116,22 +10646,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8673,7 +8673,7 @@ index 1c872c0db5f..fe938e6c99f 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10137,7 +10674,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10143,7 +10680,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -8688,7 +8688,7 @@ index 1c872c0db5f..fe938e6c99f 100755 /* end confdefs.h. */ int -@@ -10150,22 +10693,29 @@ main () +@@ -10156,22 +10699,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8731,7 +8731,7 @@ index 1c872c0db5f..fe938e6c99f 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -10209,21 +10759,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10215,21 +10765,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -8811,7 +8811,7 @@ index 1c872c0db5f..fe938e6c99f 100755 ;; darwin* | rhapsody*) -@@ -10284,7 +10877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10290,7 +10883,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -8820,7 +8820,7 @@ index 1c872c0db5f..fe938e6c99f 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -10292,7 +10885,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10298,7 +10891,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -8829,7 +8829,7 @@ index 1c872c0db5f..fe938e6c99f 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -10308,7 +10901,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10314,7 +10907,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -8838,7 +8838,7 @@ index 1c872c0db5f..fe938e6c99f 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10332,10 +10925,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10338,10 +10931,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -8851,7 +8851,7 @@ index 1c872c0db5f..fe938e6c99f 100755 ;; esac else -@@ -10414,23 +11007,36 @@ fi +@@ -10420,23 +11013,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -8896,7 +8896,7 @@ index 1c872c0db5f..fe938e6c99f 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10515,7 +11121,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10521,7 +11127,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -8905,7 +8905,7 @@ index 1c872c0db5f..fe938e6c99f 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10534,9 +11140,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10540,9 +11146,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -8917,7 +8917,7 @@ index 1c872c0db5f..fe938e6c99f 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -11112,8 +11718,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11118,8 +11724,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -8929,7 +8929,7 @@ index 1c872c0db5f..fe938e6c99f 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -11146,13 +11753,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11152,13 +11759,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -9002,7 +9002,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -11244,7 +11909,7 @@ haiku*) +@@ -11240,7 +11905,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -9011,16 +9011,16 @@ index 1c872c0db5f..fe938e6c99f 100755 hardcode_into_libs=yes ;; -@@ -12040,7 +12705,7 @@ else +@@ -12036,7 +12701,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12040 "configure" +-#line 12036 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12084,10 +12749,10 @@ else +@@ -12080,10 +12745,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -9033,16 +9033,16 @@ index 1c872c0db5f..fe938e6c99f 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12146,7 +12811,7 @@ else +@@ -12142,7 +12807,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12146 "configure" +-#line 12142 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12190,10 +12855,10 @@ else +@@ -12186,10 +12851,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -9055,7 +9055,7 @@ index 1c872c0db5f..fe938e6c99f 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12585,6 +13250,7 @@ $RM -r conftest* +@@ -12581,6 +13246,7 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -9063,7 +9063,7 @@ index 1c872c0db5f..fe938e6c99f 100755 lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -12602,6 +13268,7 @@ $RM -r conftest* +@@ -12598,6 +13264,7 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -9071,7 +9071,7 @@ index 1c872c0db5f..fe938e6c99f 100755 compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do -@@ -12884,7 +13551,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -12880,7 +13547,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -9086,7 +9086,7 @@ index 1c872c0db5f..fe938e6c99f 100755 /* end confdefs.h. */ int -@@ -12897,22 +13570,29 @@ main () +@@ -12893,22 +13566,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9129,7 +9129,7 @@ index 1c872c0db5f..fe938e6c99f 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -12925,7 +13605,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12921,7 +13601,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -9144,7 +9144,7 @@ index 1c872c0db5f..fe938e6c99f 100755 /* end confdefs.h. */ int -@@ -12938,22 +13624,29 @@ main () +@@ -12934,22 +13620,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9187,7 +9187,7 @@ index 1c872c0db5f..fe938e6c99f 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -12996,29 +13689,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12992,29 +13685,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; cygwin* | mingw* | pw32* | cegcc*) @@ -9286,7 +9286,7 @@ index 1c872c0db5f..fe938e6c99f 100755 darwin* | rhapsody*) -@@ -13124,7 +13863,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13120,7 +13859,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; *) if test "$GXX" = yes; then @@ -9295,7 +9295,7 @@ index 1c872c0db5f..fe938e6c99f 100755 else # FIXME: insert proper C++ library support ld_shlibs_CXX=no -@@ -13195,10 +13934,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13191,10 +13930,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -9308,7 +9308,7 @@ index 1c872c0db5f..fe938e6c99f 100755 ;; esac fi -@@ -13239,9 +13978,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13235,9 +13974,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -9320,7 +9320,7 @@ index 1c872c0db5f..fe938e6c99f 100755 fi fi link_all_deplibs_CXX=yes -@@ -13311,20 +14050,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13307,20 +14046,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -9345,7 +9345,7 @@ index 1c872c0db5f..fe938e6c99f 100755 ;; *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13519,7 +14258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13515,7 +14254,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -9354,7 +9354,7 @@ index 1c872c0db5f..fe938e6c99f 100755 ;; esac -@@ -13565,7 +14304,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13561,7 +14300,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in @@ -9363,7 +9363,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' -@@ -13606,9 +14345,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13602,9 +14341,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -9375,7 +9375,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -13743,6 +14482,13 @@ private: +@@ -13739,6 +14478,13 @@ private: }; _LT_EOF @@ -9389,7 +9389,7 @@ index 1c872c0db5f..fe938e6c99f 100755 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -13756,7 +14502,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13752,7 +14498,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do @@ -9398,7 +9398,7 @@ index 1c872c0db5f..fe938e6c99f 100755 -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -13765,13 +14511,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13761,13 +14507,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 test $p = "-R"; then prev=$p continue @@ -9425,7 +9425,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. -@@ -13791,8 +14546,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13787,8 +14542,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi @@ -9436,7 +9436,7 @@ index 1c872c0db5f..fe938e6c99f 100755 *.$objext) # This assumes that the test object file only shows up # once in the compiler output. -@@ -13828,6 +14585,7 @@ else +@@ -13824,6 +14581,7 @@ else fi $RM -f confest.$objext @@ -9444,7 +9444,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # PORTME: override above test on systems where it is broken case $host_os in -@@ -13863,7 +14621,7 @@ linux*) +@@ -13859,7 +14617,7 @@ linux*) solaris*) case $cc_basename in @@ -9453,7 +9453,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13928,8 +14686,6 @@ fi +@@ -13924,8 +14682,6 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -9462,7 +9462,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -14034,6 +14790,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -14030,6 +14786,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; @@ -9474,7 +9474,7 @@ index 1c872c0db5f..fe938e6c99f 100755 dgux*) case $cc_basename in ec++*) -@@ -14186,7 +14947,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -14182,7 +14943,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in @@ -9483,7 +9483,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' -@@ -14251,10 +15012,17 @@ case $host_os in +@@ -14247,10 +15008,17 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -9504,7 +9504,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # # Check to make sure the PIC flag actually works. -@@ -14312,6 +15080,8 @@ fi +@@ -14308,6 +15076,8 @@ fi @@ -9513,7 +9513,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # # Check to make sure the static flag actually works. # -@@ -14489,6 +15259,7 @@ fi +@@ -14485,6 +15255,7 @@ fi $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -9521,7 +9521,7 @@ index 1c872c0db5f..fe938e6c99f 100755 case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -14503,15 +15274,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -14499,15 +15270,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" @@ -9547,7 +9547,7 @@ index 1c872c0db5f..fe938e6c99f 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14774,8 +15550,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14770,8 +15546,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -9559,7 +9559,7 @@ index 1c872c0db5f..fe938e6c99f 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -14807,13 +15584,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14803,13 +15580,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -9632,7 +9632,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -14904,7 +15739,7 @@ haiku*) +@@ -14890,7 +15725,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -9641,7 +9641,7 @@ index 1c872c0db5f..fe938e6c99f 100755 hardcode_into_libs=yes ;; -@@ -15363,6 +16198,7 @@ fi +@@ -15349,6 +16184,7 @@ fi fi # test -n "$compiler" CC=$lt_save_CC @@ -9649,7 +9649,7 @@ index 1c872c0db5f..fe938e6c99f 100755 LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -18554,13 +19390,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -18612,13 +19448,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -9670,7 +9670,7 @@ index 1c872c0db5f..fe938e6c99f 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -18575,14 +19418,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -18633,14 +19476,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -9689,7 +9689,7 @@ index 1c872c0db5f..fe938e6c99f 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -18615,12 +19461,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -18673,12 +19519,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -9703,7 +9703,7 @@ index 1c872c0db5f..fe938e6c99f 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -18659,8 +19505,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote +@@ -18717,8 +19563,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' @@ -9713,7 +9713,7 @@ index 1c872c0db5f..fe938e6c99f 100755 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18687,12 +19533,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ +@@ -18745,12 +19591,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' @@ -9727,7 +9727,7 @@ index 1c872c0db5f..fe938e6c99f 100755 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18730,8 +19576,13 @@ reload_flag \ +@@ -18788,8 +19634,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -9741,7 +9741,7 @@ index 1c872c0db5f..fe938e6c99f 100755 STRIP \ RANLIB \ CC \ -@@ -18741,12 +19592,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -18799,12 +19650,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -9757,7 +9757,7 @@ index 1c872c0db5f..fe938e6c99f 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -18762,7 +19615,6 @@ no_undefined_flag \ +@@ -18820,7 +19673,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -9765,7 +9765,7 @@ index 1c872c0db5f..fe938e6c99f 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -18784,8 +19636,8 @@ LD_CXX \ +@@ -18842,8 +19694,8 @@ LD_CXX \ reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ @@ -9775,7 +9775,7 @@ index 1c872c0db5f..fe938e6c99f 100755 lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ -@@ -18797,7 +19649,6 @@ no_undefined_flag_CXX \ +@@ -18855,7 +19707,6 @@ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ @@ -9783,7 +9783,7 @@ index 1c872c0db5f..fe938e6c99f 100755 exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ -@@ -18831,6 +19682,7 @@ module_cmds \ +@@ -18889,6 +19740,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -9791,7 +9791,7 @@ index 1c872c0db5f..fe938e6c99f 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18845,7 +19697,8 @@ archive_expsym_cmds_CXX \ +@@ -18903,7 +19755,8 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ @@ -9801,7 +9801,7 @@ index 1c872c0db5f..fe938e6c99f 100755 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19610,7 +20463,8 @@ $as_echo X"$file" | +@@ -19668,7 +20521,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -9811,7 +9811,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -19713,19 +20567,42 @@ SP2NL=$lt_lt_SP2NL +@@ -19771,19 +20625,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -9855,7 +9855,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -19755,6 +20632,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -19813,6 +20690,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -9868,7 +9868,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -19764,6 +20647,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -19822,6 +20705,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -9878,7 +9878,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -19878,12 +20764,12 @@ with_gcc=$GCC +@@ -19936,12 +20822,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -9894,7 +9894,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -19970,9 +20856,6 @@ inherit_rpath=$inherit_rpath +@@ -20028,9 +20914,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -9904,7 +9904,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -19988,6 +20871,9 @@ include_expsyms=$lt_include_expsyms +@@ -20046,6 +20929,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -9914,7 +9914,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -20034,210 +20920,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -20092,210 +20978,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -10288,7 +10288,7 @@ index 1c872c0db5f..fe938e6c99f 100755 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -@@ -20265,12 +21110,12 @@ with_gcc=$GCC_CXX +@@ -20323,12 +21168,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX @@ -10304,7 +10304,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX -@@ -20357,9 +21202,6 @@ inherit_rpath=$inherit_rpath_CXX +@@ -20415,9 +21260,6 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX @@ -10314,7 +10314,7 @@ index 1c872c0db5f..fe938e6c99f 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX -@@ -20375,6 +21217,9 @@ include_expsyms=$lt_include_expsyms_CXX +@@ -20433,6 +21275,9 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX @@ -10325,7 +10325,7 @@ index 1c872c0db5f..fe938e6c99f 100755 file_list_spec=$lt_file_list_spec_CXX diff --git a/libctf/configure b/libctf/configure -index 1dc1b65fac3..c5c2f36bbc0 100755 +index 6b294bfebfb..52a025bb848 100755 --- a/libctf/configure +++ b/libctf/configure @@ -663,6 +663,8 @@ OTOOL @@ -10345,7 +10345,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 enable_libtool_lock enable_largefile enable_werror_always -@@ -1448,6 +1451,8 @@ Optional Packages: +@@ -1452,6 +1455,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -10354,7 +10354,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 --with-system-zlib use installed libz Some influential environment variables: -@@ -5406,8 +5411,8 @@ esac +@@ -5411,8 +5416,8 @@ esac @@ -10365,7 +10365,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 -@@ -5518,7 +5523,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5523,7 +5528,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -10374,7 +10374,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6204,8 +6209,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6209,8 +6214,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -10385,7 +10385,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6254,6 +6259,80 @@ esac +@@ -6259,6 +6264,80 @@ esac @@ -10466,7 +10466,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6270,6 +6349,11 @@ case $reload_flag in +@@ -6275,6 +6354,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -10478,7 +10478,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6438,7 +6522,8 @@ mingw* | pw32*) +@@ -6443,7 +6527,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -10488,7 +10488,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6592,6 +6677,21 @@ esac +@@ -6597,6 +6682,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -10510,7 +10510,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6607,9 +6707,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6612,9 +6712,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -10675,7 +10675,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6625,7 +6878,7 @@ do +@@ -6630,7 +6883,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -10684,7 +10684,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6645,11 +6898,15 @@ $as_echo "no" >&6; } +@@ -6650,11 +6903,15 @@ $as_echo "no" >&6; } fi @@ -10703,7 +10703,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6665,7 +6922,7 @@ do +@@ -6670,7 +6927,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -10712,7 +10712,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6684,6 +6941,10 @@ else +@@ -6689,6 +6946,10 @@ else $as_echo "no" >&6; } fi @@ -10723,7 +10723,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6695,16 +6956,72 @@ ac_tool_warned=yes ;; +@@ -6700,16 +6961,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -10800,7 +10800,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 -@@ -7046,8 +7363,8 @@ esac +@@ -7051,8 +7368,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -10811,7 +10811,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7083,6 +7400,7 @@ for ac_symprfx in "" "_"; do +@@ -7088,6 +7405,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -10819,7 +10819,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7124,6 +7442,18 @@ _LT_EOF +@@ -7129,6 +7447,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -10838,7 +10838,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7135,7 +7465,7 @@ _LT_EOF +@@ -7140,7 +7470,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -10847,7 +10847,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 const char *name; void *address; } -@@ -7161,8 +7491,8 @@ static const void *lt_preloaded_setup() { +@@ -7166,8 +7496,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -10858,7 +10858,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7172,8 +7502,8 @@ _LT_EOF +@@ -7177,8 +7507,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -10869,7 +10869,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7210,6 +7540,16 @@ else +@@ -7215,6 +7545,16 @@ else $as_echo "ok" >&6; } fi @@ -10886,7 +10886,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 -@@ -7226,6 +7566,45 @@ fi +@@ -7231,6 +7571,45 @@ fi @@ -10932,7 +10932,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 -@@ -7437,6 +7816,123 @@ esac +@@ -7442,6 +7821,123 @@ esac need_locks="$enable_libtool_lock" @@ -11056,7 +11056,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 case $host_os in rhapsody* | darwin*) -@@ -8000,6 +8496,8 @@ _LT_EOF +@@ -8005,6 +8501,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -11065,7 +11065,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8165,7 +8663,8 @@ fi +@@ -8170,7 +8668,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -11075,7 +11075,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 -@@ -8254,7 +8753,7 @@ aix3*) +@@ -8259,7 +8758,7 @@ aix3*) esac # Global variables: @@ -11084,7 +11084,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8552,8 +9051,6 @@ fi +@@ -8557,8 +9056,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -11093,7 +11093,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8719,6 +9216,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8724,6 +9221,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -11106,7 +11106,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8781,7 +9284,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8786,7 +9289,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -11115,7 +11115,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8838,13 +9341,17 @@ case $host_os in +@@ -8843,13 +9346,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -11139,7 +11139,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 # # Check to make sure the PIC flag actually works. -@@ -8905,6 +9412,11 @@ fi +@@ -8910,6 +9417,11 @@ fi @@ -11151,7 +11151,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 # # Check to make sure the static flag actually works. # -@@ -9255,7 +9767,8 @@ _LT_EOF +@@ -9260,7 +9772,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -11161,7 +11161,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9354,12 +9867,12 @@ _LT_EOF +@@ -9359,12 +9872,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -11176,7 +11176,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 fi ;; esac -@@ -9373,8 +9886,8 @@ _LT_EOF +@@ -9378,8 +9891,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -11187,7 +11187,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 fi ;; -@@ -9392,8 +9905,8 @@ _LT_EOF +@@ -9397,8 +9910,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -11198,7 +11198,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 else ld_shlibs=no fi -@@ -9439,8 +9952,8 @@ _LT_EOF +@@ -9444,8 +9957,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -11209,7 +11209,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 else ld_shlibs=no fi -@@ -9570,7 +10083,13 @@ _LT_EOF +@@ -9575,7 +10088,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -11224,7 +11224,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 /* end confdefs.h. */ int -@@ -9583,22 +10102,29 @@ main () +@@ -9588,22 +10107,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -11267,7 +11267,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9610,7 +10136,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9615,7 +10141,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -11282,7 +11282,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 /* end confdefs.h. */ int -@@ -9623,22 +10155,29 @@ main () +@@ -9628,22 +10160,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -11325,7 +11325,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9683,20 +10222,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9688,20 +10227,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -11403,7 +11403,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 ;; darwin* | rhapsody*) -@@ -9757,7 +10339,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9762,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -11412,7 +11412,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9765,7 +10347,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9770,7 +10352,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -11421,7 +11421,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9781,7 +10363,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9786,7 +10368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -11430,7 +11430,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9805,10 +10387,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9810,10 +10392,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -11443,7 +11443,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 ;; esac else -@@ -9887,23 +10469,36 @@ fi +@@ -9892,23 +10474,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -11488,7 +11488,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9988,7 +10583,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9993,7 +10588,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -11497,7 +11497,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10007,9 +10602,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10012,9 +10607,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -11509,7 +11509,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10585,8 +11180,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10590,8 +11185,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -11521,7 +11521,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10619,13 +11215,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10624,13 +11220,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -11594,7 +11594,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10717,7 +11371,7 @@ haiku*) +@@ -10712,7 +11366,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11603,16 +11603,16 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 hardcode_into_libs=yes ;; -@@ -11513,7 +12167,7 @@ else +@@ -11508,7 +12162,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11516 "configure" +-#line 11511 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11557,10 +12211,10 @@ else +@@ -11552,10 +12206,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -11625,16 +11625,16 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11619,7 +12273,7 @@ else +@@ -11614,7 +12268,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11622 "configure" +-#line 11617 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11663,10 +12317,10 @@ else +@@ -11658,10 +12312,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -11647,7 +11647,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14110,13 +14764,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -14136,13 +14790,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -11668,7 +11668,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -14131,14 +14792,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -14157,14 +14818,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -11687,7 +11687,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -14171,12 +14835,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -14197,12 +14861,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -11701,7 +11701,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -14231,8 +14895,13 @@ reload_flag \ +@@ -14257,8 +14921,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -11715,7 +11715,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 STRIP \ RANLIB \ CC \ -@@ -14242,12 +14911,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -14268,12 +14937,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -11731,7 +11731,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -14263,7 +14934,6 @@ no_undefined_flag \ +@@ -14289,7 +14960,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -11739,7 +11739,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -14299,6 +14969,7 @@ module_cmds \ +@@ -14325,6 +14995,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -11747,7 +11747,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -15055,7 +15726,8 @@ $as_echo X"$file" | +@@ -15081,7 +15752,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -11757,7 +11757,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -15158,19 +15830,42 @@ SP2NL=$lt_lt_SP2NL +@@ -15184,19 +15856,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -11801,7 +11801,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -15200,6 +15895,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -15226,6 +15921,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -11814,7 +11814,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -15209,6 +15910,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -15235,6 +15936,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -11824,7 +11824,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -15323,12 +16027,12 @@ with_gcc=$GCC +@@ -15349,12 +16053,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -11840,7 +11840,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -15415,9 +16119,6 @@ inherit_rpath=$inherit_rpath +@@ -15441,9 +16145,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -11850,7 +11850,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -15433,6 +16134,9 @@ include_expsyms=$lt_include_expsyms +@@ -15459,6 +16160,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -11860,7 +11860,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -15465,210 +16169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -15491,210 +16195,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -12235,7 +12235,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755 chmod +x "$ofile" diff --git a/libtool.m4 b/libtool.m4 -index 434530059fa..e45fdc6998c 100644 +index e993b621ac2..7715af647f4 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1,7 +1,8 @@ @@ -12605,7 +12605,7 @@ index 434530059fa..e45fdc6998c 100644 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -2342,7 +2483,7 @@ haiku*) +@@ -2332,7 +2473,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -12614,7 +12614,7 @@ index 434530059fa..e45fdc6998c 100644 hardcode_into_libs=yes ;; -@@ -2950,6 +3091,11 @@ case $reload_flag in +@@ -2940,6 +3081,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -12626,7 +12626,7 @@ index 434530059fa..e45fdc6998c 100644 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -3016,7 +3162,8 @@ mingw* | pw32*) +@@ -3006,7 +3152,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -12636,7 +12636,7 @@ index 434530059fa..e45fdc6998c 100644 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -3167,6 +3314,21 @@ tpf*) +@@ -3157,6 +3304,21 @@ tpf*) ;; esac ]) @@ -12658,7 +12658,7 @@ index 434530059fa..e45fdc6998c 100644 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -3164,7 +3326,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], @@ -12671,7 +12671,7 @@ index 434530059fa..e45fdc6998c 100644 ])# _LT_CHECK_MAGIC_METHOD -@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: +@@ -3267,6 +3433,67 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AM_PROG_NM], []) dnl AC_DEFUN([AC_PROG_NM], []) @@ -12739,7 +12739,7 @@ index 434530059fa..e45fdc6998c 100644 # LT_LIB_M # -------- -@@ -3403,8 +3630,8 @@ esac +@@ -3393,8 +3620,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -12750,7 +12750,7 @@ index 434530059fa..e45fdc6998c 100644 # Handle CRLF in mingw tool chain opt_cr= -@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do +@@ -3430,6 +3657,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -12758,7 +12758,7 @@ index 434530059fa..e45fdc6998c 100644 # Check to see that the pipe works correctly. pipe_works=no -@@ -3473,6 +3701,18 @@ _LT_EOF +@@ -3463,6 +3691,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -12777,7 +12777,7 @@ index 434530059fa..e45fdc6998c 100644 #ifdef __cplusplus extern "C" { #endif -@@ -3484,7 +3724,7 @@ _LT_EOF +@@ -3474,7 +3714,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -12786,7 +12786,7 @@ index 434530059fa..e45fdc6998c 100644 const char *name; void *address; } -@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { +@@ -3500,15 +3740,15 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -12806,7 +12806,7 @@ index 434530059fa..e45fdc6998c 100644 else echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi -@@ -3551,6 +3791,13 @@ else +@@ -3541,6 +3781,13 @@ else AC_MSG_RESULT(ok) fi @@ -12820,7 +12820,7 @@ index 434530059fa..e45fdc6998c 100644 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], +@@ -3551,6 +3798,8 @@ _LT_DECL([global_symbol_to_c_name_address], _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) @@ -12829,7 +12829,7 @@ index 434530059fa..e45fdc6998c 100644 ]) # _LT_CMD_GLOBAL_SYMBOLS -@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= +@@ -3562,7 +3811,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)= @@ -12837,7 +12837,7 @@ index 434530059fa..e45fdc6998c 100644 m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ +@@ -3668,6 +3916,12 @@ m4_if([$1], [CXX], [ ;; esac ;; @@ -12850,7 +12850,7 @@ index 434530059fa..e45fdc6998c 100644 dgux*) case $cc_basename in ec++*) -@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ +@@ -3820,7 +4074,7 @@ m4_if([$1], [CXX], [ ;; solaris*) case $cc_basename in @@ -12859,7 +12859,7 @@ index 434530059fa..e45fdc6998c 100644 # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ +@@ -4043,6 +4297,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; @@ -12872,7 +12872,7 @@ index 434530059fa..e45fdc6998c 100644 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ +@@ -4105,7 +4365,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' case $cc_basename in @@ -12881,7 +12881,7 @@ index 434530059fa..e45fdc6998c 100644 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; *) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -@@ -4172,9 +4432,11 @@ case $host_os in +@@ -4162,9 +4422,11 @@ case $host_os in _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ;; esac @@ -12896,7 +12896,7 @@ index 434530059fa..e45fdc6998c 100644 # # Check to make sure the PIC flag actually works. -@@ -4193,6 +4455,8 @@ fi +@@ -4183,6 +4445,8 @@ fi _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], [Additional compiler flags for building library objects]) @@ -12905,7 +12905,7 @@ index 434530059fa..e45fdc6998c 100644 # # Check to make sure the static flag actually works. # -@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], +@@ -4203,6 +4467,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl @@ -12913,7 +12913,7 @@ index 434530059fa..e45fdc6998c 100644 m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_DECL_SED])dnl -@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl +@@ -4211,6 +4476,7 @@ m4_require([_LT_TAG_COMPILER])dnl AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -12921,7 +12921,7 @@ index 434530059fa..e45fdc6998c 100644 case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ +@@ -4225,15 +4491,20 @@ m4_if([$1], [CXX], [ ;; pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" @@ -12947,7 +12947,7 @@ index 434530059fa..e45fdc6998c 100644 ], [ runpath_var= _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -4411,7 +4682,8 @@ _LT_EOF +@@ -4401,7 +4672,8 @@ _LT_EOF _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -12957,7 +12957,7 @@ index 434530059fa..e45fdc6998c 100644 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -4510,12 +4782,12 @@ _LT_EOF +@@ -4500,12 +4772,12 @@ _LT_EOF _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' @@ -12972,7 +12972,7 @@ index 434530059fa..e45fdc6998c 100644 fi ;; esac -@@ -4529,8 +4801,8 @@ _LT_EOF +@@ -4519,8 +4791,8 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -12983,7 +12983,7 @@ index 434530059fa..e45fdc6998c 100644 fi ;; -@@ -4548,8 +4820,8 @@ _LT_EOF +@@ -4538,8 +4810,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -12994,7 +12994,7 @@ index 434530059fa..e45fdc6998c 100644 else _LT_TAGVAR(ld_shlibs, $1)=no fi -@@ -4595,8 +4867,8 @@ _LT_EOF +@@ -4585,8 +4857,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -13005,7 +13005,7 @@ index 434530059fa..e45fdc6998c 100644 else _LT_TAGVAR(ld_shlibs, $1)=no fi -@@ -4726,7 +4998,7 @@ _LT_EOF +@@ -4716,7 +4988,7 @@ _LT_EOF _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -13014,7 +13014,7 @@ index 434530059fa..e45fdc6998c 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else -@@ -4737,7 +5009,7 @@ _LT_EOF +@@ -4727,7 +4999,7 @@ _LT_EOF else # Determine the default libpath from the value encoded in an # empty executable. @@ -13023,7 +13023,7 @@ index 434530059fa..e45fdc6998c 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. -@@ -4781,20 +5053,63 @@ _LT_EOF +@@ -4771,20 +5043,63 @@ _LT_EOF # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -13101,7 +13101,7 @@ index 434530059fa..e45fdc6998c 100644 ;; darwin* | rhapsody*) -@@ -4828,7 +5143,7 @@ _LT_EOF +@@ -4818,7 +5133,7 @@ _LT_EOF # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -13110,7 +13110,7 @@ index 434530059fa..e45fdc6998c 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -4836,7 +5151,7 @@ _LT_EOF +@@ -4826,7 +5141,7 @@ _LT_EOF hpux9*) if test "$GCC" = yes; then @@ -13119,7 +13119,7 @@ index 434530059fa..e45fdc6998c 100644 else _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -4852,7 +5167,7 @@ _LT_EOF +@@ -4842,7 +5157,7 @@ _LT_EOF hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -13128,7 +13128,7 @@ index 434530059fa..e45fdc6998c 100644 else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -4876,10 +5191,10 @@ _LT_EOF +@@ -4866,10 +5181,10 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -13141,7 +13141,7 @@ index 434530059fa..e45fdc6998c 100644 ;; esac else -@@ -4926,16 +5241,31 @@ _LT_EOF +@@ -4916,16 +5231,31 @@ _LT_EOF irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -13180,7 +13180,7 @@ index 434530059fa..e45fdc6998c 100644 else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -5020,7 +5350,7 @@ _LT_EOF +@@ -5010,7 +5340,7 @@ _LT_EOF osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' @@ -13189,7 +13189,7 @@ index 434530059fa..e45fdc6998c 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -@@ -5039,9 +5369,9 @@ _LT_EOF +@@ -5029,9 +5359,9 @@ _LT_EOF _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -13201,7 +13201,7 @@ index 434530059fa..e45fdc6998c 100644 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], +@@ -5303,8 +5633,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], to runtime path list]) _LT_TAGDECL([], [link_all_deplibs], [0], [Whether libtool must link a program against all its dependency libraries]) @@ -13210,7 +13210,7 @@ index 434530059fa..e45fdc6998c 100644 _LT_TAGDECL([], [always_export_symbols], [0], [Set to "yes" if exported symbols are required]) _LT_TAGDECL([], [export_symbols_cmds], [2], -@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], +@@ -5315,6 +5643,8 @@ _LT_TAGDECL([], [include_expsyms], [1], [Symbols that must always be exported]) _LT_TAGDECL([], [prelink_cmds], [2], [Commands necessary for linking programs (against libraries) with templates]) @@ -13219,7 +13219,7 @@ index 434530059fa..e45fdc6998c 100644 _LT_TAGDECL([], [file_list_spec], [1], [Specify filename containing input files]) dnl FIXME: Not yet implemented -@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" +@@ -5416,6 +5746,7 @@ CC="$lt_save_CC" m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl @@ -13227,7 +13227,7 @@ index 434530059fa..e45fdc6998c 100644 if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then -@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5477,6 +5808,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -13235,7 +13235,7 @@ index 434530059fa..e45fdc6998c 100644 lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5494,6 +5826,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -13243,7 +13243,7 @@ index 434530059fa..e45fdc6998c 100644 compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) -@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5657,7 +5990,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -13252,7 +13252,7 @@ index 434530059fa..e45fdc6998c 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5669,7 +6002,7 @@ if test "$_lt_caught_CXX_error" != yes; then else # Determine the default libpath from the value encoded in an # empty executable. @@ -13261,7 +13261,7 @@ index 434530059fa..e45fdc6998c 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. -@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5711,29 +6044,75 @@ if test "$_lt_caught_CXX_error" != yes; then ;; cygwin* | mingw* | pw32* | cegcc*) @@ -13360,7 +13360,7 @@ index 434530059fa..e45fdc6998c 100644 darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; -@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5808,7 +6187,7 @@ if test "$_lt_caught_CXX_error" != yes; then ;; *) if test "$GXX" = yes; then @@ -13369,7 +13369,7 @@ index 434530059fa..e45fdc6998c 100644 else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5879,10 +6258,10 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -13382,7 +13382,7 @@ index 434530059fa..e45fdc6998c 100644 ;; esac fi -@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5923,9 +6302,9 @@ if test "$_lt_caught_CXX_error" != yes; then *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -13394,7 +13394,7 @@ index 434530059fa..e45fdc6998c 100644 fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5995,20 +6374,20 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -13419,7 +13419,7 @@ index 434530059fa..e45fdc6998c 100644 ;; *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6203,7 +6582,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -13428,7 +13428,7 @@ index 434530059fa..e45fdc6998c 100644 ;; esac -@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6249,7 +6628,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris*) case $cc_basename in @@ -13437,7 +13437,7 @@ index 434530059fa..e45fdc6998c 100644 # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6290,9 +6669,9 @@ if test "$_lt_caught_CXX_error" != yes; then if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -13449,7 +13449,7 @@ index 434530059fa..e45fdc6998c 100644 # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6421,6 +6800,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi # test -n "$compiler" CC=$lt_save_CC @@ -13457,7 +13457,7 @@ index 434530059fa..e45fdc6998c 100644 LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -6445,6 +6825,29 @@ AC_LANG_POP +@@ -6435,6 +6815,29 @@ AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -13487,7 +13487,7 @@ index 434530059fa..e45fdc6998c 100644 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose -@@ -6453,6 +6856,7 @@ AC_LANG_POP +@@ -6443,6 +6846,7 @@ AC_LANG_POP # objects, libraries and library flags. m4_defun([_LT_SYS_HIDDEN_LIBDEPS], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl @@ -13495,7 +13495,7 @@ index 434530059fa..e45fdc6998c 100644 # Dependencies to place before and after the object being linked: _LT_TAGVAR(predep_objects, $1)= _LT_TAGVAR(postdep_objects, $1)= -@@ -6503,6 +6907,13 @@ public class foo { +@@ -6493,6 +6897,13 @@ public class foo { }; _LT_EOF ]) @@ -13509,7 +13509,7 @@ index 434530059fa..e45fdc6998c 100644 dnl Parse the compiler output and extract the necessary dnl objects, libraries and library flags. if AC_TRY_EVAL(ac_compile); then -@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then +@@ -6504,7 +6915,7 @@ if AC_TRY_EVAL(ac_compile); then pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do @@ -13518,7 +13518,7 @@ index 434530059fa..e45fdc6998c 100644 -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then +@@ -6513,13 +6924,22 @@ if AC_TRY_EVAL(ac_compile); then test $p = "-R"; then prev=$p continue @@ -13545,7 +13545,7 @@ index 434530059fa..e45fdc6998c 100644 # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. -@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then +@@ -6539,8 +6959,10 @@ if AC_TRY_EVAL(ac_compile); then _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi fi @@ -13556,7 +13556,7 @@ index 434530059fa..e45fdc6998c 100644 *.$objext) # This assumes that the test object file only shows up # once in the compiler output. -@@ -6586,6 +7008,7 @@ else +@@ -6576,6 +6998,7 @@ else fi $RM -f confest.$objext @@ -13564,7 +13564,7 @@ index 434530059fa..e45fdc6998c 100644 # PORTME: override above test on systems where it is broken m4_if([$1], [CXX], -@@ -6622,7 +7045,7 @@ linux*) +@@ -6612,7 +7035,7 @@ linux*) solaris*) case $cc_basename in @@ -13573,7 +13573,7 @@ index 434530059fa..e45fdc6998c 100644 # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as -@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then +@@ -6725,7 +7148,9 @@ if test "$_lt_disable_F77" != yes; then # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC @@ -13583,7 +13583,7 @@ index 434530059fa..e45fdc6998c 100644 compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) -@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then +@@ -6779,6 +7204,7 @@ if test "$_lt_disable_F77" != yes; then GCC=$lt_save_GCC CC="$lt_save_CC" @@ -13591,7 +13591,7 @@ index 434530059fa..e45fdc6998c 100644 fi # test "$_lt_disable_F77" != yes AC_LANG_POP -@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then +@@ -6855,7 +7281,9 @@ if test "$_lt_disable_FC" != yes; then # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC @@ -13601,7 +13601,7 @@ index 434530059fa..e45fdc6998c 100644 compiler=$CC GCC=$ac_cv_fc_compiler_gnu -@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then +@@ -6911,7 +7339,8 @@ if test "$_lt_disable_FC" != yes; then fi # test -n "$compiler" GCC=$lt_save_GCC @@ -13611,7 +13611,7 @@ index 434530059fa..e45fdc6998c 100644 fi # test "$_lt_disable_FC" != yes AC_LANG_POP -@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE +@@ -6948,10 +7377,12 @@ _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. @@ -13625,7 +13625,7 @@ index 434530059fa..e45fdc6998c 100644 compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_TAGVAR(LD, $1)="$LD" -@@ -6992,7 +7423,8 @@ fi +@@ -6982,7 +7413,8 @@ fi AC_LANG_RESTORE GCC=$lt_save_GCC @@ -13635,7 +13635,7 @@ index 434530059fa..e45fdc6998c 100644 ])# _LT_LANG_GCJ_CONFIG -@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE +@@ -7017,9 +7449,11 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. lt_save_CC="$CC" @@ -13647,7 +13647,7 @@ index 434530059fa..e45fdc6998c 100644 compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) -@@ -7042,7 +7476,8 @@ fi +@@ -7032,7 +7466,8 @@ fi GCC=$lt_save_GCC AC_LANG_RESTORE @@ -13657,7 +13657,7 @@ index 434530059fa..e45fdc6998c 100644 ])# _LT_LANG_RC_CONFIG -@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +@@ -7091,6 +7526,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) AC_SUBST([OBJDUMP]) ]) @@ -13673,7 +13673,7 @@ index 434530059fa..e45fdc6998c 100644 # _LT_DECL_SED # ------------ -@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], +@@ -7184,8 +7628,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -13684,7 +13684,7 @@ index 434530059fa..e45fdc6998c 100644 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +@@ -7224,206 +7668,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ])# _LT_CHECK_SHELL_FEATURES @@ -19318,7 +19318,7 @@ index bf92b5e0790..c573da90c5c 100644 # These exist entirely to fool aclocal when bootstrapping libtool. # diff --git a/opcodes/configure b/opcodes/configure -index 8d1e561c942..a0291dfbfa7 100755 +index dca94db9c3f..26dcc4b82dd 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -680,6 +680,9 @@ OTOOL @@ -20590,7 +20590,7 @@ index 8d1e561c942..a0291dfbfa7 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10643,7 +11298,7 @@ haiku*) +@@ -10633,7 +11288,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -20599,16 +20599,16 @@ index 8d1e561c942..a0291dfbfa7 100755 hardcode_into_libs=yes ;; -@@ -11439,7 +12094,7 @@ else +@@ -11429,7 +12084,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11442 "configure" +-#line 11432 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11483,10 +12138,10 @@ else +@@ -11473,10 +12128,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -20621,16 +20621,16 @@ index 8d1e561c942..a0291dfbfa7 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11545,7 +12200,7 @@ else +@@ -11535,7 +12190,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11548 "configure" +-#line 11538 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11589,10 +12244,10 @@ else +@@ -11579,10 +12234,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -20643,7 +20643,7 @@ index 8d1e561c942..a0291dfbfa7 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13756,13 +14411,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -13746,13 +14401,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -20664,7 +20664,7 @@ index 8d1e561c942..a0291dfbfa7 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13777,14 +14439,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -13767,14 +14429,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -20683,7 +20683,7 @@ index 8d1e561c942..a0291dfbfa7 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13817,12 +14482,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -13807,12 +14472,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -20697,7 +20697,7 @@ index 8d1e561c942..a0291dfbfa7 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13877,8 +14542,13 @@ reload_flag \ +@@ -13867,8 +14532,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -20711,7 +20711,7 @@ index 8d1e561c942..a0291dfbfa7 100755 STRIP \ RANLIB \ CC \ -@@ -13888,12 +14558,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13878,12 +14548,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -20727,7 +20727,7 @@ index 8d1e561c942..a0291dfbfa7 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13909,7 +14581,6 @@ no_undefined_flag \ +@@ -13899,7 +14571,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -20735,7 +20735,7 @@ index 8d1e561c942..a0291dfbfa7 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13945,6 +14616,7 @@ module_cmds \ +@@ -13935,6 +14606,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -20743,7 +20743,7 @@ index 8d1e561c942..a0291dfbfa7 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -14710,7 +15382,8 @@ $as_echo X"$file" | +@@ -14700,7 +15372,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -20753,7 +20753,7 @@ index 8d1e561c942..a0291dfbfa7 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14813,19 +15486,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14803,19 +15476,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -20797,7 +20797,7 @@ index 8d1e561c942..a0291dfbfa7 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -14855,6 +15551,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -14845,6 +15541,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -20810,7 +20810,7 @@ index 8d1e561c942..a0291dfbfa7 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14864,6 +15566,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14854,6 +15556,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -20820,7 +20820,7 @@ index 8d1e561c942..a0291dfbfa7 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14978,12 +15683,12 @@ with_gcc=$GCC +@@ -14968,12 +15673,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -20836,7 +20836,7 @@ index 8d1e561c942..a0291dfbfa7 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -15070,9 +15775,6 @@ inherit_rpath=$inherit_rpath +@@ -15060,9 +15765,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -20846,7 +20846,7 @@ index 8d1e561c942..a0291dfbfa7 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -15088,6 +15790,9 @@ include_expsyms=$lt_include_expsyms +@@ -15078,6 +15780,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -20856,7 +20856,7 @@ index 8d1e561c942..a0291dfbfa7 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -15120,210 +15825,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -15110,210 +15815,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -21231,7 +21231,7 @@ index 8d1e561c942..a0291dfbfa7 100755 chmod +x "$ofile" diff --git a/zlib/configure b/zlib/configure -index de6fa7e9960..cce448b6a53 100755 +index b124acf9259..e4075ef3a2c 100755 --- a/zlib/configure +++ b/zlib/configure @@ -646,8 +646,11 @@ OTOOL @@ -22508,7 +22508,7 @@ index de6fa7e9960..cce448b6a53 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -9830,7 +10485,7 @@ haiku*) +@@ -9820,7 +10475,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -22517,16 +22517,16 @@ index de6fa7e9960..cce448b6a53 100755 hardcode_into_libs=yes ;; -@@ -10644,7 +11299,7 @@ else +@@ -10634,7 +11289,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10647 "configure" +-#line 10637 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10688,10 +11343,10 @@ else +@@ -10678,10 +11333,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -22539,16 +22539,16 @@ index de6fa7e9960..cce448b6a53 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10750,7 +11405,7 @@ else +@@ -10740,7 +11395,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10753 "configure" +-#line 10743 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10794,10 +11449,10 @@ else +@@ -10784,10 +11439,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -22561,7 +22561,7 @@ index de6fa7e9960..cce448b6a53 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -12257,13 +12912,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -22582,7 +22582,7 @@ index de6fa7e9960..cce448b6a53 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -12278,14 +12940,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -22601,7 +22601,7 @@ index de6fa7e9960..cce448b6a53 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -12318,12 +12983,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -22615,7 +22615,7 @@ index de6fa7e9960..cce448b6a53 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -12388,8 +13053,13 @@ reload_flag \ +@@ -12378,8 +13043,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -22629,7 +22629,7 @@ index de6fa7e9960..cce448b6a53 100755 STRIP \ RANLIB \ CC \ -@@ -12399,12 +13069,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -12389,12 +13059,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -22645,7 +22645,7 @@ index de6fa7e9960..cce448b6a53 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -12420,7 +13092,6 @@ no_undefined_flag \ +@@ -12410,7 +13082,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -22653,7 +22653,7 @@ index de6fa7e9960..cce448b6a53 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -12456,6 +13127,7 @@ module_cmds \ +@@ -12446,6 +13117,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -22661,7 +22661,7 @@ index de6fa7e9960..cce448b6a53 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -13054,7 +13726,8 @@ $as_echo X"$file" | +@@ -13044,7 +13716,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -22671,7 +22671,7 @@ index de6fa7e9960..cce448b6a53 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL +@@ -13147,19 +13820,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -22715,7 +22715,7 @@ index de6fa7e9960..cce448b6a53 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -13189,6 +13885,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -22728,7 +22728,7 @@ index de6fa7e9960..cce448b6a53 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -13198,6 +13900,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -22738,7 +22738,7 @@ index de6fa7e9960..cce448b6a53 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -13322,12 +14027,12 @@ with_gcc=$GCC +@@ -13312,12 +14017,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -22754,7 +22754,7 @@ index de6fa7e9960..cce448b6a53 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath +@@ -13404,9 +14109,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -22764,7 +22764,7 @@ index de6fa7e9960..cce448b6a53 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms +@@ -13422,6 +14124,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -22774,7 +22774,7 @@ index de6fa7e9960..cce448b6a53 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -13464,210 +14169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -13454,210 +14159,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -23148,6 +23148,3 @@ index de6fa7e9960..cce448b6a53 100755 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/poky/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index 69a238378..c3a95e653 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,7 +1,7 @@ -From f791a5d84475c02356f16679b7f4ee9c9c3408aa Mon Sep 17 00:00:00 2001 +From 0e026a8758a5416b548de21d5245477cf8e33ed2 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:42:38 +0000 -Subject: [PATCH 14/17] Fix rpath in libtool when sysroot is enabled +Subject: [PATCH] Fix rpath in libtool when sysroot is enabled Enabling sysroot support in libtool exposed a bug where the final library had an RPATH encoded into it which still pointed to the @@ -47,6 +47,3 @@ index 70e856e0659..11ee684cccf 100644 if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch index e848f146b..824d9d460 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch @@ -1,7 +1,7 @@ -From e087f96e219d47c4d2244c3f32397e56d41bfdec Mon Sep 17 00:00:00 2001 +From 9d41698ca97b2c5c20ac83147de1f02d385fa66f Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Mon, 6 Mar 2017 23:33:27 -0800 -Subject: [PATCH 15/17] sync with OE libtool changes +Subject: [PATCH] sync with OE libtool changes Apply these patches from our libtool patches as not only are redundant RPATHs a waste of space but they can cause incorrect linking when native packages are @@ -84,6 +84,3 @@ index 11ee684cccf..3b19ac15328 100644 fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch b/poky/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch index 400b79823..0602c803d 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch @@ -1,7 +1,7 @@ -From ae5a7d622dc9addb2ca9fc85889c45964c025a9c Mon Sep 17 00:00:00 2001 +From 805e3ce0c20bee5049ff167ab6f620a230c6db51 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 15 Apr 2020 14:17:20 -0700 -Subject: [PATCH 16/17] Check for clang before checking gcc version +Subject: [PATCH] Check for clang before checking gcc version Clang advertises itself to be gcc 4.2.1, so when compiling this test here fails since gcc < 4.4.5 did not support -static-libstdc++ but thats @@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 6782f8b6ab8..72f5766b363 100755 +index 7b369071141..7da69e27ce9 100755 --- a/configure +++ b/configure -@@ -5143,7 +5143,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +@@ -5093,7 +5093,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31,10 +31,10 @@ index 6782f8b6ab8..72f5766b363 100755 #endif int main() {} diff --git a/configure.ac b/configure.ac -index 55beb1dea46..3f9e613e2d9 100644 +index 92f01fb3ed7..e99d67ab86b 100644 --- a/configure.ac +++ b/configure.ac -@@ -1312,7 +1312,7 @@ if test "$GCC" = yes; then +@@ -1311,7 +1311,7 @@ if test "$GCC" = yes; then AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) AC_LANG_PUSH(C++) AC_LINK_IFELSE([AC_LANG_SOURCE([ @@ -43,6 +43,3 @@ index 55beb1dea46..3f9e613e2d9 100644 #error -static-libstdc++ not implemented #endif int main() {}])], --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0017-gas-improve-reproducibility-for-stabs-debugging-data.patch b/poky/meta/recipes-devtools/binutils/binutils/0017-gas-improve-reproducibility-for-stabs-debugging-data.patch deleted file mode 100644 index 42e0c1c32..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/0017-gas-improve-reproducibility-for-stabs-debugging-data.patch +++ /dev/null @@ -1,35 +0,0 @@ -From aa6586e80fc6fcd739aa959a71e4cf064cdef072 Mon Sep 17 00:00:00 2001 -From: Denys Zagorui <dzagorui@cisco.com> -Date: Mon, 9 Nov 2020 15:39:10 +0000 -Subject: [PATCH] gas: improve reproducibility for stabs debugging data format - - * config/obj-elf (obj_elf_init_stab_section): Improve - reproducibility for stabs debugging data format - -Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0541201782c006c09d029d18a45c6e743cfea906] ---- - gas/config/obj-elf.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c -index de22b5a1da..2025df8542 100644 ---- a/gas/config/obj-elf.c -+++ b/gas/config/obj-elf.c -@@ -2374,12 +2374,13 @@ obj_elf_init_stab_section (segT seg) - p = frag_more (12); - /* Zero it out. */ - memset (p, 0, 12); -- file = as_where (NULL); -+ file = remap_debug_filename (as_where (NULL)); - stabstr_name = concat (segment_name (seg), "str", (char *) NULL); - stroff = get_stab_string_offset (file, stabstr_name, TRUE); - know (stroff == 1 || (stroff == 0 && file[0] == '\0')); - md_number_to_chars (p, stroff, 4); - seg_info (seg)->stabu.p = p; -+ xfree ((char *) file); - } - - #endif --- -2.20.1 - diff --git a/poky/meta/recipes-devtools/binutils/binutils_2.35.bb b/poky/meta/recipes-devtools/binutils/binutils_2.36.bb index 976e49765..a50d2ee7e 100644 --- a/poky/meta/recipes-devtools/binutils/binutils_2.35.bb +++ b/poky/meta/recipes-devtools/binutils/binutils_2.36.bb @@ -25,6 +25,8 @@ EXTRA_OECONF_class-native = "--enable-targets=all \ --disable-sim \ --disable-werror" +PACKAGECONFIG ??= "" +PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils" # gcc9.0 end up mis-compiling libbfd.so with O2 which then crashes on target # So remove -O2 and use -Os as workaround SELECTED_OPTIMIZATION_remove_mipsarch = "-O2" @@ -52,6 +54,10 @@ do_install_class-native () { rmdir ${D}/${libdir}64 || : } +# libctf races with libbfd +PARALLEL_MAKEINST_class-target = "" +PARALLEL_MAKEINST_class-nativesdk = "" + # Split out libbfd-*.so and libopcodes-*.so so including perf doesn't include # extra stuff PACKAGE_BEFORE_PN += "libbfd libopcodes" diff --git a/poky/meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch b/poky/meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch new file mode 100644 index 000000000..568ee4df1 --- /dev/null +++ b/poky/meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch @@ -0,0 +1,62 @@ +From 2a3db4e3b8d33bad5577c2fcfe124ee7a202ef4f Mon Sep 17 00:00:00 2001 +From: Joshua Watt <JPEWhacker@gmail.com> +Date: Mon, 15 Feb 2021 20:39:57 -0600 +Subject: [PATCH] Use mapped file name for symbols + +Applies the file name mapping before exporting it as a symbol. This +allows the symbols to correctly respect the --file-prefix-map command +line option. + +Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bison-patches/2021-02/msg00014.html] +--- + src/muscle-tab.c | 4 +++- + src/output.c | 8 ++++++-- + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/muscle-tab.c b/src/muscle-tab.c +index b610d0b8..3e7657ca 100644 +--- a/src/muscle-tab.c ++++ b/src/muscle-tab.c +@@ -204,8 +204,10 @@ static void + muscle_syncline_grow (char const *key, location loc) + { + obstack_printf (&muscle_obstack, "]b4_syncline(%d, ", loc.start.line); ++ char *f = map_file_name (loc.start.file); + obstack_quote (&muscle_obstack, +- quotearg_style (c_quoting_style, loc.start.file)); ++ quotearg_style (c_quoting_style, f)); ++ free (f); + obstack_sgrow (&muscle_obstack, ")dnl\n["); + char const *extension = obstack_finish0 (&muscle_obstack); + muscle_grow (key, extension, "", ""); +diff --git a/src/output.c b/src/output.c +index 391d8e65..34dbc671 100644 +--- a/src/output.c ++++ b/src/output.c +@@ -531,7 +531,9 @@ user_actions_output (FILE *out) + { + fprintf (out, "b4_syncline(%d, ", + rules[r].action_loc.start.line); +- string_output (out, rules[r].action_loc.start.file); ++ char *f = map_file_name (rules[r].action_loc.start.file); ++ string_output (out, f); ++ free(f); + fprintf (out, ")dnl\n"); + } + fprintf (out, "[%*s%s]],\n[[", +@@ -629,8 +631,10 @@ prepare_symbol_definitions (void) + + if (p->code) + { ++ char *f = map_file_name (p->location.start.file); + SET_KEY2 (pname, "file"); +- MUSCLE_INSERT_C_STRING (key, p->location.start.file); ++ MUSCLE_INSERT_C_STRING (key, f); ++ free (f); + + SET_KEY2 (pname, "line"); + MUSCLE_INSERT_INT (key, p->location.start.line); +-- +2.30.0 + diff --git a/poky/meta/recipes-devtools/bison/bison_3.7.4.bb b/poky/meta/recipes-devtools/bison/bison_3.7.5.bb index abccaf995..c8bbea445 100644 --- a/poky/meta/recipes-devtools/bison/bison_3.7.4.bb +++ b/poky/meta/recipes-devtools/bison/bison_3.7.5.bb @@ -11,8 +11,9 @@ DEPENDS = "bison-native flex-native" SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ file://add-with-bisonlocaledir.patch \ + file://0001-Use-mapped-file-name-for-symbols.patch \ " -SRC_URI[sha256sum] = "a3b5813f48a11e540ef26f46e4d288c0c25c7907d9879ae50e430ec49f63c010" +SRC_URI[sha256sum] = "e8c53bc5bc396d636622d0f25e31ca92fd53f00b09629f13ef540d564a6b31ab" # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" diff --git a/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index 6571c1993..f6a77b460 100644 --- a/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +++ b/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb @@ -139,6 +139,9 @@ do_install () { # Use python 3 instead of python 2 sed -i -e '1s,#!.*python.*,#!${USRBINPATH}/env python3,' ${D}${bindir}/pybootchartgui + + # The timestamps embedded in compressed man pages is not reproducible + gzip -d ${D}${mandir}/man1/*.gz } PACKAGES =+ "pybootchartgui" diff --git a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.9.bb b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb index 15a958e62..fca010d4a 100644 --- a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.9.bb +++ b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb @@ -14,7 +14,7 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl" DEPENDS_append_class-target = " udev" RDEPENDS_${PN} = "libgcc" -SRCREV = "2e1fa482300449042ff6612bb51027f3f5765270" +SRCREV = "f2ffce38b9c1477a7350bfe165f0e34b9bde40f5" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.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 deleted file mode 100644 index 12d4ebc4b..000000000 --- a/poky/meta/recipes-devtools/ccache/ccache/0001-Improve-SIMD-detection-735.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 05d290165a3b61da09b715e6c8e62cebebab57cc Mon Sep 17 00:00:00 2001 -From: Erik Flodin <erik@ejohansson.se> -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 <raj.khem@gmail.com> ---- - 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 <immintrin.h> -+ 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 <immintrin.h> -+ 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 <arm_neon.h> -+ 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 deleted file mode 100644 index bdabb381a..000000000 --- a/poky/meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0448eddcf2863ebf911e7dd445bca1c7eee2a239 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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 deleted file mode 100644 index 85ce2b762..000000000 --- a/poky/meta/recipes-devtools/ccache/ccache/0002-Always-use-64bit-to-print-time_t.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fa360ca8a457dafcae1d22df2b342d3ee291e8af Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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_4.1.bb b/poky/meta/recipes-devtools/ccache/ccache_4.2.bb index 6bd46b101..9957bc7e6 100644 --- a/poky/meta/recipes-devtools/ccache/ccache_4.1.bb +++ b/poky/meta/recipes-devtools/ccache/ccache_4.2.bb @@ -7,16 +7,12 @@ HOMEPAGE = "http://ccache.samba.org" SECTION = "devel" LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=a66c581f855c1c408730fe5d171e3013" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=28afb89f649f309e7ac1aab554564637" 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" +SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[sha256sum] = "dbf139ff32031b54cb47f2d7983269f328df14b5a427882f89f7721e5c411b7e" UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" diff --git a/poky/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb b/poky/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb index c08da6cdc..cd2ca8dbe 100644 --- a/poky/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb +++ b/poky/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb @@ -3,6 +3,7 @@ # Released under the MIT license (see packages/COPYING) SUMMARY = "A set of tools for CD recording, including cdrecord" HOMEPAGE = "http://sourceforge.net/projects/cdrtools/" +DESCRIPTION = "cdrecord tool is Highly portable CD/DVD/BluRay command line recording software." SECTION = "console/utils" LICENSE = "GPLv2 & CDDL-1.0 & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=32f68170be424c2cd64804337726b312" diff --git a/poky/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb b/poky/meta/recipes-devtools/cmake/cmake-native_3.19.5.bb index d91e42ef9..d91e42ef9 100644 --- a/poky/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb +++ b/poky/meta/recipes-devtools/cmake/cmake-native_3.19.5.bb diff --git a/poky/meta/recipes-devtools/cmake/cmake.inc b/poky/meta/recipes-devtools/cmake/cmake.inc index db03819b6..e0f59a6c6 100644 --- a/poky/meta/recipes-devtools/cmake/cmake.inc +++ b/poky/meta/recipes-devtools/cmake/cmake.inc @@ -20,10 +20,9 @@ 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] = "e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0" +SRC_URI[sha256sum] = "c432296eb5dec6d71eae15d140f6297d63df44e9ffe3e453628d1dc8fc4201ce" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 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 deleted file mode 100644 index 4483bbce1..000000000 --- a/poky/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ca105727dc4862733c3aad09e9de819be63a7b6b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -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 <alex.kanavin@gmail.com> ---- - 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_3.19.2.bb b/poky/meta/recipes-devtools/cmake/cmake_3.19.5.bb index 64c92b89f..64c92b89f 100644 --- a/poky/meta/recipes-devtools/cmake/cmake_3.19.2.bb +++ b/poky/meta/recipes-devtools/cmake/cmake_3.19.5.bb diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index c0f07fe2c..d675af4f8 100644 --- a/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -1,4 +1,4 @@ -From 4644d18157296257284bedd857f4610f1037d50e Mon Sep 17 00:00:00 2001 +From 218a4760945be7a404df6515ffbc769c92791f9b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 30 Dec 2016 18:31:02 +0200 Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python @@ -11,11 +11,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 3d873f7..e977b2f 100644 +index 855127f..dff1d97 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt -@@ -21,7 +21,7 @@ if (NOT SKBUILD) - endif () +@@ -14,7 +14,7 @@ if (NOT SKBUILD) + FIND_PACKAGE(PythonInterp 3 EXACT REQUIRED) endif (NOT SKBUILD) -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.16.2.bb b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb index 2b552a4cd..e0433806b 100644 --- a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.16.2.bb +++ b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "031f0524905c2a64a2faae555ca9d91281448d1b" +SRCREV = "909a0636665ed96f97babc3b887f9badc88875c3" S = "${WORKDIR}/git" @@ -24,11 +24,17 @@ BBCLASSEXTEND = "native nativesdk" # Direct createrepo to read rpm configuration from our sysroot, not the one it was compiled in do_install_append_class-native() { create_wrapper ${D}/${bindir}/createrepo_c \ - RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm + RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ + MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc + create_wrapper ${D}/${bindir}/modifyrepo_c \ + MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc } do_install_append_class-nativesdk() { create_wrapper ${D}/${bindir}/createrepo_c \ - RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm + RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ + MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc + create_wrapper ${D}/${bindir}/modifyrepo_c \ + MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc rm -rf ${D}/etc } diff --git a/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb b/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb index 10220ebc9..0a007bb2c 100644 --- a/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb +++ b/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb @@ -1,6 +1,7 @@ SUMMARY = "GNU unit testing framework, written in Expect and Tcl" DESCRIPTION = "DejaGnu is a framework for testing other programs. Its purpose \ is to provide a single front end for all tests." +HOMEPAGE = "https://www.gnu.org/software/dejagnu/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "devel" diff --git a/poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.26.bb b/poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.26.bb index 90c265aed..3487666b9 100644 --- a/poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.26.bb +++ b/poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.26.bb @@ -1,6 +1,7 @@ -SECTION = "console/utils" SUMMARY = "Command line utilities for working with *.desktop files" +DESCRIPTION = "desktop-file-utils contains a few command line utilities for working with desktop entries" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/desktop-file-utils" +SECTION = "console/utils" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ diff --git a/poky/meta/recipes-devtools/devel-config/distcc-config.bb b/poky/meta/recipes-devtools/devel-config/distcc-config.bb index 3cd661d54..db9e8bbcc 100644 --- a/poky/meta/recipes-devtools/devel-config/distcc-config.bb +++ b/poky/meta/recipes-devtools/devel-config/distcc-config.bb @@ -1,4 +1,5 @@ SUMMARY = "Sets up distcc for compilation on the target device" +DESCRIPTION = "${SUMMARY}" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" diff --git a/poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb b/poky/meta/recipes-devtools/diffstat/diffstat_1.64.bb index 863f924b2..76ca30c20 100644 --- a/poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb +++ b/poky/meta/recipes-devtools/diffstat/diffstat_1.64.bb @@ -5,7 +5,7 @@ reviewing large, complex patch files." HOMEPAGE = "http://invisible-island.net/diffstat/" SECTION = "devel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=a3d0bb117493e804b0c1a868ddf23321" +LIC_FILES_CHKSUM = "file://COPYING;md5=f605b1986cc3b808ec0e4fa9d0e0f2d9" SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://run-ptest \ @@ -13,8 +13,7 @@ SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://0001-aclocal.m4-add-missing-header-defines.patch \ " -SRC_URI[md5sum] = "b9272ec8af6257103261ec3622692991" -SRC_URI[sha256sum] = "7eddd53401b99b90bac3f7ebf23dd583d7d99c6106e67a4f1161b7a20110dc6f" +SRC_URI[sha256sum] = "b8aee38d9d2e1d05926e6b55810a9d2c2dd407f24d6a267387563a4436e3f7fc" inherit autotools gettext ptest diff --git a/poky/meta/recipes-devtools/distcc/distcc_3.3.3.bb b/poky/meta/recipes-devtools/distcc/distcc_3.3.5.bb index d92b9c304..5c2644199 100644 --- a/poky/meta/recipes-devtools/distcc/distcc_3.3.3.bb +++ b/poky/meta/recipes-devtools/distcc/distcc_3.3.5.bb @@ -1,6 +1,7 @@ SUMMARY = "A parallel build system" DESCRIPTION = "distcc is a parallel build system that distributes \ compilation of C/C++/ObjC code across machines on a network." +HOMEPAGE = "https://github.com/distcc/distcc" SECTION = "devel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" @@ -15,14 +16,13 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" RRECOMMENDS_${PN}-server = "avahi-daemon" SRC_URI = "git://github.com/distcc/distcc.git \ - file://fix-gnome.patch \ - file://separatebuilddir.patch \ - file://0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch \ file://default \ file://distcc \ - file://distcc.service" -SRCREV = "4cde9bcfbda589abd842e3bbc652ce369085eaae" + file://distcc.service \ + " +SRCREV = "8572e2a1af39e69b2a2d74622fed6d2dd7dca9b7" S = "${WORKDIR}/git" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" inherit autotools pkgconfig update-rc.d useradd systemd diff --git a/poky/meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch b/poky/meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch deleted file mode 100644 index 86c07c11f..000000000 --- a/poky/meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 98530865795300008fe06bb647a6fc2dddfc7967 Mon Sep 17 00:00:00 2001 -From: Romain Geissler <romain.geissler@amadeus.com> -Date: Mon, 27 Jan 2020 09:28:43 +0000 -Subject: [PATCH] Fix build with gcc 10 which defaults to -fno-common (cf - https://gcc.gnu.org/gcc-10/porting_to.html) - -This fixes the following link error I see when I use the latest gcc 10 -git branch: -/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/serve.o:(.bss+0x0): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here -/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/stats.o:(.data+0x20): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here -collect2: error: ld returned 1 exit status - -Upstream-Status: Backport [https://github.com/distcc/distcc/pull/373] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/stats.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/stats.h b/src/stats.h -index 9bde285..74d4690 100644 ---- a/src/stats.h -+++ b/src/stats.h -@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, STATS_REJ_OVERLOAD, - STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT, - STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX }; - --const char *stats_text[20]; -+extern const char *stats_text[20]; - - int dcc_stats_init(void); - void dcc_stats_init_kid(void); --- -2.28.0 - diff --git a/poky/meta/recipes-devtools/distcc/files/fix-gnome.patch b/poky/meta/recipes-devtools/distcc/files/fix-gnome.patch deleted file mode 100644 index f1f5ed1a9..000000000 --- a/poky/meta/recipes-devtools/distcc/files/fix-gnome.patch +++ /dev/null @@ -1,122 +0,0 @@ -Upstream-Status: Backport [https://github.com/distcc/distcc/pull/319] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 2faacc2be8d7eeee0a3f66d88fedd1d3ab11070e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 8 Dec 2018 12:50:07 +0100 -Subject: [PATCH] Fix desktop spec compliance of distccmon-gnome install - -Update the .desktop file and install rules for distccmon-gnome to -conform to the freedesktop.org specifications. More specifically: - -- update to version 1.0 of the spec -- remove obsolete 'Encoding' key -- remove obsolete 'Application' category and add recommended 'GTK' -- install icon file to the correct directory -- strip suffix from desktop file (specifying it is deprecated) -- while at it, remove redundant '-icon' from the filename -- install desktop file to the correct directory ---- - Makefile.in | 18 ++++++++++-------- - gnome/distccmon-gnome.desktop | 7 +++---- - ...mon-gnome-icon.png => distccmon-gnome.png} | Bin - src/mon-gnome.c | 2 +- - 4 files changed, 14 insertions(+), 13 deletions(-) - rename gnome/{distccmon-gnome-icon.png => distccmon-gnome.png} (100%) - -diff --git a/Makefile.in b/Makefile.in -index 6e1e467..1106559 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -52,13 +52,14 @@ mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - docdir = @docdir@ --pkgdatadir = $(datadir)/@PACKAGE_NAME@ -+icondir = $(datarootdir)/pixmaps -+desktopdir = $(datarootdir)/applications - - include_server_builddir = $(builddir)/_include_server - - # These must be done from here, not from autoconf, because they can - # contain variable expansions written in Make syntax. Ew. --DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" -+DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" - - # arguments to pkgconfig - GNOME_PACKAGES = @GNOME_PACKAGES@ -@@ -387,7 +388,7 @@ man_HTML = man/distcc_1.html man/distccd_1.html man/distccmon_text_1.html \ - man/lsdistcc_1.html man/pump_1.html man/include_server_1.html - MEN = $(man1_MEN) - --gnome_data = gnome/distccmon-gnome-icon.png \ -+gnome_data = gnome/distccmon-gnome.png \ - gnome/distccmon-gnome.desktop - - popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ -@@ -1033,7 +1034,8 @@ showpaths: - @echo " programs $(DESTDIR)$(bindir)" - @echo " sbin programs $(DESTDIR)$(sbindir)" - @echo " system configuration $(DESTDIR)$(sysconfdir)" -- @echo " shared data files $(DESTDIR)$(pkgdatadir)" -+ @echo " icon file $(DESTDIR)$(icondir)" -+ @echo " application file $(DESTDIR)$(desktopdir)" - - - # install-sh can't handle multiple arguments, but we don't need any -@@ -1129,10 +1131,10 @@ install-example: $(example_DOCS) - done - - install-gnome-data: $(gnome_data) -- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" -- for p in $(gnome_data); do \ -- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ -- done -+ $(mkinstalldirs) "$(DESTDIR)$(icondir)" -+ $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" -+ $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" -+ $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" - - install-conf: $(conf_files) $(default_files) - $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" -diff --git a/gnome/distccmon-gnome.desktop b/gnome/distccmon-gnome.desktop -index bd1fa26..7205f5e 100644 ---- a/gnome/distccmon-gnome.desktop -+++ b/gnome/distccmon-gnome.desktop -@@ -1,6 +1,5 @@ - [Desktop Entry] --Version=0.9.4 --Encoding=UTF-8 -+Version=1.0 - Exec=distccmon-gnome - Name=distcc monitor - Name[sv]=distcc övervakare -@@ -8,9 +7,9 @@ GenericName=Distributed Compile Monitor - GenericName[sv]=Distribuerad kompilerings-övervakare - Comment=Graphical view of distributed compile tasks - Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter --Icon=distccmon-gnome-icon.png -+Icon=distccmon-gnome - TryExec=distccmon-gnome - Terminal=false - Type=Application --Categories=GNOME;Application;Development; -+Categories=GNOME;GTK;Development; - StartupNotify=true -diff --git a/gnome/distccmon-gnome-icon.png b/gnome/distccmon-gnome.png -similarity index 100% -rename from gnome/distccmon-gnome-icon.png -rename to gnome/distccmon-gnome.png -diff --git a/src/mon-gnome.c b/src/mon-gnome.c -index 24681d0..bfc286d 100644 ---- a/src/mon-gnome.c -+++ b/src/mon-gnome.c -@@ -599,7 +599,7 @@ static GtkWidget * dcc_gnome_make_mainwin (void) - - #if GTK_CHECK_VERSION(2,2,0) - gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), -- PKGDATADIR "/distccmon-gnome-icon.png", -+ ICONDIR "/distccmon-gnome.png", - NULL); - #endif - diff --git a/poky/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/poky/meta/recipes-devtools/distcc/files/separatebuilddir.patch deleted file mode 100644 index c8da9d51c..000000000 --- a/poky/meta/recipes-devtools/distcc/files/separatebuilddir.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Backport [https://github.com/distcc/distcc/pull/363] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 469628ee8dc90c7162d1a850c0b179b7349f9cf3 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Tue, 17 Sep 2019 13:04:22 +0100 -Subject: [PATCH] Makefile.in: fix out-of-tree builds when the GNOME UI is - enabled - -The install command doesn't use $(srcdir) so out-of-tree builds fail. - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 123054f..b9ce974 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1130,8 +1130,8 @@ install-example: $(example_DOCS) - install-gnome-data: $(gnome_data) - $(mkinstalldirs) "$(DESTDIR)$(icondir)" - $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" -- $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" -- $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" -+ $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" -+ $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" - - install-conf: $(conf_files) $(default_files) - $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" --- -2.20.1 diff --git a/poky/meta/recipes-devtools/dmidecode/dmidecode_3.3.bb b/poky/meta/recipes-devtools/dmidecode/dmidecode_3.3.bb index 3fc2b20f2..2fe742b7d 100644 --- a/poky/meta/recipes-devtools/dmidecode/dmidecode_3.3.bb +++ b/poky/meta/recipes-devtools/dmidecode/dmidecode_3.3.bb @@ -1,5 +1,6 @@ SUMMARY = "DMI (Desktop Management Interface) table related utilities" HOMEPAGE = "http://www.nongnu.org/dmidecode/" +DESCRIPTION = "Dmidecode reports information about your system's hardware as described in your system BIOS according to the SMBIOS/DMI standard (see a sample output)." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/poky/meta/recipes-devtools/dnf/dnf_4.5.2.bb b/poky/meta/recipes-devtools/dnf/dnf_4.5.2.bb index e1b0e1a13..c746dc30d 100644 --- a/poky/meta/recipes-devtools/dnf/dnf_4.5.2.bb +++ b/poky/meta/recipes-devtools/dnf/dnf_4.5.2.bb @@ -2,6 +2,7 @@ SUMMARY = "Package manager forked from Yum, using libsolv as a dependency resolv 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." +HOMEPAGE = "https://github.com/rpm-software-management/dnf" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://PACKAGE-LICENSING;md5=4a0548e303dbc77f067335b4d688e745 \ diff --git a/poky/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb b/poky/meta/recipes-devtools/dosfstools/dosfstools_4.2.bb index 4bd4aef09..7476c043c 100644 --- a/poky/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb +++ b/poky/meta/recipes-devtools/dosfstools/dosfstools_4.2.bb @@ -9,24 +9,20 @@ SECTION = "base" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${BP}.tar.xz \ +SRC_URI = "https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${BP}.tar.gz \ " -SRC_URI[md5sum] = "07a1050db1a898e9a2e03b0c4569c4bd" -SRC_URI[sha256sum] = "e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173" +SRC_URI[sha256sum] = "64926eebf90092dca21b14259a5301b7b98e7b1943e8a201c7d726084809b527" UPSTREAM_CHECK_URI = "https://github.com/dosfstools/dosfstools/releases" -inherit autotools pkgconfig update-alternatives +inherit autotools gettext pkgconfig update-alternatives -EXTRA_OECONF = "--without-udev --enable-compat-symlinks" +EXTRA_OECONF = "--enable-compat-symlinks --without-iconv" CFLAGS += "-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" BBCLASSEXTEND = "native nativesdk" -# Add codepage437 to avoid error from `dosfsck -l` -RRECOMMENDS_${PN}_append_libc-glibc = " glibc-gconv-ibm437" - ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "mkfs.vfat" ALTERNATIVE_LINK_NAME[mkfs.vfat] = "${sbindir}/mkfs.vfat" diff --git a/poky/meta/recipes-devtools/dpkg/dpkg.inc b/poky/meta/recipes-devtools/dpkg/dpkg.inc index 04fe85c4a..7acfb4161 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg.inc +++ b/poky/meta/recipes-devtools/dpkg/dpkg.inc @@ -1,5 +1,7 @@ SUMMARY = "Package maintenance system from Debian" LICENSE = "GPLv2.0+" +HOMEPAGE = "https://salsa.debian.org/dpkg-team/dpkg" +DESCRIPTION = "The primary interface for the dpkg suite is the dselect program. A more low-level and less user-friendly interface is available in the form of the dpkg command." SECTION = "base" DEPENDS = "zlib bzip2 perl ncurses" @@ -26,6 +28,7 @@ EXTRA_OECONF = "\ " EXTRA_OECONF_append_class-target = " --disable-update-alternatives DEB_HOST_ARCH=${DPKG_ARCH}" +EXTRA_OECONF_append_class-nativesdk = " --disable-update-alternatives DEB_HOST_ARCH=${DPKG_ARCH}" PACKAGECONFIG = "liblzma" PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz" @@ -46,14 +49,15 @@ do_install_append () { if [ "${PN}" = "dpkg-native" ]; then # update-alternatives doesn't have an offline mode rm ${D}${bindir}/update-alternatives - sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-* + sed -i -e 's|^#!.*${STAGING_BINDIR_NATIVE}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-* else - sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-* + sed -i -e 's|^#!.*${STAGING_BINDIR_NATIVE}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-* fi } PROV = "virtual/update-alternatives" PROV_class-native = "" +PROV_class-nativesdk = "" PROVIDES += "${PROV}" @@ -93,7 +97,8 @@ ALTERNATIVE_${PN}-start-stop = "start-stop-daemon" ALTERNATIVE_LINK_NAME[start-stop-daemon] = "${sbindir}/start-stop-daemon" ALTERNATIVE_PRIORITY = "100" -RDEPENDS_${PN} += "${PN}-start-stop" +EXTRA_RDPENDS = "ldconfig" +EXTRA_RDPENDS_libc-musl = "" +RDEPENDS_${PN} += "${PN}-start-stop ${EXTRA_RDPENDS}" - -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch index ffe520c51..2dc68e206 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch +++ b/poky/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch @@ -1,4 +1,4 @@ -From 15b081cc8bead80c493ab83369ecb3345a24a3dc Mon Sep 17 00:00:00 2001 +From d6f5fed6bc56e1f3b885a796a43aa2868ace57bc Mon Sep 17 00:00:00 2001 From: Paul Eggleton <paul.eggleton@linux.microsoft.com> Date: Tue, 16 Jun 2020 03:57:25 +0000 Subject: [PATCH] build.c: ignore return of 1 from tar -cf @@ -29,10 +29,10 @@ Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c -index 8436839cd..6b44a36f7 100644 +index d13a21c1e..059f2be6d 100644 --- a/dpkg-deb/build.c +++ b/dpkg-deb/build.c -@@ -434,6 +434,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, +@@ -480,6 +480,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, { int pipe_filenames[2], pipe_tarball[2]; pid_t pid_tar, pid_comp; @@ -40,7 +40,7 @@ index 8436839cd..6b44a36f7 100644 /* Fork off a tar. We will feed it a list of filenames on stdin later. */ m_pipe(pipe_filenames); -@@ -486,7 +487,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, +@@ -532,7 +533,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, /* All done, clean up wait for tar and <compress> to finish their job. */ close(pipe_filenames[1]); subproc_reap(pid_comp, _("<compress> from tar -cf"), 0); @@ -50,4 +50,4 @@ index 8436839cd..6b44a36f7 100644 + ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc); } - static time_t + static intmax_t diff --git a/poky/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch new file mode 100644 index 000000000..292b72ab5 --- /dev/null +++ b/poky/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch @@ -0,0 +1,23 @@ +From 0decc62904571582147f2273fa1b521e00485dda Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 3 Feb 2021 20:47:58 +0100 +Subject: [PATCH] scripts/dpkg-fsys-usrunmess.pl: correct shebang + +Otherwise automake will write the full native perl path into it. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + scripts/dpkg-fsys-usrunmess.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/dpkg-fsys-usrunmess.pl b/scripts/dpkg-fsys-usrunmess.pl +index 9220df3c0..9ce368955 100755 +--- a/scripts/dpkg-fsys-usrunmess.pl ++++ b/scripts/dpkg-fsys-usrunmess.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + # + # dpkg-fsys-usrunmess - Undoes the merged-/usr-via-aliased-dirs mess + # diff --git a/poky/meta/recipes-devtools/dpkg/dpkg_1.20.5.bb b/poky/meta/recipes-devtools/dpkg/dpkg_1.20.7.1.bb index d97b69c0b..55ac84f72 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg_1.20.5.bb +++ b/poky/meta/recipes-devtools/dpkg/dpkg_1.20.7.1.bb @@ -1,7 +1,7 @@ require dpkg.inc LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https \ +SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=sid \ file://noman.patch \ file://remove-tar-no-timestamp.patch \ file://arch_pm.patch \ @@ -14,10 +14,11 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https \ file://0001-dpkg-Support-muslx32-build.patch \ file://pager.patch \ file://0001-Add-support-for-riscv32-CPU.patch \ + file://0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch \ " SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" -SRCREV = "823a67d67538b1b403a32d1fef40e6e228265566" +SRCREV = "667bf0aeb92e0e7bb225ee273569c5e2389083bd" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb b/poky/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb index 2c843a934..56b52d6a4 100644 --- a/poky/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb +++ b/poky/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb @@ -1,4 +1,5 @@ SUMMARY = "A small utility for printing debug source file locations embedded in binaries" +DESCRIPTION = "${SUMMARY}" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://../dwarfsrcfiles.c;md5=31483894e453a77acbb67847565f1b5c;beginline=1;endline=8" diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc index 009f5ed80..2f113c5e8 100644 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +++ b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \ file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \ file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6" SECTION = "base" -DEPENDS = "util-linux attr" +DEPENDS = "util-linux attr autoconf-archive" SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch deleted file mode 100644 index 2719594c2..000000000 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f907fea9ea053d5433b5199ce74008664141f753 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 19 Nov 2019 17:32:33 +0100 -Subject: [PATCH] configure.ac: correct AM_GNU_GETTEXT - -New version of gettext require the 'external' argument. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 654ff43d..4772b97b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -873,7 +873,7 @@ AC_SUBST(GETTEXT_PACKAGE) - AC_SUBST(PACKAGE) - AC_SUBST(VERSION) - --AM_GNU_GETTEXT -+AM_GNU_GETTEXT([external]) - dnl @MKDIR_P@ is expanded in AM_GNU_GETTEXT - AC_SUBST([mkdir_p],['$(MKDIR_P)']) - dnl diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-fix-up-check-for-hardlinks-always-false-if-inode-0xF.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-fix-up-check-for-hardlinks-always-false-if-inode-0xF.patch deleted file mode 100644 index 0e8cbad25..000000000 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-fix-up-check-for-hardlinks-always-false-if-inode-0xF.patch +++ /dev/null @@ -1,55 +0,0 @@ -From dcb36fd007ddb32d8c5cfcf5e9ddb3d713d65396 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 21 Jul 2020 09:43:03 +0800 -Subject: [PATCH] fix up check for hardlinks always false if inode > 0xFFFFFFFF - -Since commit [382ed4a1 e2fsck: use proper types for variables][1] -applied, it used ext2_ino_t instead of ino_t for referencing inode -numbers, but the type of is_hardlink's `ino' should not be instead, -The ext2_ino_t is 32bit, if inode > 0xFFFFFFFF, its value will be -truncated. - -Add a debug printf to show the value of inode, when it check for hardlink -files, it will always return false if inode > 0xFFFFFFFF -|--- a/misc/create_inode.c -|+++ b/misc/create_inode.c -|@@ -605,6 +605,7 @@ static int is_hardlink(struct hdlinks_s *hdlinks, dev_t dev, ext2_ino_t ino) -| { -| int i; -| -|+ printf("%s %d, %lX, %lX\n", __FUNCTION__, __LINE__, hdlinks->hdl[i].src_ino, ino); -| for (i = 0; i < hdlinks->count; i++) { -| if (hdlinks->hdl[i].src_dev == dev && -| hdlinks->hdl[i].src_ino == ino) - -Here is debug message: -is_hardlink 608, 2913DB886, 913DB886 - -The length of ext2_ino_t is 32bit (typedef __u32 __bitwise ext2_ino_t;), -and ino_t is 64bit on 64bit system (such as x86-64), recover `ino' to ino_t. - -[1] https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=382ed4a1c2b60acb9db7631e86dda207bde6076e - -Upstream-Status: Submitted [https://github.com/tytso/e2fsprogs/pull/48] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - misc/create_inode.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/misc/create_inode.c b/misc/create_inode.c -index e8d1df6b..837f3875 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -601,7 +601,7 @@ out: - return err; - } - --static int is_hardlink(struct hdlinks_s *hdlinks, dev_t dev, ext2_ino_t ino) -+static int is_hardlink(struct hdlinks_s *hdlinks, dev_t dev, ino_t ino) - { - int i; - --- -2.18.2 - diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch deleted file mode 100644 index 31b585fc9..000000000 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d034239f05cfba849f6ad16eb3f1ea37efbe4f95 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 19 Nov 2019 18:34:00 +0100 -Subject: [PATCH] intl: do not try to use gettext defines that no longer exist - -Newer version of gettext no longer define this in m4 files, -so patch it out until e2fsprogs upstream sorts the situation. - -Upstream-Status: Inappropriate [hardcodes a choice] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - intl/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/intl/Makefile.in b/intl/Makefile.in -index e037e23c..89a876b8 100644 ---- a/intl/Makefile.in -+++ b/intl/Makefile.in -@@ -175,7 +175,7 @@ libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc - DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \ - COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h - --all: all-@USE_INCLUDED_LIBINTL@ -+all: - all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed - all-no: all-no-@BUILD_INCLUDED_LIBINTL@ - all-no-yes: libgnuintl.$la diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch index 284ac9019..d7c07c3b0 100644 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch +++ b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch @@ -1,4 +1,4 @@ -From b55dfb4b62e507ae4f0814aec7597b56f9d6292a Mon Sep 17 00:00:00 2001 +From 9263b8764702f2b26ddaaf80808ebab31a1dba3b Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Wed, 10 Aug 2016 11:19:44 +0800 Subject: [PATCH] Fix missing check for permission denied. diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch index b0fa4b8cc..f6916a111 100644 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch +++ b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch @@ -1,18 +1,27 @@ -e2fsprogs: expand @mkdir_p@ +From e3a30baa5c1e2f0ac7e246539db1c7db5a2fe302 Mon Sep 17 00:00:00 2001 +From: Joe Slater <jslater@windriver.com> +Date: Tue, 7 Mar 2017 14:53:19 -0800 +Subject: [PATCH] e2fsprogs: expand @mkdir_p@ Add AC_SUBST to configure.ac. @mkdir_p@ is currently -not expanded so no locale data is written into usr/share/locale. +not expanded so no locale data is written into usr/share/locale. Upstream-Status: Pending Signed-off-by: Joe Slater <jslater@windriver.com> +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 4c4b5523..3475c707 100644 --- a/configure.ac +++ b/configure.ac -@@ -811,6 +811,8 @@ AC_SUBST(PACKAGE) +@@ -919,6 +919,8 @@ AC_SUBST(PACKAGE) AC_SUBST(VERSION) - AM_GNU_GETTEXT + AM_GNU_GETTEXT([external]) +dnl @MKDIR_P@ is expanded in AM_GNU_GETTEXT +AC_SUBST([mkdir_p],['$(MKDIR_P)']) dnl diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch index aac88eed9..88d0ae77c 100644 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch +++ b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch @@ -1,4 +1,4 @@ -From 9aa68ad81b97847dda3493145f4b0a7cc580c551 Mon Sep 17 00:00:00 2001 +From 6e4c1644a3a8cacf7c1f5953cc378589bb046d5a Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Mon, 23 Dec 2013 13:38:34 +0000 Subject: [PATCH] e2fsprogs: silence debugfs @@ -14,10 +14,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c -index 15b01214..15164df2 100644 +index 132c5f9d..98063727 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c -@@ -2492,7 +2492,7 @@ static int source_file(const char *cmd_file, int ss_idx) +@@ -2510,7 +2510,7 @@ static int source_file(const char *cmd_file, int ss_idx) cp = strchr(buf, '\r'); if (cp) *cp = 0; diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.1.bb index e6a4bd1f8..be8b67c35 100644 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb +++ b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.1.bb @@ -4,16 +4,14 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ - file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ - file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \ - file://0001-fix-up-check-for-hardlinks-always-false-if-inode-0xF.patch \ " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ file://quiet-debugfs.patch \ " -SRCREV = "506d96fe640f76ab04276e0a7c578aa108ce19f8" + +SRCREV = "3114c623f56b0d61f5f34b85f7b23d28f6c848c0" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ diff --git a/poky/meta/recipes-devtools/elfutils/elfutils_0.182.bb b/poky/meta/recipes-devtools/elfutils/elfutils_0.183.bb index f63208d72..16ed7c9dd 100644 --- a/poky/meta/recipes-devtools/elfutils/elfutils_0.182.bb +++ b/poky/meta/recipes-devtools/elfutils/elfutils_0.183.bb @@ -1,8 +1,11 @@ SUMMARY = "Utilities and libraries for handling compiled object files" HOMEPAGE = "https://sourceware.org/elfutils" +DESCRIPTION = "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux." SECTION = "base" -LICENSE = "GPLv2 & LGPLv3+ & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +LICENSE = "GPLv2 & GPLv2+ & LGPLv3+ & GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://debuginfod/debuginfod-client.c;endline=27;md5=f8e9d171c401c493ec45a0b2992ea2ed \ + " DEPENDS = "zlib virtual/libintl" DEPENDS_append_libc-musl = " argp-standalone fts musl-obstack " # The Debian patches below are from: @@ -16,23 +19,22 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0001-libasm-may-link-with-libbz2-if-found.patch \ file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ file://0001-skip-the-test-when-gcc-not-deployed.patch \ - file://0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch \ file://run-ptest \ file://ptest.patch \ file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ + file://0001-add-support-for-ipkg-to-debuginfod.cxx.patch \ " SRC_URI_append_libc-musl = " \ - file://0001-musl-obstack-fts.patch \ file://0002-musl-libs.patch \ file://0003-musl-utils.patch \ file://0004-Fix-error-on-musl.patch \ file://0015-config-eu.am-do-not-use-Werror.patch \ " -SRC_URI[sha256sum] = "ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858" +SRC_URI[sha256sum] = "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5" inherit autotools gettext ptest pkgconfig -EXTRA_OECONF = "--program-prefix=eu- --disable-debuginfod" +EXTRA_OECONF = "--program-prefix=eu-" DEPENDS_BZIP2 = "bzip2-replacement-native" DEPENDS_BZIP2_class-target = "bzip2" @@ -41,6 +43,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[bzip2] = "--with-bzlib,--without-bzlib,${DEPENDS_BZIP2}" PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz" PACKAGECONFIG[libdebuginfod] = "--enable-libdebuginfod,--disable-libdebuginfod,curl" +PACKAGECONFIG[debuginfod] = "--enable-debuginfod,--disable-debuginfod,libarchive sqlite3 libmicrohttpd" RDEPENDS_${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils" @@ -63,6 +66,8 @@ do_install_ptest() { install -d -m 755 ${D}${PTEST_PATH}/libdwfl install -d -m 755 ${D}${PTEST_PATH}/libdwelf install -d -m 755 ${D}${PTEST_PATH}/libasm + install -d -m 755 ${D}${PTEST_PATH}/libcpu + install -d -m 755 ${D}${PTEST_PATH}/libebl for test_file in ${TEST_FILES}; do if [ -f ${B}/src/${test_file} ]; then cp -r ${B}/src/${test_file} ${D}${PTEST_PATH}/src @@ -71,6 +76,8 @@ do_install_ptest() { cp ${D}${libdir}/libelf-${PV}.so ${D}${PTEST_PATH}/libelf/libelf.so cp ${D}${libdir}/libdw-${PV}.so ${D}${PTEST_PATH}/libdw/libdw.so cp ${D}${libdir}/libasm-${PV}.so ${D}${PTEST_PATH}/libasm/libasm.so + cp ${B}/libcpu/libcpu.a ${D}${PTEST_PATH}/libcpu/ + cp ${B}/libebl/libebl.a ${D}${PTEST_PATH}/libebl/ cp ${S}/libelf/*.h ${D}${PTEST_PATH}/libelf/ cp ${S}/libdw/*.h ${D}${PTEST_PATH}/libdw/ cp ${S}/libdwfl/*.h ${D}${PTEST_PATH}/libdwfl/ @@ -91,7 +98,7 @@ EXTRA_OEMAKE_class-nativesdk = "" BBCLASSEXTEND = "native nativesdk" # Package utilities separately -PACKAGES =+ "${PN}-binutils libelf libasm libdw" +PACKAGES =+ "${PN}-binutils libelf libasm libdw libdebuginfod" # shared libraries are licensed GPLv2 or GPLv3+, binaries GPLv3+ # according to NEWS file: @@ -103,6 +110,7 @@ LICENSE_${PN} = "GPLv3+" LICENSE_libelf = "GPLv2 | LGPLv3+" LICENSE_libasm = "GPLv2 | LGPLv3+" LICENSE_libdw = "GPLv2 | LGPLv3+" +LICENSE_libdebuginfod = "GPLv2+ | LGPLv3+" FILES_${PN}-binutils = "\ ${bindir}/eu-addr2line \ @@ -115,6 +123,7 @@ FILES_${PN}-binutils = "\ FILES_libelf = "${libdir}/libelf-${PV}.so ${libdir}/libelf.so.*" FILES_libasm = "${libdir}/libasm-${PV}.so ${libdir}/libasm.so.*" FILES_libdw = "${libdir}/libdw-${PV}.so ${libdir}/libdw.so.* ${libdir}/elfutils/lib*" +FILES_libdebuginfod = "${libdir}/libdebuginfod-${PV}.so ${libdir}/libdebuginfod.so.*" # Some packages have the version preceeding the .so instead properly # versioned .so.<version>, so we need to reorder and repackage. #FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so" diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch b/poky/meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch new file mode 100644 index 000000000..5f82afef0 --- /dev/null +++ b/poky/meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch @@ -0,0 +1,33 @@ +From 571416bf5b5ef319df6d9c79e46680920487e4a7 Mon Sep 17 00:00:00 2001 +From: dorindabassey <dorindabassey@gmail.com> +Date: Sat, 19 Dec 2020 01:11:46 +0100 +Subject: [PATCH] add support for ipkg to debuginfod.cxx + +added support for ipkg to the debuginfod scanner. 0.182 only supports RPM and scan .debs, with this patch, debuginfod scanner would be able to scan .ipk + +Upstream-status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2020q4/003357.html] + +Signed-off-by: dorindabassey <dorindabassey@gmail.com> + +--- + debuginfod/debuginfod.cxx | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx +index b34eacc..a8915f2 100644 +--- a/debuginfod/debuginfod.cxx ++++ b/debuginfod/debuginfod.cxx +@@ -484,11 +484,13 @@ parse_opt (int key, char *arg, + { + scan_archives[".deb"]="dpkg-deb --fsys-tarfile"; + scan_archives[".ddeb"]="dpkg-deb --fsys-tarfile"; ++ scan_archives[".ipk"]="dpkg-deb --fsys-tarfile"; + } + else + { + scan_archives[".deb"]="(bsdtar -O -x -f - data.tar.xz)<"; + scan_archives[".ddeb"]="(bsdtar -O -x -f - data.tar.xz)<"; ++ scan_archives[".ipk"]="(bsdtar -O -x -f - data.tar.xz)<"; + } + // .udeb too? + break; diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch b/poky/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch index 62031073e..6acc03640 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch @@ -1,4 +1,4 @@ -From ec9a7742734aae5417c0ebbffce66ac353e6cae7 Mon Sep 17 00:00:00 2001 +From c5fb59ac0819b5b6d8244c613cbcf92cb09840c1 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 15 Aug 2017 17:10:57 +0800 Subject: [PATCH] dso link change @@ -23,7 +23,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index e462e7d..ea1215b 100644 +index 88d0ac8..c28d81f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,7 +45,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread @@ -36,10 +36,10 @@ index e462e7d..ea1215b 100644 endif libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a diff --git a/tests/Makefile.am b/tests/Makefile.am -index eab4ae6..f59a01f 100644 +index c145720..72afd0e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -516,7 +516,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread +@@ -554,7 +554,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread libelf = ../libelf/libelf.a -lz libasm = ../libasm/libasm.a else diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch b/poky/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch index 73ead6d41..09c9d3ea2 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch @@ -1,4 +1,4 @@ -From 8e5fff8b1d819e0870fb22b27950bb5f10c7a272 Mon Sep 17 00:00:00 2001 +From ed1975deeaa47f98d212fd144c8bda075b1a5d36 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 4 Oct 2017 22:30:46 -0700 Subject: [PATCH] libasm may link with libbz2 if found @@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index ea1215b..13d9bda 100644 +index c28d81f..951e978 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,11 +40,11 @@ EXTRA_DIST += make-debug-archive.in diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch b/poky/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch index b26ed99f6..c8d55d583 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch @@ -1,4 +1,4 @@ -From e571cbd0c20085ec71969971f19280b5de95cfb7 Mon Sep 17 00:00:00 2001 +From f40cbd43acdb1fefef4fa53a6034296d83cbff7d Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Thu, 16 Aug 2018 09:58:26 +0800 Subject: [PATCH] libelf/elf_end.c: check data_list.data.d.d_buf before free it diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch b/poky/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch deleted file mode 100644 index ca7caf08d..000000000 --- a/poky/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch +++ /dev/null @@ -1,124 +0,0 @@ -From dbaa05a519acfe4f6040784f5d4a28ca586c0fc4 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 23 Aug 2019 10:17:25 +0800 -Subject: [PATCH] musl-obstack-fts - -Look for libfts and libobstack during configure, these -libraries are external to libc when using musl, whereas -on glibc these libraries are provided in libc itself. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Inappropriate [workaround for musl] - -Rebase to 0.177 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - configure.ac | 54 +++++++++++++++++++++++++++++++++++++++++++++++ - libdw/Makefile.am | 2 +- - src/Makefile.am | 6 +++--- - 3 files changed, 58 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 53bab6a..dfea85e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -539,6 +539,60 @@ else - fi - AC_SUBST([argp_LDADD]) - -+dnl Check if we have fts available from our libc -+AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [#if !defined(__x86_64__) -+ #undef _FILE_OFFSET_BITS -+ #define _FILE_OFFSET_BITS 32 -+ #endif -+ #include <fts.h>], -+ [FTS* fts = 0; return fts_close(fts); return 0;] -+ )], -+ [libc_has_fts="true"], -+ [libc_has_fts="false"] -+) -+ -+dnl If our libc doesn't provide fts, then test for libfts -+if test "$libc_has_fts" = "false" ; then -+ AC_MSG_WARN("libc does not have fts") -+ AC_CHECK_LIB([fts], [fts_close], [have_fts="true"], [have_fts="false"]) -+ -+ if test "$have_fts" = "false"; then -+ AC_MSG_ERROR("no libfts found") -+ else -+ fts_LDADD="-lfts" -+ fi -+else -+ fts_LDADD="" -+fi -+AC_SUBST([fts_LDADD]) -+ -+dnl Check if we have obstack available from our libc -+AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [#include <obstack.h>], -+ [_obstack_begin(0, 0, 0, NULL, NULL); return 0;] -+ )], -+ [libc_has_obstack="true"], -+ [libc_has_obstack="false"] -+) -+ -+dnl If our libc doesn't provide obstack, then test for libobstack -+if test "$libc_has_obstack" = "false" ; then -+ AC_MSG_WARN("libc does not have obstack") -+ AC_CHECK_LIB([obstack], [_obstack_begin], [have_obstack="true"], [have_obstack="false"]) -+ -+ if test "$have_obstack" = "false"; then -+ AC_MSG_ERROR("no libobstack found") -+ else -+ obstack_LDADD="-lobstack" -+ fi -+else -+ obstack_LDADD="" -+fi -+AC_SUBST([obstack_LDADD]) -+ - dnl The directories with content. - - dnl Documentation. -diff --git a/libdw/Makefile.am b/libdw/Makefile.am -index 33b5838..ff92e02 100644 ---- a/libdw/Makefile.am -+++ b/libdw/Makefile.am -@@ -109,7 +109,7 @@ libdw_so_LIBS = ../libebl/libebl_pic.a ../backends/libebl_backends_pic.a \ - ../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \ - ../libdwfl/libdwfl_pic.a - libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so --libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) -pthread -+libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LDADD) $(zip_LIBS) -pthread - libdw_so_SOURCES = - libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS) - $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \ -diff --git a/src/Makefile.am b/src/Makefile.am -index 13d9bda..d5a4f7d 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -69,7 +69,7 @@ ar_no_Wstack_usage = yes - unstrip_no_Wstack_usage = yes - - readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) --nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) \ -+nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(obstack_LDADD) \ - $(demanglelib) - size_LDADD = $(libelf) $(libeu) $(argp_LDADD) - strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -@@ -78,9 +78,9 @@ findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) - addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib) - elfcmp_LDADD = $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD) - objdump_LDADD = $(libasm) $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD) --ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) -+ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LDADD) - strings_LDADD = $(libelf) $(libeu) $(argp_LDADD) --ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) -+ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LDADD) - unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) - stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(demanglelib) - elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch b/poky/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch deleted file mode 100644 index 3303333c4..000000000 --- a/poky/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2e2232d0935bf8ef6e66ebffba3be68a73b5b3e5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 8 Sep 2019 15:57:59 -0700 -Subject: [PATCH] ppc_initreg.c: Incliude asm/ptrace.h for pt_regs definition - -Fixes -| ../../elfutils-0.176/backends/ppc_initreg.c:79:22: error: field 'r' has incomplete type -| struct pt_regs r; -| ^ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - backends/ppc_initreg.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c -index 0e0d359..e5cca7e 100644 ---- a/backends/ppc_initreg.c -+++ b/backends/ppc_initreg.c -@@ -33,6 +33,7 @@ - #include <stdlib.h> - #if defined(__powerpc__) && defined(__linux__) - # include <sys/ptrace.h> -+# include <asm/ptrace.h> - # include <sys/user.h> - #endif - --- -2.23.0 - diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch b/poky/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch index de8c05f11..114ca63cb 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch @@ -1,7 +1,7 @@ -From e82a055f85e398cb03a4eaf5faf351a3a1f19344 Mon Sep 17 00:00:00 2001 +From 2fa52d61b1abdf4a3f3b153c771fb2081666430c Mon Sep 17 00:00:00 2001 From: Mingli Yu <Mingli.Yu@windriver.com> Date: Tue, 21 May 2019 15:20:34 +0800 -Subject: [PATCH v2] skip the test when gcc not deployed +Subject: [PATCH] skip the test when gcc not deployed Skip the tests which depend on gcc when gcc not deployed. @@ -9,6 +9,7 @@ gcc not deployed. Upstream-Status: Submitted[https://sourceware.org/ml/elfutils-devel/2019-q2/msg00091.html] Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> + --- tests/run-disasm-x86-64.sh | 2 ++ tests/run-disasm-x86.sh | 2 ++ @@ -17,7 +18,7 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> 4 files changed, 8 insertions(+) diff --git a/tests/run-disasm-x86-64.sh b/tests/run-disasm-x86-64.sh -index a6be62b..c3ef238 100755 +index 07b612b..7a32996 100755 --- a/tests/run-disasm-x86-64.sh +++ b/tests/run-disasm-x86-64.sh @@ -22,6 +22,8 @@ case "`uname -m`" in @@ -26,11 +27,11 @@ index a6be62b..c3ef238 100755 testfiles testfile45.S testfile45.expect + # skip the case if no gcc deployed + which gcc || exit 77 - gcc -m64 -c -o testfile45.o testfile45.S + ${CC} -m64 -c -o testfile45.o testfile45.S testrun_compare ${abs_top_builddir}/src/objdump -d testfile45.o < testfile45.expect ;; diff --git a/tests/run-disasm-x86.sh b/tests/run-disasm-x86.sh -index 28a3df7..544fc28 100755 +index 7ac73ad..f0d4796 100755 --- a/tests/run-disasm-x86.sh +++ b/tests/run-disasm-x86.sh @@ -22,6 +22,8 @@ case "`uname -m`" in @@ -39,11 +40,11 @@ index 28a3df7..544fc28 100755 testfiles testfile44.S testfile44.expect + # skip the case if no gcc deployed + which gcc || exit 77 - gcc -m32 -c -o testfile44.o testfile44.S + ${CC} -m32 -c -o testfile44.o testfile44.S testrun_compare ${abs_top_builddir}/src/objdump -d testfile44.o < testfile44.expect ;; diff --git a/tests/run-strip-g.sh b/tests/run-strip-g.sh -index 1303819..a943dec 100755 +index 1592121..9b8157e 100755 --- a/tests/run-strip-g.sh +++ b/tests/run-strip-g.sh @@ -24,6 +24,8 @@ @@ -53,10 +54,10 @@ index 1303819..a943dec 100755 +# skip the test if gcc deployed +which gcc || exit 77 echo Create debug a.out. - echo "int main() { return 1; }" | gcc -g -xc - + echo "int main() { return 1; }" | ${CC} -g -xc - diff --git a/tests/run-strip-nothing.sh b/tests/run-strip-nothing.sh -index 914fdfb..d03f734 100755 +index 710c200..3a81d8e 100755 --- a/tests/run-strip-nothing.sh +++ b/tests/run-strip-nothing.sh @@ -22,6 +22,8 @@ @@ -66,8 +67,5 @@ index 914fdfb..d03f734 100755 +# skip the case if no gcc deployed +which gcc || exit 77 # Create no-debug a.out. - echo "int main() { return 1; }" | gcc -s -xc - + echo "int main() { return 1; }" | ${CC} -s -xc - --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch b/poky/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch index d7b382fd9..c494d7f2e 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch @@ -1,4 +1,4 @@ -From fa265ff686cb60e19aa607bda3752b6b2ee87a14 Mon Sep 17 00:00:00 2001 +From 22e0e1c01ec680a2970f4d5ca9e47f90259cbdcf Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 23 Jun 2020 07:49:35 +0000 Subject: [PATCH] tests/Makefile.am: compile test_nlist with standard CFLAGS @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 05fc9b4..11de0fc 100644 +index a2dfd43..40a0228 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -92,7 +92,7 @@ endif +@@ -90,7 +90,7 @@ endif test-nlist$(EXEEXT): test-nlist.c $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) \ diff --git a/poky/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch b/poky/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch index 96c2565e3..be48ef010 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch @@ -1,4 +1,4 @@ -From f8e4118b60a9b54950437006a82b4047f38f5347 Mon Sep 17 00:00:00 2001 +From 1643d793761216252bb654e28aaa5b8eb1536bca Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 15 Aug 2017 17:13:59 +0800 Subject: [PATCH] Fix elf_cvt_gunhash if dest and src are same. diff --git a/poky/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch b/poky/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch index c6f766f68..b373940d3 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch @@ -1,4 +1,4 @@ -From f4ca9db9d38f865505322595a8a1e8f69d5bb87c Mon Sep 17 00:00:00 2001 +From 18c527991deee93170a887b6da622560d5606913 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Fri, 23 Aug 2019 10:18:47 +0800 Subject: [PATCH] musl-libs @@ -19,10 +19,9 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> lib/error.h | 27 +++++++++++++++++++++++++++ lib/fixedsizehash.h | 1 - lib/libeu.h | 1 + - libdwfl/dwfl_error.c | 9 +++++++++ libdwfl/linux-kernel-modules.c | 1 + libelf/elf.h | 7 +++++++ - 6 files changed, 45 insertions(+), 1 deletion(-) + 5 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 lib/error.h diff --git a/lib/error.h b/lib/error.h @@ -82,27 +81,6 @@ index ecb4d01..edc85e3 100644 #include <stddef.h> #include <stdint.h> -diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c -index 7bcf61c..11dcc8b 100644 ---- a/libdwfl/dwfl_error.c -+++ b/libdwfl/dwfl_error.c -@@ -154,7 +154,16 @@ dwfl_errmsg (int error) - switch (error &~ 0xffff) - { - case OTHER_ERROR (ERRNO): -+#if defined(__GLIBC__) - return strerror_r (error & 0xffff, "bad", 0); -+#else -+ { -+ static __thread char buf[128] = ""; -+ if (strerror_r (error & 0xffff, buf, sizeof(buf)) == 0) -+ return buf; -+ } -+ return "strerror_r() failed"; -+#endif - case OTHER_ERROR (LIBELF): - return elf_errmsg (error & 0xffff); - case OTHER_ERROR (LIBDW): diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c index 6edb27f..f331e3c 100644 --- a/libdwfl/linux-kernel-modules.c @@ -116,7 +94,7 @@ index 6edb27f..f331e3c 100644 /* If fts.h is included before config.h, its indirect inclusions may not give us the right LFS aliases of these functions, so map them manually. */ diff --git a/libelf/elf.h b/libelf/elf.h -index 6439c1a..a87c589 100644 +index 8e3e618..1353890 100644 --- a/libelf/elf.h +++ b/libelf/elf.h @@ -19,6 +19,10 @@ @@ -130,7 +108,7 @@ index 6439c1a..a87c589 100644 /* Standard ELF types. */ #include <stdint.h> -@@ -4101,4 +4105,7 @@ enum +@@ -4102,4 +4106,7 @@ enum #define R_ARC_TLS_LE_S9 0x4a #define R_ARC_TLS_LE_32 0x4b diff --git a/poky/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch b/poky/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch index e36d3f44d..212b358dc 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch @@ -1,4 +1,4 @@ -From dd7c8c730457def5f62ebd43022b2f06df8c6ed9 Mon Sep 17 00:00:00 2001 +From 7e1f91c42ef5b0bf10afefec10dd08588df3ab1f Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 15 Aug 2017 17:17:20 +0800 Subject: [PATCH] fixheadercheck @@ -22,10 +22,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c -index 3e9ef61..5351518 100644 +index d0d4d1e..4ecf5a5 100644 --- a/libelf/elf32_updatenull.c +++ b/libelf/elf32_updatenull.c -@@ -339,8 +339,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum) +@@ -354,8 +354,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum) we test for the alignment of the section being large enough for the largest alignment required by a data block. */ diff --git a/poky/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/poky/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch index a8b39b5f9..65593be32 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch @@ -1,4 +1,4 @@ -From e7e5333ed2e19f25ecbd7121f424eec99d61265a Mon Sep 17 00:00:00 2001 +From 2dab1a02a3cfd80629f3e0f380805a5e58dd0ac3 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Fri, 23 Aug 2019 10:19:48 +0800 Subject: [PATCH] musl-utils @@ -15,12 +15,11 @@ Rebase to 0.177 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - src/arlib.h | 6 ++++++ - src/elfcompress.c | 7 +++++++ - src/readelf.c | 20 ++++++++++++-------- - src/strip.c | 7 +++++++ - src/unstrip.c | 9 +++++++++ - 5 files changed, 41 insertions(+), 8 deletions(-) + src/arlib.h | 6 ++++++ + src/elfcompress.c | 7 +++++++ + src/strip.c | 7 +++++++ + src/unstrip.c | 9 +++++++++ + 4 files changed, 29 insertions(+) diff --git a/src/arlib.h b/src/arlib.h index e117166..8326f6c 100644 @@ -40,7 +39,7 @@ index e117166..8326f6c 100644 /* State of -D/-U flags. */ extern bool arlib_deterministic_output; diff --git a/src/elfcompress.c b/src/elfcompress.c -index 6ba6af4..0c7674b 100644 +index 1b5b1e3..21c9024 100644 --- a/src/elfcompress.c +++ b/src/elfcompress.c @@ -37,6 +37,13 @@ @@ -57,74 +56,8 @@ index 6ba6af4..0c7674b 100644 /* Name and version of program. */ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; -diff --git a/src/readelf.c b/src/readelf.c -index 64067a5..630739c 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -4829,10 +4829,11 @@ listptr_base (struct listptr *p) - return cudie_base (&cu); - } - -+static const char *listptr_name; -+ - static int --compare_listptr (const void *a, const void *b, void *arg) -+compare_listptr (const void *a, const void *b) - { -- const char *name = arg; - struct listptr *p1 = (void *) a; - struct listptr *p2 = (void *) b; - -@@ -4848,21 +4849,21 @@ compare_listptr (const void *a, const void *b, void *arg) - p1->warned = p2->warned = true; - error (0, 0, - gettext ("%s %#" PRIx64 " used with different address sizes"), -- name, (uint64_t) p1->offset); -+ listptr_name, (uint64_t) p1->offset); - } - if (p1->dwarf64 != p2->dwarf64) - { - p1->warned = p2->warned = true; - error (0, 0, - gettext ("%s %#" PRIx64 " used with different offset sizes"), -- name, (uint64_t) p1->offset); -+ listptr_name, (uint64_t) p1->offset); - } - if (listptr_base (p1) != listptr_base (p2)) - { - p1->warned = p2->warned = true; - error (0, 0, - gettext ("%s %#" PRIx64 " used with different base addresses"), -- name, (uint64_t) p1->offset); -+ listptr_name, (uint64_t) p1->offset); - } - if (p1->attr != p2 ->attr) - { -@@ -4870,7 +4871,7 @@ compare_listptr (const void *a, const void *b, void *arg) - error (0, 0, - gettext ("%s %#" PRIx64 - " used with different attribute %s and %s"), -- name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr), -+ listptr_name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr), - dwarf_attr_name (p2->attr)); - } - } -@@ -4942,8 +4943,11 @@ static void - sort_listptr (struct listptr_table *table, const char *name) - { - if (table->n > 0) -- qsort_r (table->table, table->n, sizeof table->table[0], -- &compare_listptr, (void *) name); -+ { -+ listptr_name = name; -+ qsort (table->table, table->n, sizeof table->table[0], -+ &compare_listptr); -+ } - } - - static bool diff --git a/src/strip.c b/src/strip.c -index 48792a7..198a2e4 100644 +index 7a5d4e4..81a0d57 100644 --- a/src/strip.c +++ b/src/strip.c @@ -46,6 +46,13 @@ @@ -142,12 +75,12 @@ index 48792a7..198a2e4 100644 /* Name and version of program. */ diff --git a/src/unstrip.c b/src/unstrip.c -index a855038..df6fc1c 100644 +index 8580329..d547487 100644 --- a/src/unstrip.c +++ b/src/unstrip.c -@@ -56,6 +56,15 @@ - # define _(str) gettext (str) - #endif +@@ -52,6 +52,15 @@ + #include "libeu.h" + #include "printversion.h" +#ifndef strndupa +#define strndupa(s, n) \ diff --git a/poky/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch b/poky/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch index 5dee61210..f407bdd0b 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch @@ -1,4 +1,4 @@ -From e4ede22e28eaa38d81667ddcb19541ece1a83cf8 Mon Sep 17 00:00:00 2001 +From cd36f34c722dd0babd7beb13c968aa0780c9f726 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 15 Aug 2017 17:24:06 +0800 Subject: [PATCH] Disable the test to convert euc-jp @@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 2 insertions(+) diff --git a/m4/iconv.m4 b/m4/iconv.m4 -index a503646..299f1eb 100644 +index aa159c5..d16312b 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 -@@ -159,6 +159,7 @@ int main () +@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK], } } #endif @@ -32,11 +32,11 @@ index a503646..299f1eb 100644 /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is provided. */ if (/* Try standardized names. */ -@@ -170,6 +171,7 @@ int main () +@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK], /* Try HP-UX names. */ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) result |= 16; +#endif return result; - }]])], - [am_cv_func_iconv_works=yes], + ]])], + [am_cv_func_iconv_works=yes], , diff --git a/poky/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch b/poky/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch index 0d162ebe1..8e1e97041 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch @@ -1,4 +1,4 @@ -From ed87f11f7297c0edb3ca8950de1cc23e9b96217c Mon Sep 17 00:00:00 2001 +From ce3b1403bd88261b5461a9dcb7d6d6be9185703e Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Wed, 1 May 2019 22:15:03 +0100 Subject: [PATCH] Fix error on musl: @@ -19,7 +19,7 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 1 file changed, 5 insertions(+) diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c -index ba0d68d..1d2447f 100644 +index abbdf3f..bd90f4d 100644 --- a/tests/elfstrmerge.c +++ b/tests/elfstrmerge.c @@ -33,6 +33,11 @@ diff --git a/poky/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch b/poky/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch index 6f7956c5a..8942ad782 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch @@ -1,4 +1,4 @@ -From 578f370c7e7a9f056aefa062b34590b0aa13bce5 Mon Sep 17 00:00:00 2001 +From 2396fd67d81e54e18fbad67a5ff67d5684a01013 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 15 Aug 2017 17:27:30 +0800 Subject: [PATCH] Fix build on aarch64/musl diff --git a/poky/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/poky/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch index ec1b927c2..205362626 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch @@ -1,4 +1,4 @@ -From 574ac484c01125a97ba8737cf7292ca926897310 Mon Sep 17 00:00:00 2001 +From dfe11e043cd8ea0b0f0252bcff9f5a6b98c0ecd3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 22 Jun 2020 21:35:16 +0000 Subject: [PATCH] config/eu.am: do not use -Werror diff --git a/poky/meta/recipes-devtools/elfutils/files/ptest.patch b/poky/meta/recipes-devtools/elfutils/files/ptest.patch index 35b23f43b..fe6f272a8 100644 --- a/poky/meta/recipes-devtools/elfutils/files/ptest.patch +++ b/poky/meta/recipes-devtools/elfutils/files/ptest.patch @@ -1,4 +1,7 @@ -Changes to allow ptest to run standalone on target: +From bfbf393e7d5b1b41df85ce1c37e887776c45d529 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Wed, 1 May 2019 16:37:48 +0100 +Subject: [PATCH] Changes to allow ptest to run standalone on target: a) Run the tests serially b) Use the standalone test mode which allows the tests to be run in their @@ -12,11 +15,17 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Upstream-Status: Inappropriate [oe specific] -Index: elfutils-0.176/configure.ac -=================================================================== ---- elfutils-0.176.orig/configure.ac -+++ elfutils-0.176/configure.ac -@@ -45,7 +45,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2018 Th +--- + configure.ac | 2 +- + tests/Makefile.am | 2 ++ + tests/test-subr.sh | 6 ------ + 3 files changed, 3 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d345495..67933d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -48,7 +48,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2021 The elfutils developers.]) AC_PREREQ(2.63) dnl Minimum Autoconf version required. dnl We use GNU make extensions; automake 1.10 defaults to -Wportability. @@ -25,42 +34,20 @@ Index: elfutils-0.176/configure.ac AM_MAINTAINER_MODE AM_SILENT_RULES([yes]) -Index: elfutils-0.176/tests/Makefile.am -=================================================================== ---- elfutils-0.176.orig/tests/Makefile.am -+++ elfutils-0.176/tests/Makefile.am -@@ -445,10 +445,10 @@ installed_TESTS_ENVIRONMENT = libdir=$(D - installed_LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \ - installed $(tests_rpath) \ - '$(program_transform_name)' --if STANDALONE -+if !STANDALONE - TESTS_ENVIRONMENT = $(installed_TESTS_ENVIRONMENT) - LOG_COMPILER = $(installed_LOG_COMPILER) --else !STANDALONE -+else STANDALONE - TESTS_ENVIRONMENT = LC_ALL=C; LANG=C; VALGRIND_CMD=$(valgrind_cmd); \ - abs_srcdir=$(abs_srcdir); abs_builddir=$(abs_builddir); \ - abs_top_builddir=$(abs_top_builddir); \ -@@ -463,7 +463,7 @@ installcheck-local: - $(MAKE) $(AM_MAKEFLAGS) \ - TESTS_ENVIRONMENT="$(installed_TESTS_ENVIRONMENT)" \ - LOG_COMPILER="$(installed_LOG_COMPILER)" check-TESTS --endif !STANDALONE -+endif STANDALONE - - if STANDALONE - libdw = -ldw -@@ -612,3 +612,5 @@ check: check-am coverage +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 72afd0e..a2dfd43 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -698,3 +698,5 @@ check: check-am coverage coverage: -$(srcdir)/coverage.sh endif +oecheck: + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) -Index: elfutils-0.176/tests/test-subr.sh -=================================================================== ---- elfutils-0.176.orig/tests/test-subr.sh -+++ elfutils-0.176/tests/test-subr.sh +diff --git a/tests/test-subr.sh b/tests/test-subr.sh +index 411e5f2..a638ff9 100644 +--- a/tests/test-subr.sh ++++ b/tests/test-subr.sh @@ -91,12 +91,6 @@ installed_testrun() program="$1" shift diff --git a/poky/meta/recipes-devtools/elfutils/files/run-ptest b/poky/meta/recipes-devtools/elfutils/files/run-ptest index 81b81f2f5..d5776fdb5 100644 --- a/poky/meta/recipes-devtools/elfutils/files/run-ptest +++ b/poky/meta/recipes-devtools/elfutils/files/run-ptest @@ -3,4 +3,4 @@ #This script is used to run elfutils test suites cd tests -make -k runtest-TESTS abs_srcdir=$PWD abs_builddir=$PWD srcdir=$PWD top_srcdir=$PWD/../ abs_top_builddir=$PWD/../ elfutils_testrun=installed elfutils_tests_rpath=no program_transform_name=s,^,eu-, +make -k installcheck-local CC=gcc abs_srcdir=$PWD abs_builddir=$PWD srcdir=$PWD top_srcdir=$PWD/../ abs_top_builddir=$PWD/../ elfutils_testrun=installed elfutils_tests_rpath=no program_transform_name=s,^,eu-, diff --git a/poky/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch b/poky/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch index 67689e838..266afbfa1 100644 --- a/poky/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch +++ b/poky/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch @@ -1,23 +1,24 @@ -From 607b0bed5e8a5f5c3754cd6ffcf499d8134c37f9 Mon Sep 17 00:00:00 2001 +From 6bc6e867c5b3a774c0d7819ee5a3d2885e97caa9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 30 Mar 2020 17:11:19 +0200 Subject: [PATCH] gptcurses: correctly include curses.h Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- gptcurses.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gptcurses.cc b/gptcurses.cc -index 1b18cf2..4ebfde1 100644 +index 71aa734..4ebfde1 100644 --- a/gptcurses.cc +++ b/gptcurses.cc @@ -23,11 +23,7 @@ #include <iostream> #include <string> #include <sstream> --#ifdef __APPLE__ +-#if defined (__APPLE__) || (__FreeBSD__) #include <ncurses.h> -#else -#include <ncursesw/ncurses.h> diff --git a/poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.5.bb b/poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.6.bb index c7850f03c..5112debf8 100644 --- a/poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.5.bb +++ b/poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.6.bb @@ -1,5 +1,6 @@ SUMMARY = "Utility for modifying GPT disk partitioning" DESCRIPTION = "GPT fdisk is a disk partitioning tool loosely modeled on Linux fdisk, but used for modifying GUID Partition Table (GPT) disks. The related FixParts utility fixes some common problems on Master Boot Record (MBR) disks." +HOMEPAGE = "https://sourceforge.net/projects/gptfdisk/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" @@ -9,8 +10,7 @@ DEPENDS = "util-linux" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \ file://0001-gptcurses-correctly-include-curses.h.patch \ " -SRC_URI[md5sum] = "58dac67c85e46ca87b587231549aefe6" -SRC_URI[sha256sum] = "0e7d3987cd0488ecaf4b48761bc97f40b1dc089e5ff53c4b37abe30bc67dcb2f" +SRC_URI[sha256sum] = "ddc551d643a53f0bd4440345d3ae32c49b04a797e9c01036ea460b6bb4168ca8" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/" UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/" diff --git a/poky/meta/recipes-devtools/flex/flex/0001-Emit-no-line-directives-if-gen_line_dirs-is-false.patch b/poky/meta/recipes-devtools/flex/flex/0001-Emit-no-line-directives-if-gen_line_dirs-is-false.patch new file mode 100644 index 000000000..c8202b6bd --- /dev/null +++ b/poky/meta/recipes-devtools/flex/flex/0001-Emit-no-line-directives-if-gen_line_dirs-is-false.patch @@ -0,0 +1,32 @@ +From 440f3f55739468cd26e22f31871eca8cbbd53294 Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Wed, 6 Jan 2021 06:12:14 -0800 +Subject: [PATCH] Emit no #line directives if gen_line_dirs is false + +If we set --noline we should not print line directives. +But setting --noline means gen_line_dirs is false. + +Upstream-Status: Submitted +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> +--- + src/buf.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/buf.c b/src/buf.c +index 185083c..4439e28 100644 +--- a/src/buf.c ++++ b/src/buf.c +@@ -95,8 +95,8 @@ struct Buf *buf_linedir (struct Buf *buf, const char* filename, int lineno) + const char *src; + size_t tsz; + +- if (gen_line_dirs) +- return buf; ++ if (!gen_line_dirs) ++ return buf; + + tsz = strlen("#line \"\"\n") + /* constant parts */ + 2 * strlen (filename) + /* filename with possibly all backslashes escaped */ +-- +2.26.2.Cisco + diff --git a/poky/meta/recipes-devtools/flex/flex_2.6.4.bb b/poky/meta/recipes-devtools/flex/flex_2.6.4.bb index 3d5757286..1d43d2228 100644 --- a/poky/meta/recipes-devtools/flex/flex_2.6.4.bb +++ b/poky/meta/recipes-devtools/flex/flex_2.6.4.bb @@ -16,6 +16,7 @@ SRC_URI = "https://github.com/westes/flex/releases/download/v${PV}/flex-${PV}.ta ${@bb.utils.contains('PTEST_ENABLED', '1', '', 'file://disable-tests.patch', d)} \ file://0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch \ file://check-funcs.patch \ + file://0001-Emit-no-line-directives-if-gen_line_dirs-is-false.patch \ " SRC_URI[md5sum] = "2882e3179748cc9f9c23ec593d6adc8d" diff --git a/poky/meta/recipes-devtools/gcc/gcc-10.2.inc b/poky/meta/recipes-devtools/gcc/gcc-10.2.inc index 1e69c9131..c0cd8b31d 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-10.2.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-10.2.inc @@ -69,7 +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 \ + file://0001-libatomic-libgomp-libitc-Fix-bootstrap-PR70454.patch \ " SRC_URI[sha256sum] = "b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c" diff --git a/poky/meta/recipes-devtools/gcc/gcc-common.inc b/poky/meta/recipes-devtools/gcc/gcc-common.inc index 3dcfdf835..629fa26df 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-common.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-common.inc @@ -1,5 +1,6 @@ SUMMARY = "GNU cc and gcc C compilers" HOMEPAGE = "http://www.gnu.org/software/gcc/" +DESCRIPTION = "The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Ada, Go, and D, as well as libraries for these languages (libstdc++,...). GCC was originally written as the compiler for the GNU operating system." SECTION = "devel" LICENSE = "GPL" diff --git a/poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc index 668e14a59..9e643ee27 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc @@ -35,6 +35,11 @@ do_compile () { do_install () { cd ${B}/${TARGET_SYS}/libsanitizer/ oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/libsanitizer/ install + if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include ]; then + install -d ${D}${libdir}/${TARGET_SYS}/${BINV}/include + mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* ${D}${libdir}/${TARGET_SYS}/${BINV}/include + rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include + fi if [ -d ${D}${infodir} ]; then rmdir --ignore-fail-on-non-empty -p ${D}${infodir} fi @@ -109,4 +114,4 @@ FILES_libtsan-dev += "\ " FILES_libtsan-staticdev += "${libdir}/libtsan.a" -FILES_${PN} = "${libdir}/*.spec ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/sanitizer/*.h" +FILES_${PN} = "${libdir}/*.spec ${libdir}/${TARGET_SYS}/${BINV}/include/sanitizer/*.h" 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 deleted file mode 100644 index 3f04e121b..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc/0001-lib-Remove-i-86-march-overrides.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 3776789cde95916f95deef48acf9532b0ebf91ae Mon Sep 17 00:00:00 2001 -From: Nathan Rossi <nathan@nathanrossi.com> -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 <nathan@nathanrossi.com> ---- - 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/gcc/gcc/0001-libatomic-libgomp-libitc-Fix-bootstrap-PR70454.patch b/poky/meta/recipes-devtools/gcc/gcc/0001-libatomic-libgomp-libitc-Fix-bootstrap-PR70454.patch new file mode 100644 index 000000000..addecb4bd --- /dev/null +++ b/poky/meta/recipes-devtools/gcc/gcc/0001-libatomic-libgomp-libitc-Fix-bootstrap-PR70454.patch @@ -0,0 +1,208 @@ +From 2824d2418605e092899117e77bc8ebf332321807 Mon Sep 17 00:00:00 2001 +From: Jakub Jelinek <jakub@redhat.com> +Date: Fri, 15 Jan 2021 13:12:59 +0100 +Subject: [PATCH] libatomic, libgomp, libitc: Fix bootstrap [PR70454] + +The recent changes to error on mixing -march=i386 and -fcf-protection broke +bootstrap. This patch changes lib{atomic,gomp,itm} configury, so that it +only adds -march=i486 to flags if really needed (i.e. when 486 or later isn't +on by default already). Similarly, it will not use ifuncs if -mcx16 +(or -march=i686 for 32-bit) is on by default. + +2021-01-15 Jakub Jelinek <jakub@redhat.com> + + PR target/70454 +libatomic/ + * configure.tgt: For i?86 and x86_64 determine if -march=i486 needs to + be added through preprocessor check on + __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4. Determine if try_ifunc is needed + based on preprocessor check on __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16 + or __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8. +libgomp/ + * configure.tgt: For i?86 and x86_64 determine if -march=i486 needs to + be added through preprocessor check on + __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4. +libitm/ + * configure.tgt: For i?86 and x86_64 determine if -march=i486 needs to + be added through preprocessor check on + __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4. + +Upstream-Status: Backport [master post 10.x release] +--- + libatomic/configure.tgt | 56 +++++++++++++++++++++++------------------ + libgomp/configure.tgt | 35 +++++++++++--------------- + libitm/configure.tgt | 37 +++++++++++++-------------- + 3 files changed, 64 insertions(+), 64 deletions(-) + +diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt +index 5dd0926d20..6ea082a29b 100644 +--- a/libatomic/configure.tgt ++++ b/libatomic/configure.tgt +@@ -81,32 +81,40 @@ case "${target_cpu}" in + ARCH=sparc + ;; + +- 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 +- ;; +- x86_64) +- case " ${CC} ${CFLAGS} " in +- *" -m32 "*) ++ i[3456]86 | x86_64) ++ cat > conftestx.c <<EOF ++#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 ++#error need -march=i486 ++#endif ++EOF ++ if ${CC} ${CFLAGS} -E conftestx.c > /dev/null 2>&1; then ++ : ++ else ++ if test "${target_cpu}" = x86_64; then + XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic" +- XCFLAGS="${XCFLAGS} -fomit-frame-pointer" +- ;; +- *) +- ;; +- esac ++ else ++ XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}" ++ fi ++ XCFLAGS="${XCFLAGS} -fomit-frame-pointer" ++ fi ++ cat > conftestx.c <<EOF ++#ifdef __x86_64__ ++#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16 ++#error need -mcx16 ++#endif ++#else ++#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 ++#error need -march=i686 ++#endif ++#endif ++EOF ++ if ${CC} ${CFLAGS} -E conftestx.c > /dev/null 2>&1; then ++ try_ifunc=no ++ else ++ try_ifunc=yes ++ fi ++ rm -f conftestx.c + ARCH=x86 +- # ??? Detect when -mcx16 is already enabled. +- try_ifunc=yes + ;; + + *) ARCH="${target_cpu}" ;; +diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt +index 4790a31e39..761ef2a7db 100644 +--- a/libgomp/configure.tgt ++++ b/libgomp/configure.tgt +@@ -70,28 +70,23 @@ if test x$enable_linux_futex = xyes; then + ;; + + # Note that bare i386 is not included here. We need cmpxchg. +- i[456]86-*-linux*) ++ i[456]86-*-linux* | x86_64-*-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 +- # can't rely on the --with-arch configure option, since that +- # applies to the 64-bit side. +- x86_64-*-linux*) +- config_path="linux/x86 linux posix" +- case " ${CC} ${CFLAGS} " in +- *" -m32 "*) ++ cat > conftestx.c <<EOF ++#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 ++#error need -march=i486 ++#endif ++EOF ++ if ${CC} ${CFLAGS} -E conftestx.c > /dev/null 2>&1; then ++ : ++ else ++ if test "${target_cpu}" = x86_64; then + XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic" +- ;; +- esac ++ else ++ XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}" ++ fi ++ fi ++ rm -f conftestx.c + ;; + + # Note that sparcv7 and sparcv8 is not included here. We need cas. +diff --git a/libitm/configure.tgt b/libitm/configure.tgt +index 04109160e9..ca62bac627 100644 +--- a/libitm/configure.tgt ++++ b/libitm/configure.tgt +@@ -58,16 +58,23 @@ 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 ++ i[3456]86 | x86_64) ++ cat > conftestx.c <<EOF ++#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 ++#error need -march=i486 ++#endif ++EOF ++ if ${CC} ${CFLAGS} -E conftestx.c > /dev/null 2>&1; then ++ : ++ else ++ if test "${target_cpu}" = x86_64; then ++ XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic" ++ else ++ XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}" ++ fi ++ XCFLAGS="${XCFLAGS} -fomit-frame-pointer" ++ fi ++ rm -f conftestx.c + XCFLAGS="${XCFLAGS} -mrtm" + ARCH=x86 + ;; +@@ -102,16 +109,6 @@ case "${target_cpu}" in + ARCH=sparc + ;; + +- x86_64) +- case " ${CC} ${CFLAGS} " in +- *" -m32 "*) +- XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic" +- XCFLAGS="${XCFLAGS} -fomit-frame-pointer" +- ;; +- esac +- XCFLAGS="${XCFLAGS} -mrtm" +- ARCH=x86 +- ;; + s390|s390x) + XCFLAGS="${XCFLAGS} -mzarch -mhtm" + ARCH=s390 diff --git a/poky/meta/recipes-devtools/gdb/gdb-10.1.inc b/poky/meta/recipes-devtools/gdb/gdb-10.1.inc index 4b8de2b4e..07de17f84 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-10.1.inc +++ b/poky/meta/recipes-devtools/gdb/gdb-10.1.inc @@ -11,7 +11,6 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ file://0006-use-asm-sgidefs.h.patch \ - file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ file://0008-Change-order-of-CFLAGS.patch \ file://0009-resolve-restrict-keyword-conflict.patch \ file://0010-Fix-invalid-sigprocmask-call.patch \ diff --git a/poky/meta/recipes-devtools/gdb/gdb-common.inc b/poky/meta/recipes-devtools/gdb/gdb-common.inc index bfb8013d6..6e0455203 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-common.inc +++ b/poky/meta/recipes-devtools/gdb/gdb-common.inc @@ -1,5 +1,6 @@ SUMMARY = "GNU debugger" HOMEPAGE = "http://www.gnu.org/software/gdb/" +DESCRIPTION = "GDB, the GNU Project debugger, allows you to see what is going on inside another program while it executes -- or what another program was doing at the moment it crashed." SECTION = "devel" DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native" @@ -36,6 +37,7 @@ PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" # ncurses is already a hard DEPENDS, but would be added here if it weren't PACKAGECONFIG[tui] = "--enable-tui,--disable-tui" PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz" +PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils" GDBPROPREFIX = "--program-prefix=''" diff --git a/poky/meta/recipes-devtools/gdb/gdb.inc b/poky/meta/recipes-devtools/gdb/gdb.inc index 249e24dc5..aa845b5c4 100644 --- a/poky/meta/recipes-devtools/gdb/gdb.inc +++ b/poky/meta/recipes-devtools/gdb/gdb.inc @@ -9,6 +9,3 @@ inherit gettext PACKAGES =+ "gdbserver" FILES_gdbserver = "${bindir}/gdbserver" -ALLOW_EMPTY_gdbserver_riscv64 = "1" -ALLOW_EMPTY_gdbserver_riscv32 = "1" - diff --git a/poky/meta/recipes-devtools/git/git.inc b/poky/meta/recipes-devtools/git/git.inc index 544e23c84..0cc40b937 100644 --- a/poky/meta/recipes-devtools/git/git.inc +++ b/poky/meta/recipes-devtools/git/git.inc @@ -1,5 +1,6 @@ SUMMARY = "Distributed version control system" HOMEPAGE = "http://git-scm.com" +DESCRIPTION = "Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency." SECTION = "console/utils" LICENSE = "GPLv2" DEPENDS = "openssl curl zlib expat" @@ -7,7 +8,8 @@ DEPENDS = "openssl curl zlib expat" PROVIDES_append_class-native = " git-replacement-native" SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ - ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages" + ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \ + file://fixsort.patch" S = "${WORKDIR}/git-${PV}" diff --git a/poky/meta/recipes-devtools/git/git/fixsort.patch b/poky/meta/recipes-devtools/git/git/fixsort.patch new file mode 100644 index 000000000..07a487e8c --- /dev/null +++ b/poky/meta/recipes-devtools/git/git/fixsort.patch @@ -0,0 +1,31 @@ +[PATCH] generate-configlist.sh: Fix determinism issue + +Currently git binaries are not entirely reproducible, at least partly +due to config-list.h differing in order depending on the system's +locale settings. Under different locales, the entries: + +"sendemail.identity", +"sendemail.<identity>.*", + +would differ in order for example and this leads to differences in +the debug symbols for the binaries. + +This can be fixed by specifying the C locale for the sort in the +shell script generating the header. + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd37d8e454524987842f.camel@linuxfoundation.org/T/#u] + +Index: git-2.30.0/generate-configlist.sh +=================================================================== +--- git-2.30.0.orig/generate-configlist.sh ++++ git-2.30.0/generate-configlist.sh +@@ -9,7 +9,7 @@ static const char *config_name_list[] = + EOF + grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt | + sed '/deprecated/d; s/::$//; s/, */\n/g' | +- sort | ++ LC_ALL=C sort | + sed 's/^.*$/ "&",/' + cat <<EOF + NULL, diff --git a/poky/meta/recipes-devtools/git/git_2.29.2.bb b/poky/meta/recipes-devtools/git/git_2.30.1.bb index 6433a2e2b..bc1635ada 100644 --- a/poky/meta/recipes-devtools/git/git_2.29.2.bb +++ b/poky/meta/recipes-devtools/git/git_2.30.1.bb @@ -5,5 +5,5 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "869a121e1d75e4c28213df03d204156a17f02fce2dc77be9795b327830f54195" -SRC_URI[manpages.sha256sum] = "68b258e6d590cb78e02c0df741bbaeab94cbbac6d25de9da4fb3882ee098307b" +SRC_URI[tarball.sha256sum] = "23a3e53f0d2dd3e62a8147b24a1a91d6ffe95b92123ef4dbae04e9a6205e71c0" +SRC_URI[manpages.sha256sum] = "db323e1b242e9d0337363b1e538c8b879e4c46eedbf94d3bee9e65dab6d49138" diff --git a/poky/meta/recipes-devtools/glide/glide_0.13.3.bb b/poky/meta/recipes-devtools/glide/glide_0.13.3.bb index 31295edf9..6eb87df7c 100644 --- a/poky/meta/recipes-devtools/glide/glide_0.13.3.bb +++ b/poky/meta/recipes-devtools/glide/glide_0.13.3.bb @@ -1,5 +1,6 @@ SUMMARY = "Vendor Package Management for Golang" -HOMEPAGE = "https://glide.sh" +HOMEPAGE = "https://github.com/Masterminds/glide" +DESCRIPTION = "Glide is a Vendor Package Management for Golang" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=54905cf894f8cc416a92f4fc350c35b2" 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 32c1499a3..c41177c72 100644 --- a/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -1,5 +1,6 @@ SUMMARY = "gnu-configize" DESCRIPTION = "Tool that installs the GNU config.guess / config.sub into a directory tree" +HOMEPAGE = "https://git.savannah.gnu.org/cgit/config.git" SECTION = "devel" LICENSE = "GPL-3.0-with-autoconf-exception" LIC_FILES_CHKSUM = "file://config.guess;beginline=7;endline=27;md5=b75d42f59f706ea56d6a8e00216fca6a" @@ -8,8 +9,8 @@ DEPENDS_class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "c8ddc8472f8efcadafc1ef53ca1d863415fddd5f" -PV = "20201227+git${SRCPV}" +SRCREV = "6faca61810d335c7837f320733fe8e15a1431fc2" +PV = "20210125+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.16.inc index abe74e5eb..1ebbbef83 100644 --- a/poky/meta/recipes-devtools/go/go-1.15.inc +++ b/poky/meta/recipes-devtools/go/go-1.16.inc @@ -1,7 +1,7 @@ require go-common.inc -GO_BASEVERSION = "1.15" -PV = "1.15.6" +GO_BASEVERSION = "1.16" +PV = "1.16" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" @@ -15,5 +15,6 @@ 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-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch \ " -SRC_URI[main.sha256sum] = "890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817" +SRC_URI[main.sha256sum] = "7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a" diff --git a/poky/meta/recipes-devtools/go/go-1.15/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/poky/meta/recipes-devtools/go/go-1.16/0001-allow-CC-and-CXX-to-have-multiple-words.patch index 5f4823be2..5f4823be2 100644 --- a/poky/meta/recipes-devtools/go/go-1.15/0001-allow-CC-and-CXX-to-have-multiple-words.patch +++ b/poky/meta/recipes-devtools/go/go-1.16/0001-allow-CC-and-CXX-to-have-multiple-words.patch diff --git a/poky/meta/recipes-devtools/go/go-1.15/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/poky/meta/recipes-devtools/go/go-1.16/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch index d0511c0c4..04d0e496c 100644 --- a/poky/meta/recipes-devtools/go/go-1.15/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/poky/meta/recipes-devtools/go/go-1.16/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch @@ -63,8 +63,8 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -33,6 +33,8 @@ import ( - "cmd/go/internal/str" +@@ -37,6 +37,8 @@ import ( + "cmd/go/internal/trace" ) +var omitGopath = os.Getenv("GOPATH_OMIT_IN_ACTIONID") != "" @@ -72,7 +72,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> // actionList returns the list of actions in the dag rooted at root // as visited in a depth-first post-order traversal. func actionList(root *Action) []*Action { -@@ -209,7 +211,7 @@ func (b *Builder) buildActionID(a *Actio +@@ -228,7 +230,7 @@ func (b *Builder) buildActionID(a *Actio // Assume b.WorkDir is being trimmed properly. // When -trimpath is used with a package built from the module cache, // use the module path and version instead of the directory. @@ -81,7 +81,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> fmt.Fprintf(h, "dir %s\n", p.Dir) } else if cfg.BuildTrimpath && p.Module != nil { fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) -@@ -228,13 +230,13 @@ func (b *Builder) buildActionID(a *Actio +@@ -247,13 +249,13 @@ func (b *Builder) buildActionID(a *Actio } if len(p.CgoFiles)+len(p.SwigFiles) > 0 { fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) @@ -99,7 +99,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> } // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions? } -@@ -2298,33 +2300,48 @@ var ( +@@ -2401,33 +2403,48 @@ var ( // gccCmd returns a gcc command line prefix // defaultCC is defined in zdefaultcc.go, written by cmd/dist. func (b *Builder) GccCmd(incdir, workdir string) []string { @@ -157,7 +157,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> } // compilerExe returns the compiler to use given an -@@ -2333,11 +2350,16 @@ func (b *Builder) fcExe() []string { +@@ -2436,11 +2453,16 @@ func (b *Builder) fcExe() []string { // of the compiler but can have additional arguments if they // were present in the environment value. // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"]. @@ -165,7 +165,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> +func (b *Builder) compilerExe(envValue string, def string, filtered bool) []string { compiler := strings.Fields(envValue) if len(compiler) == 0 { - compiler = []string{def} + compiler = strings.Fields(def) } + + if filtered { @@ -175,7 +175,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> return compiler } -@@ -2510,7 +2532,7 @@ func envList(key, def string) []string { +@@ -2620,7 +2642,7 @@ func envList(key, def string) []string { } // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. @@ -184,7 +184,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> defaults := "-g -O2" if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { -@@ -2529,6 +2551,14 @@ func (b *Builder) CFlags(p *load.Package +@@ -2639,6 +2661,14 @@ func (b *Builder) CFlags(p *load.Package return } @@ -199,7 +199,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> return } -@@ -2543,7 +2573,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) +@@ -2653,7 +2683,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { p := a.Package @@ -208,7 +208,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> if err != nil { return nil, nil, err } -@@ -2902,7 +2932,7 @@ func (b *Builder) swigIntSize(objdir str +@@ -3104,7 +3134,7 @@ func (b *Builder) swigIntSize(objdir str // Run SWIG on one SWIG input file. func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { diff --git a/poky/meta/recipes-devtools/go/go-1.15/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/poky/meta/recipes-devtools/go/go-1.16/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch index 662c70547..662c70547 100644 --- a/poky/meta/recipes-devtools/go/go-1.15/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch +++ b/poky/meta/recipes-devtools/go/go-1.16/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch diff --git a/poky/meta/recipes-devtools/go/go-1.15/0004-ld-add-soname-to-shareable-objects.patch b/poky/meta/recipes-devtools/go/go-1.16/0004-ld-add-soname-to-shareable-objects.patch index da2992392..cd875f116 100644 --- a/poky/meta/recipes-devtools/go/go-1.15/0004-ld-add-soname-to-shareable-objects.patch +++ b/poky/meta/recipes-devtools/go/go-1.16/0004-ld-add-soname-to-shareable-objects.patch @@ -19,15 +19,15 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go -@@ -1446,6 +1446,7 @@ func (ctxt *Link) hostlink() { +@@ -1343,6 +1343,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") + argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile))) - if ctxt.HeadType != objabi.Hwindows { - // Pass -z nodelete to mark the shared library as - // non-closeable: a dlclose will do nothing. -@@ -1457,6 +1458,7 @@ func (ctxt *Link) hostlink() { + if ctxt.HeadType == objabi.Hwindows { + if *flagAslr { + argv = addASLRargs(argv) +@@ -1358,6 +1359,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -35,7 +35,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> case BuildModePlugin: if ctxt.HeadType == objabi.Hdarwin { argv = append(argv, "-dynamiclib") -@@ -1465,6 +1467,7 @@ func (ctxt *Link) hostlink() { +@@ -1366,6 +1368,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") diff --git a/poky/meta/recipes-devtools/go/go-1.15/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/poky/meta/recipes-devtools/go/go-1.16/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch index 59c12d954..59c12d954 100644 --- a/poky/meta/recipes-devtools/go/go-1.15/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/poky/meta/recipes-devtools/go/go-1.16/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch diff --git a/poky/meta/recipes-devtools/go/go-1.15/0006-cmd-dist-separate-host-and-target-builds.patch b/poky/meta/recipes-devtools/go/go-1.16/0006-cmd-dist-separate-host-and-target-builds.patch index 7aee0bac4..7aee0bac4 100644 --- a/poky/meta/recipes-devtools/go/go-1.15/0006-cmd-dist-separate-host-and-target-builds.patch +++ b/poky/meta/recipes-devtools/go/go-1.16/0006-cmd-dist-separate-host-and-target-builds.patch diff --git a/poky/meta/recipes-devtools/go/go-1.15/0007-cmd-go-make-GOROOT-precious-by-default.patch b/poky/meta/recipes-devtools/go/go-1.16/0007-cmd-go-make-GOROOT-precious-by-default.patch index 4b4d0d4f3..4b4d0d4f3 100644 --- a/poky/meta/recipes-devtools/go/go-1.15/0007-cmd-go-make-GOROOT-precious-by-default.patch +++ b/poky/meta/recipes-devtools/go/go-1.16/0007-cmd-go-make-GOROOT-precious-by-default.patch diff --git a/poky/meta/recipes-devtools/go/go-1.15/0008-use-GOBUILDMODE-to-set-buildmode.patch b/poky/meta/recipes-devtools/go/go-1.16/0008-use-GOBUILDMODE-to-set-buildmode.patch index 4e5d5021d..4e5d5021d 100644 --- a/poky/meta/recipes-devtools/go/go-1.15/0008-use-GOBUILDMODE-to-set-buildmode.patch +++ b/poky/meta/recipes-devtools/go/go-1.16/0008-use-GOBUILDMODE-to-set-buildmode.patch diff --git a/poky/meta/recipes-devtools/go/go-1.16/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch b/poky/meta/recipes-devtools/go/go-1.16/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch new file mode 100644 index 000000000..dcbdf5875 --- /dev/null +++ b/poky/meta/recipes-devtools/go/go-1.16/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch @@ -0,0 +1,95 @@ +From a983bc6cd48fb0da939e3329cac18d7a3b29ecf8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 Feb 2021 17:54:01 -0800 +Subject: [PATCH] Revert "cmd/go: make sure CC and CXX are absolute" + +OE uses CC/CXX values which consists of cmpiler and options together, +secondly, the environment is canned so this check add little value to OE +based builds + +Fixes go-runtime build issues + +go install: CXX environment variable is relative; must be absolute path: powerpc64le-yoe-linux-musl-g++ -mlittle-endian -mhard-float -m64 -mabi=elfv2 -mcpu=power9 -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mnt/b/yoe/master/build/tmp/work/ppc64p9le-yoe-linux-musl/go/1.16-r0/recipe-sysroot + +This reverts commit aa161e799df7e1eba99d2be10271e76b6f758142. + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/cmd/go/internal/envcmd/env.go | 5 ----- + src/cmd/go/internal/work/init.go | 7 ------- + src/cmd/go/testdata/script/env_write.txt | 24 ------------------------ + 3 files changed, 36 deletions(-) + +diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go +index 6937187522..29f9057c3f 100644 +--- a/src/cmd/go/internal/envcmd/env.go ++++ b/src/cmd/go/internal/envcmd/env.go +@@ -427,11 +427,6 @@ func checkEnvWrite(key, val string) error { + if !filepath.IsAbs(val) && val != "" { + return fmt.Errorf("GOPATH entry is relative; must be absolute path: %q", val) + } +- // Make sure CC and CXX are absolute paths +- case "CC", "CXX": +- if !filepath.IsAbs(val) && val != "" && val != filepath.Base(val) { +- return fmt.Errorf("%s entry is relative; must be absolute path: %q", key, val) +- } + } + + if !utf8.ValidString(val) { +diff --git a/src/cmd/go/internal/work/init.go b/src/cmd/go/internal/work/init.go +index ba7c7c2fbb..3a6df5f758 100644 +--- a/src/cmd/go/internal/work/init.go ++++ b/src/cmd/go/internal/work/init.go +@@ -41,13 +41,6 @@ func BuildInit() { + cfg.BuildPkgdir = p + } + +- // Make sure CC and CXX are absolute paths +- for _, key := range []string{"CC", "CXX"} { +- if path := cfg.Getenv(key); !filepath.IsAbs(path) && path != "" && path != filepath.Base(path) { +- base.Fatalf("go %s: %s environment variable is relative; must be absolute path: %s\n", flag.Args()[0], key, path) +- } +- } +- + // For each experiment that has been enabled in the toolchain, define a + // build tag with the same name but prefixed by "goexperiment." which can be + // used for compiling alternative files for the experiment. This allows +diff --git a/src/cmd/go/testdata/script/env_write.txt b/src/cmd/go/testdata/script/env_write.txt +index bda1e57826..c99aadb7f2 100644 +--- a/src/cmd/go/testdata/script/env_write.txt ++++ b/src/cmd/go/testdata/script/env_write.txt +@@ -129,30 +129,6 @@ go env -w GOTMPDIR= + go env GOTMPDIR + stdout ^$ + +-# go env -w rejects relative CC values +-[!windows] go env -w CC=/usr/bin/clang +-go env -w CC=clang +-[!windows] ! go env -w CC=./clang +-[!windows] ! go env -w CC=bin/clang +-[!windows] stderr 'go env -w: CC entry is relative; must be absolute path' +- +-[windows] go env -w CC=$WORK\bin\clang +-[windows] ! go env -w CC=.\clang +-[windows] ! go env -w CC=bin\clang +-[windows] stderr 'go env -w: CC entry is relative; must be absolute path' +- +-# go env -w rejects relative CXX values +-[!windows] go env -w CC=/usr/bin/cpp +-go env -w CXX=cpp +-[!windows] ! go env -w CXX=./cpp +-[!windows] ! go env -w CXX=bin/cpp +-[!windows] stderr 'go env -w: CXX entry is relative; must be absolute path' +- +-[windows] go env -w CXX=$WORK\bin\cpp +-[windows] ! go env -w CXX=.\cpp +-[windows] ! go env -w CXX=bin\cpp +-[windows] stderr 'go env -w: CXX entry is relative; must be absolute path' +- + # go env -w/-u checks validity of GOOS/ARCH combinations + env GOOS= + env GOARCH= +-- +2.30.1 + 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.16.bb index 622557ad2..155a475c9 100644 --- a/poky/meta/recipes-devtools/go/go-binary-native_1.15.6.bb +++ b/poky/meta/recipes-devtools/go/go-binary-native_1.16.bb @@ -8,8 +8,8 @@ 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" +SRC_URI[go_linux_amd64.sha256sum] = "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2" +SRC_URI[go_linux_arm64.sha256sum] = "3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" diff --git a/poky/meta/recipes-devtools/go/go-cross-canadian_1.15.bb b/poky/meta/recipes-devtools/go/go-cross-canadian_1.16.bb index 7ac9449e4..7ac9449e4 100644 --- a/poky/meta/recipes-devtools/go/go-cross-canadian_1.15.bb +++ b/poky/meta/recipes-devtools/go/go-cross-canadian_1.16.bb diff --git a/poky/meta/recipes-devtools/go/go-cross_1.15.bb b/poky/meta/recipes-devtools/go/go-cross_1.16.bb index 80b5a03f6..80b5a03f6 100644 --- a/poky/meta/recipes-devtools/go/go-cross_1.15.bb +++ b/poky/meta/recipes-devtools/go/go-cross_1.16.bb diff --git a/poky/meta/recipes-devtools/go/go-crosssdk_1.15.bb b/poky/meta/recipes-devtools/go/go-crosssdk_1.16.bb index 1857c8a57..1857c8a57 100644 --- a/poky/meta/recipes-devtools/go/go-crosssdk_1.15.bb +++ b/poky/meta/recipes-devtools/go/go-crosssdk_1.16.bb diff --git a/poky/meta/recipes-devtools/go/go-native_1.15.bb b/poky/meta/recipes-devtools/go/go-native_1.16.bb index f14892cdb..f14892cdb 100644 --- a/poky/meta/recipes-devtools/go/go-native_1.15.bb +++ b/poky/meta/recipes-devtools/go/go-native_1.16.bb diff --git a/poky/meta/recipes-devtools/go/go-runtime_1.15.bb b/poky/meta/recipes-devtools/go/go-runtime_1.16.bb index d6ddb31ed..63464a150 100644 --- a/poky/meta/recipes-devtools/go/go-runtime_1.15.bb +++ b/poky/meta/recipes-devtools/go/go-runtime_1.16.bb @@ -1,4 +1,3 @@ -export CGO_ENABLED_riscv64 = "" require go-${PV}.inc require go-runtime.inc diff --git a/poky/meta/recipes-devtools/go/go_1.15.bb b/poky/meta/recipes-devtools/go/go_1.16.bb index d4812c0f0..4e9e0ebec 100644 --- a/poky/meta/recipes-devtools/go/go_1.15.bb +++ b/poky/meta/recipes-devtools/go/go_1.16.bb @@ -4,15 +4,14 @@ require go-target.inc inherit linuxloader export GOBUILDMODE="" -export CGO_ENABLED_riscv64 = "" export GO_LDSO = "${@get_linuxloader(d)}" export CC_FOR_TARGET = "gcc" export CXX_FOR_TARGET = "g++" -# mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv and its +# mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv32 and its # variants. python() { - if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv' in d.getVar('TARGET_ARCH',True): + if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv32' in d.getVar('TARGET_ARCH',True): d.appendVar('INSANE_SKIP_%s' % d.getVar('PN',True), " textrel") } diff --git a/poky/meta/recipes-devtools/help2man/help2man_1.47.16.bb b/poky/meta/recipes-devtools/help2man/help2man_1.48.1.bb index 27a15eb0e..bdea59d96 100644 --- a/poky/meta/recipes-devtools/help2man/help2man_1.47.16.bb +++ b/poky/meta/recipes-devtools/help2man/help2man_1.48.1.bb @@ -1,10 +1,12 @@ SUMMARY = "Program for creating simple man pages" +HOMEPAGE = "https://www.gnu.org/software/help2man/" +DESCRIPTION = "help2man is a tool for automatically generating simple manual pages from program output." SECTION = "devel" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "3ef8580c5b86e32ca092ce8de43df204f5e6f714b0cd32bc6237e6cd0f34a8f4" +SRC_URI[sha256sum] = "de8a74740bd058646567b92ab4ecdeb9da9f1a07cc7c4f607a3c14dd38d10799" inherit autotools diff --git a/poky/meta/recipes-devtools/i2c-tools/i2c-tools_4.2.bb b/poky/meta/recipes-devtools/i2c-tools/i2c-tools_4.2.bb index 7a53151d0..9842d1f13 100644 --- a/poky/meta/recipes-devtools/i2c-tools/i2c-tools_4.2.bb +++ b/poky/meta/recipes-devtools/i2c-tools/i2c-tools_4.2.bb @@ -1,5 +1,6 @@ SUMMARY = "Set of i2c tools for linux" HOMEPAGE = "https://i2c.wiki.kernel.org/index.php/I2C_Tools" +DESCRIPTION = "The i2c-tools package contains a heterogeneous set of I2C tools for Linux: a bus probing tool, a chip dumper, register-level SMBus access helpers, EEPROM decoding scripts, EEPROM programming tools, and a python module for SMBus access. All versions of Linux are supported, as long as I2C support is included in the kernel." SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/poky/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb b/poky/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb index 304ad7fec..ce4d73caf 100644 --- a/poky/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb +++ b/poky/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb @@ -1,6 +1,7 @@ # Copyright (c) 2018 Joshua Watt, Garmin International,Inc. # Released under the MIT license (see COPYING.MIT for the terms) SUMMARY = "Generates Icecream toolchain for SDK" +DESCRIPTION = "${SUMMARY}" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${WORKDIR}/icecc-env.sh;beginline=2;endline=20;md5=dd6b68c1efed8a9fb04e409b3b287d47" diff --git a/poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb b/poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb index ecff2faf2..592dbb92e 100644 --- a/poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb +++ b/poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb @@ -1,4 +1,6 @@ SUMMARY = "Utility scripts for internationalizing XML" +HOMEPAGE = "https://launchpad.net/intltool" +DESCRIPTION = "Utility scripts for internationalizing XML. This tool automatically extracts translatable strings from oaf, glade, bonobo ui, nautilus theme and other XML files into the po files." SECTION = "devel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" diff --git a/poky/meta/recipes-devtools/jquery/jquery_3.5.1.bb b/poky/meta/recipes-devtools/jquery/jquery_3.5.1.bb index 62f0dfb0c..cfc32952c 100644 --- a/poky/meta/recipes-devtools/jquery/jquery_3.5.1.bb +++ b/poky/meta/recipes-devtools/jquery/jquery_3.5.1.bb @@ -1,5 +1,6 @@ SUMMARY = "jQuery is a fast, small, and feature-rich JavaScript library" HOMEPAGE = "https://jquery.com/" +DESCRIPTION = "${SUMMARY}" LICENSE = "MIT" SECTION = "devel" LIC_FILES_CHKSUM = "file://${S}/${BP}.js;beginline=8;endline=10;md5=ebd7bc5d23ab165188e526a0c65d24bb" diff --git a/poky/meta/recipes-devtools/libcomps/libcomps_0.1.15.bb b/poky/meta/recipes-devtools/libcomps/libcomps_0.1.15.bb index 98c55dca8..58d2dee89 100644 --- a/poky/meta/recipes-devtools/libcomps/libcomps_0.1.15.bb +++ b/poky/meta/recipes-devtools/libcomps/libcomps_0.1.15.bb @@ -1,4 +1,6 @@ SUMMARY = "Libcomps is alternative for yum.comps library (which is for managing rpm package groups)." +HOMEPAGE = "https://github.com/rpm-software-management/libcomps" +DESCRIPTION = "Libcomps is alternative for yum.comps library. It's written in pure C as library and there's bindings for python2 and python3." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb b/poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb index e22255f83..b34bb5de0 100644 --- a/poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb +++ b/poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb @@ -1,4 +1,6 @@ SUMMARY = "Library providing simplified C and Python API to libsolv" +HOMEPAGE = "https://github.com/rpm-software-management/libdnf" +DESCRIPTION = "This library provides a high level package-manager. It's core library of dnf, PackageKit and rpm-ostree. It's replacement for deprecated hawkey library which it contains inside and uses librepo under the hood." LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb index b9a64f00e..2f60ce8e0 100644 --- a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +++ b/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb @@ -1,4 +1,6 @@ SUMMARY = "C Library for manipulating module metadata files" +HOMEPAGE = "https://github.com/fedora-modularity/libmodulemd" +DESCRIPTION = "${SUMMARY}" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" @@ -6,14 +8,14 @@ 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.11.1" -SRCREV = "0ead09d0a35b9095e1a01afd540abd7217b31fba" +PV = "2.12.0" +SRCREV = "aaed38c899a958a88a6a368a70510e350ebe336c" S = "${WORKDIR}/git" inherit meson gobject-introspection python3-dir -EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" +EXTRA_OEMESON = "-Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" diff --git a/poky/meta/recipes-devtools/librepo/librepo_1.12.1.bb b/poky/meta/recipes-devtools/librepo/librepo_1.12.1.bb index 059735105..e90928d2e 100644 --- a/poky/meta/recipes-devtools/librepo/librepo_1.12.1.bb +++ b/poky/meta/recipes-devtools/librepo/librepo_1.12.1.bb @@ -1,5 +1,7 @@ SUMMARY = "A library providing C and Python (libcURL like) API \ for downloading linux repository metadata and packages." +HOMEPAGE = "https://github.com/rpm-software-management/librepo" +DESCRIPTION = "${SUMMARY}" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" diff --git a/poky/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch b/poky/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch index 20eea060b..48af6fc28 100644 --- a/poky/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch +++ b/poky/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch @@ -7,7 +7,7 @@ Otherwise, there are instances which are identical in every other field and therefore sort non-reproducibly (which breaks binary and source reproducibiliy). -Upstream-Status: Pending +Upstream-Status: Submitted [https://reviews.llvm.org/D97477] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- llvm/utils/TableGen/AsmMatcherEmitter.cpp | 5 ++++- diff --git a/poky/meta/recipes-devtools/llvm/llvm/0001-nfc-Fix-missing-include.patch b/poky/meta/recipes-devtools/llvm/llvm/0001-nfc-Fix-missing-include.patch new file mode 100644 index 000000000..f6dee77ab --- /dev/null +++ b/poky/meta/recipes-devtools/llvm/llvm/0001-nfc-Fix-missing-include.patch @@ -0,0 +1,26 @@ +From 3b7e611bd58ba842470d17374c550e14bceca5c7 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille <sguelton@redhat.com> +Date: Tue, 10 Nov 2020 14:55:25 +0100 +Subject: [PATCH] [nfc] Fix missing include + +Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + llvm/utils/benchmark/src/benchmark_register.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/llvm/utils/benchmark/src/benchmark_register.h b/llvm/utils/benchmark/src/benchmark_register.h +index 0705e219f2fa..4caa5ad4da07 100644 +--- a/llvm/utils/benchmark/src/benchmark_register.h ++++ b/llvm/utils/benchmark/src/benchmark_register.h +@@ -1,6 +1,7 @@ + #ifndef BENCHMARK_REGISTER_H + #define BENCHMARK_REGISTER_H + ++#include <limits> + #include <vector> + + #include "check.h" +-- +2.30.1 + diff --git a/poky/meta/recipes-devtools/llvm/llvm_git.bb b/poky/meta/recipes-devtools/llvm/llvm_git.bb index 43395f8cf..db6694339 100644 --- a/poky/meta/recipes-devtools/llvm/llvm_git.bb +++ b/poky/meta/recipes-devtools/llvm/llvm_git.bb @@ -19,9 +19,9 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -MAJOR_VERSION = "10" -MINOR_VERSION = "0" -PATCH_VERSION = "1" +MAJOR_VERSION = "11" +MINOR_VERSION = "1" +PATCH_VERSION = "0" PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" @@ -29,11 +29,12 @@ LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "ef32c611aa214dea855364efd7ba451ec5ec3f74" +SRCREV = "1fdec59bffc11ae37eb51a1b9869f0696bfd5312" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \ file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ + file://0001-nfc-Fix-missing-include.patch;striplevel=2 \ " UPSTREAM_CHECK_GITTAGREGEX = "llvmorg-(?P<pver>\d+(\.\d+)+)" diff --git a/poky/meta/recipes-devtools/log4cplus/log4cplus_2.0.5.bb b/poky/meta/recipes-devtools/log4cplus/log4cplus_2.0.6.bb index 967ac7623..4b7c76ab4 100644 --- a/poky/meta/recipes-devtools/log4cplus/log4cplus_2.0.5.bb +++ b/poky/meta/recipes-devtools/log4cplus/log4cplus_2.0.6.bb @@ -1,6 +1,7 @@ SUMMARY = "log4cplus provides a simple C++ logging API for log management" SECTION = "libs" HOMEPAGE = "http://sourceforge.net/projects/log4cplus/" +DESCRIPTION = "log4cplus is a simple to use C++ logging API providing thread-safe, flexible, and arbitrarily granular control over log management and configuration. It is modelled after the Java log4j API." BUGTRACKER = "http://sourceforge.net/p/log4cplus/bugs/" LICENSE = "Apache-2.0 & BSD-2-Clause" @@ -8,8 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b" SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \ " -SRC_URI[md5sum] = "71dd956bf686195127559671f1426cff" -SRC_URI[sha256sum] = "c07115c23219390633798def30b7b51a0f79fdeb857e4b49632f17746d0ceb97" +SRC_URI[md5sum] = "71051de4c2c3ef67f66ce3bbb083cf43" +SRC_URI[sha256sum] = "5fb26433b0f200ebfc2e6effb7e2e5131185862a2ea9a621a8e7f3f725a72b08" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/" UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P<pver>\d+(\.\d+)+)/" diff --git a/poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb b/poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb index 92d5870f4..5910f4bc7 100644 --- a/poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb +++ b/poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb @@ -1,4 +1,5 @@ SUMMARY = "Tool for creating device nodes" +DESCRIPTION = "${SUMMARY}" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" SECTION = "base" diff --git a/poky/meta/recipes-devtools/meson/meson.inc b/poky/meta/recipes-devtools/meson/meson.inc index 2d3adbdb1..622c22aff 100644 --- a/poky/meta/recipes-devtools/meson/meson.inc +++ b/poky/meta/recipes-devtools/meson/meson.inc @@ -14,9 +14,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://disable-rpath-handling.patch \ file://cross-prop-default.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ - file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ " -SRC_URI[sha256sum] = "291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213" +SRC_URI[sha256sum] = "72e1c782ba9bda204f4a1ed57f98d027d7b6eb9414c723eebbd6ec7f1955c8a6" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 3438e6a2f..48941c97f 100644 --- a/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 110a525e5ebed2fca138d72da493c39510311c1f Mon Sep 17 00:00:00 2001 +From 76934bcbf2cfa7304e8864e28c51f58adda0392f Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal @@ -12,7 +12,7 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 13d0ba5..5ba3a1a 100644 +index ba35d16..2d3c34c 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -254,7 +254,7 @@ class MachineInfo: @@ -25,10 +25,10 @@ index 13d0ba5..5ba3a1a 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 588005b..988e3ea 100644 +index 756dd81..4d2c2b6 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -400,9 +400,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: trial = 'ppc64' if trial not in known_cpu_families: diff --git a/poky/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch b/poky/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch deleted file mode 100644 index a1f8422d4..000000000 --- a/poky/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 64aa6718c290e150dafd8da83f31cb08af00af0e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 27 May 2020 16:43:05 +0000 -Subject: [PATCH] gnome.py: prefix g-i paths with PKG_CONFIG_SYSROOT_DIR - -When using sysroots for builds, the standard target paths for the -tools need to be prefixed (pkg-config is not clever enough to -determine when a custom variable is a path) - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - mesonbuild/modules/gnome.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 52016f4..2b72ee4 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -410,14 +410,14 @@ class GnomeModule(ExtensionModule): - if giscanner is not None: - self.giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner) - elif self.gir_dep.type_name == 'pkgconfig': -- self.giscanner = ExternalProgram('g_ir_scanner', self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})) -+ self.giscanner = ExternalProgram('g_ir_scanner', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})) - else: - self.giscanner = self.interpreter.find_program_impl('g-ir-scanner') - gicompiler = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler') - if gicompiler is not None: - self.gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler) - elif self.gir_dep.type_name == 'pkgconfig': -- self.gicompiler = ExternalProgram('g_ir_compiler', self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})) -+ self.gicompiler = ExternalProgram('g_ir_compiler', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})) - else: - self.gicompiler = self.interpreter.find_program_impl('g-ir-compiler') - return self.gir_dep, self.giscanner, self.gicompiler diff --git a/poky/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch b/poky/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch index c0ad01e9d..231414fcb 100644 --- a/poky/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch +++ b/poky/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch @@ -1,4 +1,4 @@ -From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001 +From f8f67c8d5c3f374b1e30e2d40cb56a79f0544471 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 18 Apr 2019 17:36:11 +0200 Subject: [PATCH] modules/python.py: do not substitute python's install prefix @@ -12,11 +12,11 @@ Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - mesonbuild/modules/python.py | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) + mesonbuild/modules/python.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py -index 2f0c644..d2aa565 100644 +index eda70ce..18edd15 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig @@ -28,11 +28,7 @@ index 2f0c644..d2aa565 100644 def links_against_libpython(): from distutils.core import Distribution, Extension -@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder): - ExternalProgramHolder.__init__(self, python, interpreter.subproject) - self.interpreter = interpreter - self.subproject = self.interpreter.subproject -- prefix = self.interpreter.environment.coredata.get_builtin_option('prefix') +@@ -280,8 +280,8 @@ class PythonInstallation(ExternalProgramHolder): self.variables = info['variables'] self.paths = info['paths'] install_paths = info['install_paths'] diff --git a/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index 5c16cf501..d0fe1126f 100644 --- a/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From 38f59e256f760aa959c13f4c5713f87ff7addee5 Mon Sep 17 00:00:00 2001 +From 6efb6114836fd4a1e012aa03b37f3beeeb22b466 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt <pkj@axis.com> Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again @@ -13,10 +13,10 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index d1be65b..90f3573 100644 +index 2d3c34c..b9e7908 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -36,6 +36,7 @@ _T = T.TypeVar('_T') +@@ -38,6 +38,7 @@ _T = T.TypeVar('_T') known_cpu_families = ( diff --git a/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index fb55a0518..ed85116c4 100644 --- a/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,4 +1,4 @@ -From cbc27ee1576b4d04ad8e9d80760c63a9d3b7f5ed Mon Sep 17 00:00:00 2001 +From 1546e1f95a119175b7a4e4272a26dd85505e5ede Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir @@ -15,16 +15,17 @@ that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> + --- mesonbuild/dependencies/base.py | 19 +++++++++++-------- mesonbuild/dependencies/ui.py | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 3a5f5f8..0af89f8 100644 +index cd77b4b..7e3f338 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -183,7 +183,7 @@ class Dependency: +@@ -192,7 +192,7 @@ class Dependency: def get_exe_args(self, compiler): return [] @@ -33,16 +34,16 @@ index 3a5f5f8..0af89f8 100644 raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) def get_configtool_variable(self, variable_name): -@@ -261,7 +261,7 @@ class InternalDependency(Dependency): - setattr(result, k, copy.deepcopy(v, memo)) - return result +@@ -280,7 +280,7 @@ class InternalDependency(Dependency): + return True + return any(d.is_built() for d in self.ext_deps) - def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str: + def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str: raise DependencyException('Method "get_pkgconfig_variable()" is ' 'invalid for an internal dependency') -@@ -639,8 +639,11 @@ class PkgConfigDependency(ExternalDependency): +@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency): return s.format(self.__class__.__name__, self.name, self.is_found, self.version_reqs) @@ -56,16 +57,16 @@ index 3a5f5f8..0af89f8 100644 p, out, err = Popen_safe(cmd, env=env) rc, out, err = p.returncode, out.strip(), err.strip() call = ' '.join(cmd) -@@ -666,7 +669,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency): + env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir) - - def _call_pkgbin(self, args, env=None): + def _call_pkgbin(self, args, env=None, use_native=False): # Always copy the environment since we're going to modify it # with pkg-config variables if env is None: -@@ -680,7 +683,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency): targs = tuple(args) cache = PkgConfigDependency.pkgbin_cache if (self.pkgbin, targs, fenv) not in cache: @@ -74,7 +75,7 @@ index 3a5f5f8..0af89f8 100644 return cache[(self.pkgbin, targs, fenv)] def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: -@@ -889,7 +892,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency): (self.name, out_raw)) self.link_args, self.raw_link_args = self._search_libs(out, out_raw) @@ -83,7 +84,7 @@ index 3a5f5f8..0af89f8 100644 options = ['--variable=' + variable_name, self.name] if 'define_variable' in kwargs: -@@ -902,7 +905,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency): options = ['--define-variable=' + '='.join(definition)] + options @@ -93,7 +94,7 @@ index 3a5f5f8..0af89f8 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index 5dffd3a..fb3a178 100644 +index d897d76..a598d2e 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency): diff --git a/poky/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/poky/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch index 4653a72a2..7c766c61b 100644 --- a/poky/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch +++ b/poky/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch @@ -1,4 +1,4 @@ -From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001 +From 27bbd3c9d8d86de545fcf6608564a14571c98a61 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Fri, 23 Nov 2018 15:28:28 +0000 Subject: [PATCH] meson: Disable rpath stripping at install time @@ -16,17 +16,17 @@ Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 0be01fe..5406cab 100644 +index 212568a..06366d4 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py -@@ -512,8 +512,11 @@ class Installer: +@@ -653,8 +653,11 @@ class Installer: if file_copied: self.did_install_something = True try: -- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, -- install_name_mappings, verbose=False) +- self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, +- install_name_mappings, verbose=False) + if install_rpath: -+ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, ++ self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, + install_name_mappings, verbose=False) + else: + print("RPATH changes at install time disabled") diff --git a/poky/meta/recipes-devtools/meson/meson/meson-setup.py b/poky/meta/recipes-devtools/meson/meson/meson-setup.py index 808e2a062..7ac4e3ad4 100755 --- a/poky/meta/recipes-devtools/meson/meson/meson-setup.py +++ b/poky/meta/recipes-devtools/meson/meson/meson-setup.py @@ -10,9 +10,13 @@ class Template(string.Template): class Environ(): def __getitem__(self, name): val = os.environ[name] - val = ["'%s'" % x for x in val.split()] - val = ', '.join(val) - val = '[%s]' % val + val = val.split() + if len(val) > 1: + val = ["'%s'" % x for x in val] + val = ', '.join(val) + val = '[%s]' % val + elif val: + val = "'%s'" % val.pop() return val try: diff --git a/poky/meta/recipes-devtools/meson/meson_0.56.0.bb b/poky/meta/recipes-devtools/meson/meson_0.57.1.bb index de9b905c1..de9b905c1 100644 --- a/poky/meta/recipes-devtools/meson/meson_0.56.0.bb +++ b/poky/meta/recipes-devtools/meson/meson_0.57.1.bb diff --git a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.57.1.bb index 67add2c25..8778cab12 100644 --- a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb +++ b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.57.1.bb @@ -1,7 +1,7 @@ include meson.inc -inherit nativesdk inherit siteinfo +inherit nativesdk SRC_URI += "file://meson-setup.py \ file://meson-wrapper" @@ -40,6 +40,7 @@ c_args = @CFLAGS c_link_args = @LDFLAGS cpp_args = @CPPFLAGS cpp_link_args = @LDFLAGS +sys_root = @OECORE_TARGET_SYSROOT [host_machine] system = '${SDK_OS}' diff --git a/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb b/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb index 5fd1c5c0c..8fe606915 100644 --- a/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb @@ -1,5 +1,6 @@ SUMMARY = "Userspace tools for MMC/SD devices" HOMEPAGE = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/" +DESCRIPTION = "${SUMMARY}" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" diff --git a/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb b/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb index 8d6bbfca3..105a68dad 100644 --- a/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb +++ b/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb @@ -1,5 +1,6 @@ SUMMARY = "Tools for managing memory technology devices" HOMEPAGE = "http://www.linux-mtd.infradead.org/" +DESCRIPTION = "mtd-utils tool is a generic Linux subsystem for memory devices, especially Flash devices." SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ @@ -42,11 +43,9 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "flashcp flash_eraseall flash_lock flash_unlock nanddump nandwrite" ALTERNATIVE_${PN}-ubifs = "ubiattach ubidetach ubimkvol ubirename ubirmvol ubirsvol ubiupdatevol" -ALTERNATIVE_LINK_NAME[flash_eraseall] = "${sbindir}/flash_eraseall" ALTERNATIVE_LINK_NAME[nandwrite] = "${sbindir}/nandwrite" ALTERNATIVE_LINK_NAME[nanddump] = "${sbindir}/nanddump" ALTERNATIVE_LINK_NAME[ubiattach] = "${sbindir}/ubiattach" -ALTERNATIVE_LINK_NAME[ubiattach] = "${sbindir}/ubiattach" ALTERNATIVE_LINK_NAME[ubidetach] = "${sbindir}/ubidetach" ALTERNATIVE_LINK_NAME[ubimkvol] = "${sbindir}/ubimkvol" ALTERNATIVE_LINK_NAME[ubirename] = "${sbindir}/ubirename" diff --git a/poky/meta/recipes-devtools/nasm/nasm_2.15.05.bb b/poky/meta/recipes-devtools/nasm/nasm_2.15.05.bb index 6a1294c34..43088baf7 100644 --- a/poky/meta/recipes-devtools/nasm/nasm_2.15.05.bb +++ b/poky/meta/recipes-devtools/nasm/nasm_2.15.05.bb @@ -1,5 +1,7 @@ SUMMARY = "General-purpose x86 assembler" SECTION = "devel" +HOMEPAGE = "http://www.nasm.us/" +DESCRIPTION = "The Netwide Assembler (NASM) is an assembler and disassembler for the Intel x86 architecture." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=90904486f8fbf1861cf42752e1a39efe" diff --git a/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb b/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb index 88ff84340..2a39b2d21 100644 --- a/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb +++ b/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb @@ -1,5 +1,6 @@ SUMMARY = "Ninja is a small build system with a focus on speed." HOMEPAGE = "https://ninja-build.org/" +DESCRIPTION = "Ninja is a small build system with a focus on speed. It differs from other build systems in two major respects: it is designed to have its input files generated by a higher-level build system, and it is designed to run builds as fast as possible." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" diff --git a/poky/meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch b/poky/meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch new file mode 100644 index 000000000..4578fa33b --- /dev/null +++ b/poky/meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch @@ -0,0 +1,24 @@ +Having CLEAN_DATE come from the current date doesn't allow for build +reproducibility. Add the option of using SOURCE_DATE_EPOCH if set +which for OE, it will be. + +Upstream-Status: Pending +RP 2021/2/2 + +Index: opkg-0.4.4/configure.ac +=================================================================== +--- opkg-0.4.4.orig/configure.ac ++++ opkg-0.4.4/configure.ac +@@ -281,7 +281,11 @@ AC_FUNC_UTIME_NULL + AC_FUNC_VPRINTF + AC_CHECK_FUNCS([memmove memset mkdir regcomp strchr strcspn strdup strerror strndup strrchr strstr strtol strtoul sysinfo utime]) + +-CLEAN_DATE=`date +"%B %Y" | tr -d '\n'` ++if ! test -z "$SOURCE_DATE_EPOCH" ; then ++ CLEAN_DATE=`LC_ALL=C date -d @$SOURCE_DATE_EPOCH +"%B %Y" | tr -d '\n'` ++else ++ CLEAN_DATE=`date +"%B %Y" | tr -d '\n'` ++fi + + AC_SUBST([CLEAN_DATE]) + diff --git a/poky/meta/recipes-devtools/opkg/opkg_0.4.4.bb b/poky/meta/recipes-devtools/opkg/opkg_0.4.4.bb index f8034ca5f..9eca61be2 100644 --- a/poky/meta/recipes-devtools/opkg/opkg_0.4.4.bb +++ b/poky/meta/recipes-devtools/opkg/opkg_0.4.4.bb @@ -2,6 +2,7 @@ SUMMARY = "Open Package Manager" SUMMARY_libopkg = "Open Package Manager library" SECTION = "base" HOMEPAGE = "http://code.google.com/p/opkg/" +DESCRIPTION = "Opkg is a lightweight package management system based on Ipkg." BUGTRACKER = "http://code.google.com/p/opkg/issues/list" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ @@ -15,6 +16,7 @@ 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://sourcedateepoch.patch \ file://run-ptest \ " diff --git a/poky/meta/recipes-devtools/orc/orc_0.4.32.bb b/poky/meta/recipes-devtools/orc/orc_0.4.32.bb index a55b43b8e..0b63716f9 100644 --- a/poky/meta/recipes-devtools/orc/orc_0.4.32.bb +++ b/poky/meta/recipes-devtools/orc/orc_0.4.32.bb @@ -1,5 +1,6 @@ SUMMARY = "Optimised Inner Loop Runtime Compiler" HOMEPAGE = "http://gstreamer.freedesktop.org/modules/orc.html" +DESCRIPTION = "Optimised Inner Loop Runtime Compiler is a Library and set of tools for compiling and executing SIMD assembly language-like programs that operate on arrays of data." LICENSE = "BSD-2-Clause & BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=1400bd9d09e8af56b9ec982b3d85797e" diff --git a/poky/meta/recipes-devtools/patchelf/patchelf_0.12.bb b/poky/meta/recipes-devtools/patchelf/patchelf_0.12.bb index 43de90877..95886c6d3 100644 --- a/poky/meta/recipes-devtools/patchelf/patchelf_0.12.bb +++ b/poky/meta/recipes-devtools/patchelf/patchelf_0.12.bb @@ -1,10 +1,12 @@ -SRC_URI = "git://github.com/NixOS/patchelf;protocol=https \ - file://handle-read-only-files.patch \ - " +SUMMARY = "Tool to allow editing of RPATH and interpreter fields in ELF binaries" +DESCRIPTION = "PatchELF is a simple utility for modifying existing ELF executables and libraries." +HOMEPAGE = "https://github.com/NixOS/patchelf" LICENSE = "GPLv3" -SUMMARY = "Tool to allow editing of RPATH and interpreter fields in ELF binaries" +SRC_URI = "git://github.com/NixOS/patchelf;protocol=https \ + file://handle-read-only-files.patch \ + " SRCREV = "8d3a16e97294e3c5521c61b4c8835499c9918264" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/perl/files/perl-cross-makefile.patch b/poky/meta/recipes-devtools/perl/files/perl-cross-makefile.patch deleted file mode 100644 index 5d3f99820..000000000 --- a/poky/meta/recipes-devtools/perl/files/perl-cross-makefile.patch +++ /dev/null @@ -1,29 +0,0 @@ -Makefile: Avoid continual rebuilds of miniperl and associated races - -In the Yocto Project, when we run "make install" we notice miniperl -rebuilding multiple times. Usually this is harmless however sometimes -race issues occur such as miniperl not being executable. - -The issue is that crosspatch is a phony target so it always rebuilds. -Adding this as a dependency of miniperl means miniperl always rebuilds -too. - -Avoid this by injecting a direct dependency avoiding the phony target. -miniperl is then only rebuilt when its input changes as desired. - -Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org -Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/95] - -Index: perl-5.32.0/Makefile -=================================================================== ---- perl-5.32.0.orig/Makefile -+++ perl-5.32.0/Makefile -@@ -56,7 +56,7 @@ crosspatch: $(CROSSPATCHED) - - # A minor fix for buildroot, force crosspatching when running "make perl modules" - # instead of "make all". --miniperlmain$O: crosspatch -+miniperlmain$O: $(CROSSPATCHED) - - # Original versions are not saved anymore; patch generally takes care of this, - # and if that fails, reaching for the source tarball is the safest option. diff --git a/poky/meta/recipes-devtools/perl/perl_5.32.0.bb b/poky/meta/recipes-devtools/perl/perl_5.32.1.bb index 3815dd44b..1fafc0a8c 100644 --- a/poky/meta/recipes-devtools/perl/perl_5.32.0.bb +++ b/poky/meta/recipes-devtools/perl/perl_5.32.1.bb @@ -1,5 +1,6 @@ SUMMARY = "Perl scripting language" HOMEPAGE = "http://www.perl.org/" +DESCRIPTION = "Perl is a highly capable, feature-rich programming language" SECTION = "devel" LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ @@ -8,7 +9,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ - https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.tar.gz;name=perl-cross \ + https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.tar.gz;name=perl-cross \ file://perl-rdepends.txt \ file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \ @@ -20,7 +21,6 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://determinism.patch \ - file://perl-cross-makefile.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ @@ -29,8 +29,8 @@ SRC_URI_append_class-target = " \ file://encodefix.patch \ " -SRC_URI[perl.sha256sum] = "efeb1ce1f10824190ad1cadbcccf6fdb8a5d37007d0100d2d9ae5f2b5900c0b4" -SRC_URI[perl-cross.sha256sum] = "755aa0ca8141a942188a269564f86c3c82349f82c346ed5c992495d7f35138ba" +SRC_URI[perl.sha256sum] = "03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c" +SRC_URI[perl-cross.sha256sum] = "91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25" S = "${WORKDIR}/perl-${PV}" diff --git a/poky/meta/recipes-devtools/pseudo/pseudo.inc b/poky/meta/recipes-devtools/pseudo/pseudo.inc index 50e30064b..65d6e5068 100644 --- a/poky/meta/recipes-devtools/pseudo/pseudo.inc +++ b/poky/meta/recipes-devtools/pseudo/pseudo.inc @@ -4,6 +4,7 @@ SUMMARY = "Pseudo gives fake root capabilities to a normal user" HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/pseudo" +DESCRIPTION = "The pseudo utility offers a way to run commands in a virtualized root environment." LIC_FILES_CHKSUM = "file://COPYING;md5=a1d8023a6f953ac6ea4af765ff62d574" SECTION = "base" LICENSE = "LGPL2.1" diff --git a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb index 7fa11a54e..17bd02c27 100644 --- a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -6,7 +6,7 @@ SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \ file://fallback-group \ " -SRCREV = "1ee9a1e05e200f189f6644411ba9304e8a479b0b" +SRCREV = "60e25a36558f1f07dcce1a044fe976b475bec42b" S = "${WORKDIR}/git" PV = "1.9.0+git${SRCPV}" diff --git a/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb b/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.20.1.bb index 2bfc913aa..6c3b88678 100644 --- a/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb +++ b/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.20.1.bb @@ -1,7 +1,9 @@ SUMMARY = "A sophisticated Numeric Processing Package for Python" +HOMEPAGE = "https://numpy.org/" +DESCRIPTION = "NumPy is the fundamental package needed for scientific computing with Python." SECTION = "devel/python" LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e527e2a94c4584cd192d03ffb1f4a744" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=aa1ecaef18152f75bfae546b29c49d3c" SRCNAME = "numpy" @@ -10,7 +12,7 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S file://0001-numpy-core-Define-RISCV-32-support.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "fe836a685d6838dbb3f603caef01183ea98e88febf4ce956a2ea484a75378413" +SRC_URI[sha256sum] = "9bf51d69ebb4ca9239e55bedc2185fe2c0ec222da0adee7ece4125414676846d" UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" @@ -53,6 +55,4 @@ RDEPENDS_${PN}-ptest += "${PYTHON_PN}-pytest \ ldd \ " -RDEPENDS_${PN}_class-native = "" - BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/poky/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 99c50e94c..680edbe70 100644 --- a/poky/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/poky/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From d2633b49275b20e7acf724567fe0189aab25771e Mon Sep 17 00:00:00 2001 +From 6380cc63f79abe8b8404c9be5ed5f213a70c8c6a Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 9ec83b7..7e97a07 100644 +index eeb21b5..eca1edd 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -636,6 +636,11 @@ class easy_install(Command): diff --git a/poky/meta/recipes-devtools/python/python-cython.inc b/poky/meta/recipes-devtools/python/python-cython.inc index b1e71f3cc..da6eba254 100644 --- a/poky/meta/recipes-devtools/python/python-cython.inc +++ b/poky/meta/recipes-devtools/python/python-cython.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" PYPI_PACKAGE = "Cython" BBCLASSEXTEND = "native nativesdk" -SRC_URI[sha256sum] = "e57acb89bd55943c8d8bf813763d20b9099cc7165c0f16b707631a7654be9cad" +SRC_URI[sha256sum] = "df6b83c7a6d1d967ea89a2903e4a931377634a297459652e4551734c48195406" UPSTREAM_CHECK_REGEX = "Cython-(?P<pver>.*)\.tar" inherit pypi diff --git a/poky/meta/recipes-devtools/python/python-pycryptodome.inc b/poky/meta/recipes-devtools/python/python-pycryptodome.inc index 68b084eb0..48481bcf9 100644 --- a/poky/meta/recipes-devtools/python/python-pycryptodome.inc +++ b/poky/meta/recipes-devtools/python/python-pycryptodome.inc @@ -3,7 +3,7 @@ DESCRIPTION = "PyCryptodome is a self-contained Python package of low-level\ cryptographic primitives." HOMEPAGE = "http://www.pycryptodome.org" LICENSE = "PD & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=accfa6aeaceb3ba96676edf18e78302c" inherit pypi diff --git a/poky/meta/recipes-devtools/python/python-smmap.inc b/poky/meta/recipes-devtools/python/python-smmap.inc index 7703722bc..2a2ac76f2 100644 --- a/poky/meta/recipes-devtools/python/python-smmap.inc +++ b/poky/meta/recipes-devtools/python/python-smmap.inc @@ -11,7 +11,7 @@ inherit pypi PYPI_PACKAGE = "smmap" -SRC_URI[sha256sum] = "9c98bbd1f9786d22f14b3d4126894d56befb835ec90cef151af566c7e19b5d24" +SRC_URI[sha256sum] = "7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182" RDEPENDS_${PN} += "${PYTHON_PN}-codecs \ ${PYTHON_PN}-mmap \ diff --git a/poky/meta/recipes-devtools/python/python3-cython_0.29.21.bb b/poky/meta/recipes-devtools/python/python3-cython_0.29.21.bb deleted file mode 100644 index 2ce6bdbd6..000000000 --- a/poky/meta/recipes-devtools/python/python3-cython_0.29.21.bb +++ /dev/null @@ -1,18 +0,0 @@ -inherit setuptools3 -require python-cython.inc - -RDEPENDS_${PN} += "\ - python3-setuptools \ -" - -# running build_ext a second time during install fails, because Python -# would then attempt to import cythonized modules built for the target -# architecture. -DISTUTILS_INSTALL_ARGS += "--skip-build" - -do_install_append() { - # rename scripts that would conflict with the Python 2 build of Cython - mv ${D}${bindir}/cython ${D}${bindir}/cython3 - mv ${D}${bindir}/cythonize ${D}${bindir}/cythonize3 - mv ${D}${bindir}/cygdb ${D}${bindir}/cygdb3 -} diff --git a/poky/meta/recipes-devtools/python/python3-cython_0.29.22.bb b/poky/meta/recipes-devtools/python/python3-cython_0.29.22.bb new file mode 100644 index 000000000..01f716c16 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-cython_0.29.22.bb @@ -0,0 +1,33 @@ +inherit setuptools3 +require python-cython.inc + +RDEPENDS_${PN} += "\ + python3-setuptools \ +" + +# running build_ext a second time during install fails, because Python +# would then attempt to import cythonized modules built for the target +# architecture. +DISTUTILS_INSTALL_ARGS += "--skip-build" + +do_install_append() { + # rename scripts that would conflict with the Python 2 build of Cython + mv ${D}${bindir}/cython ${D}${bindir}/cython3 + mv ${D}${bindir}/cythonize ${D}${bindir}/cythonize3 + mv ${D}${bindir}/cygdb ${D}${bindir}/cygdb3 +} + +PACKAGEBUILDPKGD += "cython_fix_sources" + +cython_fix_sources () { + sed -i -e 's#${WORKDIR}#/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}#g' \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Compiler/FlowControl.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Compiler/FusedNode.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Compiler/Scanning.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Compiler/Visitor.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Plex/Actions.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Plex/Scanners.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Runtime/refnanny.c \ + ${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/Cython-${PV}/Cython/Tempita/_tempita.c \ + ${PKGD}${libdir}/${PYTHON_DIR}/site-packages/Cython*/SOURCES.txt +} diff --git a/poky/meta/recipes-devtools/python/python3-dbusmock_0.19.bb b/poky/meta/recipes-devtools/python/python3-dbusmock_0.22.0.bb index d297dbc1d..b1feee841 100644 --- a/poky/meta/recipes-devtools/python/python3-dbusmock_0.19.bb +++ b/poky/meta/recipes-devtools/python/python3-dbusmock_0.22.0.bb @@ -3,7 +3,7 @@ SUMMARY = "With this program/Python library you can easily create mock objects o LICENSE = "GPL-3.0" LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI[sha256sum] = "497f30eed2fcd5deaa2633b9622e4e99af4bdfba4e972b350ba630bac6fc86c2" +SRC_URI[sha256sum] = "2191919cc411fb94953b36e46bfd55ee5ad4162432ee0d0892bc2c4770ff5d7c" PYPI_PACKAGE = "python-dbusmock" diff --git a/poky/meta/recipes-devtools/python/python3-git_3.1.11.bb b/poky/meta/recipes-devtools/python/python3-git_3.1.14.bb index 7c636572f..911c8f148 100644 --- a/poky/meta/recipes-devtools/python/python3-git_3.1.11.bb +++ b/poky/meta/recipes-devtools/python/python3-git_3.1.14.bb @@ -12,7 +12,7 @@ PYPI_PACKAGE = "GitPython" inherit pypi setuptools3 -SRC_URI[sha256sum] = "befa4d101f91bad1b632df4308ec64555db684c360bd7d2130b4807d49ce86b8" +SRC_URI[sha256sum] = "be27633e7509e58391f10207cd32b2a6cf5b908f92d9cd30da2e514e1137af61" DEPENDS += " ${PYTHON_PN}-gitdb" diff --git a/poky/meta/recipes-devtools/python/python3-hypothesis_5.43.3.bb b/poky/meta/recipes-devtools/python/python3-hypothesis_6.2.0.bb index 4d93cba86..be9418386 100644 --- a/poky/meta/recipes-devtools/python/python3-hypothesis_5.43.3.bb +++ b/poky/meta/recipes-devtools/python/python3-hypothesis_6.2.0.bb @@ -7,7 +7,7 @@ PYPI_PACKAGE = "hypothesis" inherit pypi setuptools3 -SRC_URI[sha256sum] = "d97ba7ae2cfe7096b0c045fdb611ee9850ccdd6050a9b36cb96812242062c2cc" +SRC_URI[sha256sum] = "c16fbde26b65c98a2464c48209b066c2f6dab5e8e38acd9d959021eb8d58b6c0" RDEPENDS_${PN} += "python3-attrs python3-core python3-sortedcontainers" 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.4.0.bb index 23f2e2dba..81f24e55c 100644 --- a/poky/meta/recipes-devtools/python/python3-importlib-metadata_3.3.0.bb +++ b/poky/meta/recipes-devtools/python/python3-importlib-metadata_3.4.0.bb @@ -8,11 +8,11 @@ inherit pypi setuptools3 PYPI_PACKAGE = "importlib_metadata" UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/" -SRC_URI[sha256sum] = "5c5a2720817414a6c41f0a49993908068243ae02c1635a228126519b509c8aed" +SRC_URI[sha256sum] = "fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d" S = "${WORKDIR}/importlib_metadata-${PV}" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "${PYTHON_PN}-setuptools-scm-native ${PYTHON_PN}-toml-native" RDEPENDS_${PN} += "${PYTHON_PN}-zipp ${PYTHON_PN}-pathlib2" RDEPENDS_${PN}_append_class-target = " python3-misc" RDEPENDS_${PN}_append_class-nativesdk = " python3-misc" diff --git a/poky/meta/recipes-devtools/python/python3-jinja2_2.11.2.bb b/poky/meta/recipes-devtools/python/python3-jinja2_2.11.3.bb index 89538d2f2..19a4eee11 100644 --- a/poky/meta/recipes-devtools/python/python3-jinja2_2.11.2.bb +++ b/poky/meta/recipes-devtools/python/python3-jinja2_2.11.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Python Jinja2: A small but fast and easy to use stand-alone templ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" -SRC_URI[sha256sum] = "89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0" +SRC_URI[sha256sum] = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6" PYPI_PACKAGE = "Jinja2" diff --git a/poky/meta/recipes-devtools/python/python3-magic_0.4.18.bb b/poky/meta/recipes-devtools/python/python3-magic_0.4.22.bb index 101b96d31..b82892759 100644 --- a/poky/meta/recipes-devtools/python/python3-magic_0.4.18.bb +++ b/poky/meta/recipes-devtools/python/python3-magic_0.4.22.bb @@ -5,18 +5,18 @@ DESCRIPTION = "This module uses ctypes to access the libmagic file type \ HOMEPAGE = "http://github.com/ahupp/python-magic" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=16a934f165e8c3245f241e77d401bb88" +LIC_FILES_CHKSUM = "file://LICENSE;md5=61495c152d794e6be5799a9edca149e3" PYPI_PACKAGE = "python-magic" inherit pypi setuptools3 -SRC_URI[md5sum] = "5edc6caa39cc62641850f6b1b6f284ba" -SRC_URI[sha256sum] = "b757db2a5289ea3f1ced9e60f072965243ea43a2221430048fd8cacab17be0ce" +SRC_URI[sha256sum] = "ca884349f2c92ce830e3f498c5b7c7051fe2942c3ee4332f65213b8ebff15a62" RDEPENDS_${PN} += "file \ ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-io \ + ${PYTHON_PN}-logging \ ${PYTHON_PN}-shell" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-devtools/python/python3-mako_1.1.3.bb b/poky/meta/recipes-devtools/python/python3-mako_1.1.4.bb index cda4e9922..1645f37da 100644 --- a/poky/meta/recipes-devtools/python/python3-mako_1.1.3.bb +++ b/poky/meta/recipes-devtools/python/python3-mako_1.1.4.bb @@ -8,13 +8,11 @@ PYPI_PACKAGE = "Mako" inherit pypi setuptools3 -SRC_URI[sha256sum] = "8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27" +SRC_URI[sha256sum] = "17831f0b7087c313c0ffae2bcbbd3c1d5ba9eeac9c38f2eb7b50e8c99fe9d5ab" RDEPENDS_${PN} = "${PYTHON_PN}-html \ ${PYTHON_PN}-netclient \ ${PYTHON_PN}-threading \ " -RDEPENDS_${PN}_class-native = "" - BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-more-itertools_8.6.0.bb b/poky/meta/recipes-devtools/python/python3-more-itertools_8.7.0.bb index ee5ce7ba9..0cb61915b 100644 --- a/poky/meta/recipes-devtools/python/python3-more-itertools_8.6.0.bb +++ b/poky/meta/recipes-devtools/python/python3-more-itertools_8.7.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/erikrose/more-itertools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3396ea30f9d21389d7857719816f83b5" -SRC_URI[sha256sum] = "b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf" +SRC_URI[sha256sum] = "c5d6da9ca3ff65220c3bfd2a8db06d698f05d4d2b9be57e1deb2be5a45019713" inherit pypi setuptools3 ptest diff --git a/poky/meta/recipes-devtools/python/python3-packaging_20.8.bb b/poky/meta/recipes-devtools/python/python3-packaging_20.9.bb index 658c3d1f3..92cf6a25f 100644 --- a/poky/meta/recipes-devtools/python/python3-packaging_20.8.bb +++ b/poky/meta/recipes-devtools/python/python3-packaging_20.9.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pypa/packaging" LICENSE = "Apache-2.0 & BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" -SRC_URI[sha256sum] = "78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093" +SRC_URI[sha256sum] = "5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-pycryptodome_3.10.1.bb b/poky/meta/recipes-devtools/python/python3-pycryptodome_3.10.1.bb new file mode 100644 index 000000000..28448b84f --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-pycryptodome_3.10.1.bb @@ -0,0 +1,5 @@ +require python-pycryptodome.inc +inherit setuptools3 + +SRC_URI[sha256sum] = "3e2e3a06580c5f190df843cdb90ea28d61099cf4924334d5297a995de68e4673" + diff --git a/poky/meta/recipes-devtools/python/python3-pycryptodome_3.9.9.bb b/poky/meta/recipes-devtools/python/python3-pycryptodome_3.9.9.bb deleted file mode 100644 index 1e84ce4df..000000000 --- a/poky/meta/recipes-devtools/python/python3-pycryptodome_3.9.9.bb +++ /dev/null @@ -1,5 +0,0 @@ -require python-pycryptodome.inc -inherit setuptools3 - -SRC_URI[sha256sum] = "910e202a557e1131b1c1b3f17a63914d57aac55cf9fb9b51644962841c3995c4" - diff --git a/poky/meta/recipes-devtools/python/python3-pycryptodomex_3.9.9.bb b/poky/meta/recipes-devtools/python/python3-pycryptodomex_3.10.1.bb index abff71efd..a6b3b3e93 100644 --- a/poky/meta/recipes-devtools/python/python3-pycryptodomex_3.9.9.bb +++ b/poky/meta/recipes-devtools/python/python3-pycryptodomex_3.10.1.bb @@ -1,7 +1,7 @@ require python-pycryptodome.inc inherit setuptools3 -SRC_URI[sha256sum] = "7b5b7c5896f8172ea0beb283f7f9428e0ab88ec248ce0a5b8c98d73e26267d51" +SRC_URI[sha256sum] = "541cd3e3e252fb19a7b48f420b798b53483302b7fe4d9954c947605d0a263d62" FILES_${PN}-tests = " \ ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \ diff --git a/poky/meta/recipes-devtools/python/python3-pygments_2.7.3.bb b/poky/meta/recipes-devtools/python/python3-pygments_2.8.0.bb index 379d85dbd..6c8afc509 100644 --- a/poky/meta/recipes-devtools/python/python3-pygments_2.7.3.bb +++ b/poky/meta/recipes-devtools/python/python3-pygments_2.8.0.bb @@ -2,10 +2,10 @@ 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" +LIC_FILES_CHKSUM = "file://LICENSE;md5=98419e351433ac106a24e3ad435930bc" inherit setuptools3 -SRC_URI[sha256sum] = "ccf3acacf3782cbed4a989426012f1c535c9a90d3a7fc3f16d231b9372d2b716" +SRC_URI[sha256sum] = "37a13ba168a02ac54cc5891a42b1caec333e59b66addb7fa633ea8a6d73445c0" DEPENDS += "\ ${PYTHON_PN} \ diff --git a/poky/meta/recipes-devtools/python/python3-pytest_6.2.1.bb b/poky/meta/recipes-devtools/python/python3-pytest_6.2.2.bb index 6843b4da2..392c20d03 100644 --- a/poky/meta/recipes-devtools/python/python3-pytest_6.2.1.bb +++ b/poky/meta/recipes-devtools/python/python3-pytest_6.2.2.bb @@ -5,7 +5,7 @@ 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" +SRC_URI[sha256sum] = "9d1edf9e7d0b84d72ea3dbcdfd22b35fb543a5e8f2a60092dd578936bf63d7f9" inherit update-alternatives pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-setuptools_51.0.0.bb b/poky/meta/recipes-devtools/python/python3-setuptools_53.0.0.bb index 6ee935f8f..811c8a590 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools_51.0.0.bb +++ b/poky/meta/recipes-devtools/python/python3-setuptools_53.0.0.bb @@ -2,9 +2,7 @@ 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" +LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=7a7126e068206290f3fe9f8d6c713ea6" inherit pypi setuptools3 @@ -12,7 +10,7 @@ SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-e SRC_URI += "file://0001-change-shebang-to-python3.patch" -SRC_URI[sha256sum] = "029c49fd713e9230f6a41c0298e6e1f5839f2cde7104c0ad5e053a37777e7688" +SRC_URI[sha256sum] = "1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5" DEPENDS += "${PYTHON_PN}" @@ -28,6 +26,7 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-netserver \ ${PYTHON_PN}-numbers \ ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-pkg-resources \ ${PYTHON_PN}-pkgutil \ ${PYTHON_PN}-plistlib \ ${PYTHON_PN}-shell \ @@ -41,10 +40,6 @@ 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 @@ -58,8 +53,3 @@ RDEPENDS_${PYTHON_PN}-pkg-resources = "\ ${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-smmap_3.0.4.bb b/poky/meta/recipes-devtools/python/python3-smmap_4.0.0.bb index 5f0f341d6..5f0f341d6 100644 --- a/poky/meta/recipes-devtools/python/python3-smmap_3.0.4.bb +++ b/poky/meta/recipes-devtools/python/python3-smmap_4.0.0.bb diff --git a/poky/meta/recipes-devtools/python/python3_3.9.1.bb b/poky/meta/recipes-devtools/python/python3_3.9.2.bb index 17d0c032f..af1843a18 100644 --- a/poky/meta/recipes-devtools/python/python3_3.9.1.bb +++ b/poky/meta/recipes-devtools/python/python3_3.9.2.bb @@ -1,9 +1,10 @@ SUMMARY = "The Python Programming Language" HOMEPAGE = "http://www.python.org" +DESCRIPTION = "Python is a programming language that lets you work more quickly and integrate your systems more effectively." LICENSE = "PSFv2" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=33223c9ef60c31e3f0e866cb09b65e83" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c22d2438294c784731bf9dd224a467b7" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://run-ptest \ @@ -36,7 +37,7 @@ SRC_URI_append_class-native = " \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://0001-Don-t-search-system-for-headers-libraries.patch \ " -SRC_URI[sha256sum] = "991c3f8ac97992f3d308fefeb03a64db462574eadbff34ce8bc5bb583d9903ff" +SRC_URI[sha256sum] = "3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" @@ -177,6 +178,10 @@ do_install_append() { } do_install_append_class-nativesdk () { + # Make sure we use /usr/bin/env python + for PYTHSCRIPT in `grep -rIl ${bindir}/python ${D}${bindir}`; do + sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' $PYTHSCRIPT + done create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN} TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1' } @@ -240,7 +245,7 @@ python(){ # First set RPROVIDES for -native case # Hardcoded since it cant be python3-native-foo, should be python3-foo-native pn = 'python3' - rprovides = d.getVar('RPROVIDES').split() + rprovides = (d.getVar('RPROVIDES') or "").split() # ${PN}-misc-native is not in the manifest rprovides.append(pn + '-misc-native') @@ -315,11 +320,8 @@ do_create_manifest() { } # bitbake python -c create_manifest -addtask do_create_manifest - # Make sure we have native python ready when we create a new manifest -do_create_manifest[depends] += "${PN}:do_prepare_recipe_sysroot" -do_create_manifest[depends] += "${PN}:do_patch" +addtask do_create_manifest after do_patch do_prepare_recipe_sysroot # manual dependency additions RRECOMMENDS_${PN}-core_append_class-nativesdk = " nativesdk-python3-modules" @@ -372,3 +374,9 @@ RDEPENDS_${PN}-dev = "" RDEPENDS_${PN}-tests_append_class-target = " ${MLPREFIX}bash" RDEPENDS_${PN}-tests_append_class-nativesdk = " ${MLPREFIX}bash" + +# Python's tests contain large numbers of files we don't need in the recipe sysroots +SYSROOT_PREPROCESS_FUNCS += " py3_sysroot_cleanup" +py3_sysroot_cleanup () { + rm -rf ${SYSROOT_DESTDIR}${libdir}/python${PYTHON_MAJMIN}/test +} diff --git a/poky/meta/recipes-devtools/qemu/qemu-native.inc b/poky/meta/recipes-devtools/qemu/qemu-native.inc index aa5c9b9a7..54e49d8bc 100644 --- a/poky/meta/recipes-devtools/qemu/qemu-native.inc +++ b/poky/meta/recipes-devtools/qemu/qemu-native.inc @@ -1,7 +1,7 @@ -inherit native - require qemu.inc +inherit native + EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" LDFLAGS_append = " -fuse-ld=bfd" diff --git a/poky/meta/recipes-devtools/qemu/qemu-native_5.1.0.bb b/poky/meta/recipes-devtools/qemu/qemu-native_5.2.0.bb index c8acff8e1..c8acff8e1 100644 --- a/poky/meta/recipes-devtools/qemu/qemu-native_5.1.0.bb +++ b/poky/meta/recipes-devtools/qemu/qemu-native_5.2.0.bb diff --git a/poky/meta/recipes-devtools/qemu/qemu-system-native_5.1.0.bb b/poky/meta/recipes-devtools/qemu/qemu-system-native_5.2.0.bb index 222b55cbc..222b55cbc 100644 --- a/poky/meta/recipes-devtools/qemu/qemu-system-native_5.1.0.bb +++ b/poky/meta/recipes-devtools/qemu/qemu-system-native_5.2.0.bb diff --git a/poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc index 4864d7e93..a6dc94162 100644 --- a/poky/meta/recipes-devtools/qemu/qemu.inc +++ b/poky/meta/recipes-devtools/qemu/qemu.inc @@ -6,7 +6,7 @@ a variety of guest operating systems" HOMEPAGE = "http://qemu.org" LICENSE = "GPLv2 & LGPLv2.1" -RDEPENDS_${PN}-ptest = "bash make" +RDEPENDS_${PN}-ptest = "bash" require qemu-targets.inc inherit pkgconfig ptest @@ -18,29 +18,25 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://powerpc_rom.bin \ file://run-ptest \ file://0001-qemu-Add-missing-wacom-HID-descriptor.patch \ - file://0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \ file://0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ file://0004-qemu-disable-Valgrind.patch \ - file://0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch \ file://0006-chardev-connect-socket-to-a-spawned-command.patch \ file://0007-apic-fixup-fallthrough-to-PIC.patch \ - file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ - file://0009-Fix-webkitgtk-builds.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ file://0001-Add-enable-disable-udev.patch \ file://0001-qemu-Do-not-include-file-if-not-exists.patch \ - file://find_datadir.patch \ - file://usb-fix-setup_len-init.patch \ - file://0001-target-mips-Increase-number-of-TLB-entries-on-the-34.patch \ - file://CVE-2020-24352.patch \ - file://CVE-2020-29129-CVE-2020-29130.patch \ - file://CVE-2020-25624.patch \ - file://CVE-2020-25723.patch \ - file://CVE-2020-28916.patch \ + file://mingwfix.patch \ + file://mmap.patch \ + file://mmap2.patch \ + file://determinism.patch \ + file://0001-tests-meson.build-use-relative-path-to-refer-to-file.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5" +SRC_URI[sha256sum] = "cb18d889b628fbe637672b0326789d9b0e3b8027e0445b936537c78549df17bc" + +SRC_URI_append_class-target = " file://cross.patch" +SRC_URI_append_class-nativesdk = " file://cross.patch" COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" @@ -54,21 +50,17 @@ do_install_append() { if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi } -do_compile_ptest() { - make buildtest-TESTS -} - do_install_ptest() { cp -rL ${B}/tests ${D}${PTEST_PATH} - find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcod]" | xargs -i rm -rf {} + find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcodp]" | xargs -i rm -rf {} - cp ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests # Don't check the file genreated by configure - sed -i -e '/wildcard config-host.mak/d' \ - -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include sed -i -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash," ${D}${PTEST_PATH}/tests/data/acpi/disassemle-aml.sh + + # Strip the paths from the QEMU variable, we can use PATH + sed -i -e "s#^QEMU=.*/qemu-#QEMU=qemu-#g" ${D}${PTEST_PATH}/tests/tcg/*.mak } # QEMU_TARGETS is overridable variable @@ -85,13 +77,14 @@ EXTRA_OECONF = " \ --sysconfdir=${sysconfdir} \ --libexecdir=${libexecdir} \ --localstatedir=${localstatedir} \ - --with-confsuffix=/${BPN} \ + --with-suffix=${BPN} \ --disable-strip \ --disable-werror \ --extra-cflags='${CFLAGS}' \ --extra-ldflags='${LDFLAGS}' \ --with-git=/bin/false \ --disable-git-update \ + --meson=meson \ ${PACKAGECONFIG_CONFARGS} \ " @@ -99,7 +92,7 @@ export LIBTOOL="${HOST_SYS}-libtool" B = "${WORKDIR}/build" -EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" +#EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" do_configure_prepend_class-native() { # Append build host pkg-config paths for native target since the host may provide sdl diff --git a/poky/meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch b/poky/meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch index 1304ee3bf..c99adee8a 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch +++ b/poky/meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch @@ -12,11 +12,11 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> configure | 4 ++++ 1 file changed, 4 insertions(+) -Index: qemu-5.1.0/configure +Index: qemu-5.2.0/configure =================================================================== ---- qemu-5.1.0.orig/configure -+++ qemu-5.1.0/configure -@@ -1640,6 +1640,10 @@ for opt do +--- qemu-5.2.0.orig/configure ++++ qemu-5.2.0/configure +@@ -1525,6 +1525,10 @@ for opt do ;; --disable-libdaxctl) libdaxctl=no ;; diff --git a/poky/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch b/poky/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch index 46c9da08a..8ce12bdb4 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch +++ b/poky/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch @@ -20,11 +20,11 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> hw/usb/dev-wacom.c | 94 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) -Index: qemu-5.1.0/hw/usb/dev-wacom.c +Index: qemu-5.2.0/hw/usb/dev-wacom.c =================================================================== ---- qemu-5.1.0.orig/hw/usb/dev-wacom.c -+++ qemu-5.1.0/hw/usb/dev-wacom.c -@@ -74,6 +74,89 @@ static const USBDescStrings desc_strings +--- qemu-5.2.0.orig/hw/usb/dev-wacom.c ++++ qemu-5.2.0/hw/usb/dev-wacom.c +@@ -69,6 +69,89 @@ static const USBDescStrings desc_strings [STR_SERIALNUMBER] = "1", }; @@ -114,16 +114,16 @@ Index: qemu-5.1.0/hw/usb/dev-wacom.c static const USBDescIface desc_iface_wacom = { .bInterfaceNumber = 0, .bNumEndpoints = 1, -@@ -91,7 +174,7 @@ static const USBDescIface desc_iface_wac +@@ -86,7 +169,7 @@ static const USBDescIface desc_iface_wac 0x00, /* u8 country_code */ 0x01, /* u8 num_descriptors */ - 0x22, /* u8 type: Report */ + USB_DT_REPORT, /* u8 type: Report */ - 0x6e, 0, /* u16 len */ -+ sizeof(qemu_tablet_hid_report_descriptor), 0, /* u16 len */ ++ sizeof(qemu_tablet_hid_report_descriptor), 0, /* u16 len */ }, }, }, -@@ -271,6 +354,15 @@ static void usb_wacom_handle_control(USB +@@ -266,6 +349,15 @@ static void usb_wacom_handle_control(USB } switch (request) { diff --git a/poky/meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch b/poky/meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch index d6c0f9ebe..3fe9aa6eb 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch +++ b/poky/meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch @@ -15,10 +15,10 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> linux-user/syscall.c | 2 ++ 1 file changed, 2 insertions(+) -Index: qemu-5.1.0/linux-user/syscall.c +Index: qemu-5.2.0/linux-user/syscall.c =================================================================== ---- qemu-5.1.0.orig/linux-user/syscall.c -+++ qemu-5.1.0/linux-user/syscall.c +--- qemu-5.2.0.orig/linux-user/syscall.c ++++ qemu-5.2.0/linux-user/syscall.c @@ -109,7 +109,9 @@ #include <linux/blkpg.h> #include <netpacket/packet.h> @@ -28,4 +28,4 @@ Index: qemu-5.1.0/linux-user/syscall.c +#endif #include <linux/rtc.h> #include <sound/asound.h> - #ifdef HAVE_DRM_H + #ifdef CONFIG_BTRFS diff --git a/poky/meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch b/poky/meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch new file mode 100644 index 000000000..5cb5757c3 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch @@ -0,0 +1,34 @@ +From a4bdc0416134477e4eae386db04b1de7491163bb Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 14 Jan 2021 06:33:04 +0000 +Subject: [PATCH] tests/meson.build: use relative path to refer to files + +Fix error like: +Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long + +when build path is too long, use meson.source_root() will make this +filename too long. Fixed by using relative path to refer to files + +Upstream-Status: Submitted [send to qemu-devel] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + tests/meson.build | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index afeb6be..54684b5 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -113,7 +113,7 @@ tests = { + 'test-keyval': [testqapi], + 'test-logging': [], + 'test-uuid': [], +- 'ptimer-test': ['ptimer-test-stubs.c', meson.source_root() / 'hw/core/ptimer.c'], ++ 'ptimer-test': ['ptimer-test-stubs.c', '../hw/core/ptimer.c'], + 'test-qapi-util': [], + } + +-- +2.29.2 + diff --git a/poky/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/poky/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 33cef4221..fd54f96b0 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/poky/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -18,11 +18,11 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> hw/mips/malta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: qemu-5.1.0/hw/mips/malta.c +Index: qemu-5.2.0/hw/mips/malta.c =================================================================== ---- qemu-5.1.0.orig/hw/mips/malta.c -+++ qemu-5.1.0/hw/mips/malta.c -@@ -59,7 +59,7 @@ +--- qemu-5.2.0.orig/hw/mips/malta.c ++++ qemu-5.2.0/hw/mips/malta.c +@@ -62,7 +62,7 @@ #define ENVP_ADDR 0x80002000l #define ENVP_NB_ENTRIES 16 diff --git a/poky/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch b/poky/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch index 71f537f9b..a0bd1c5eb 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch +++ b/poky/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch @@ -12,11 +12,11 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> configure | 9 --------- 1 file changed, 9 deletions(-) -Index: qemu-5.1.0/configure +Index: qemu-5.2.0/configure =================================================================== ---- qemu-5.1.0.orig/configure -+++ qemu-5.1.0/configure -@@ -5751,15 +5751,6 @@ fi +--- qemu-5.2.0.orig/configure ++++ qemu-5.2.0/configure +@@ -5001,15 +5001,6 @@ fi # check if we have valgrind/valgrind.h valgrind_h=no diff --git a/poky/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/poky/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch index 98fd5e913..201125c1f 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch +++ b/poky/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch @@ -51,11 +51,11 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> qapi/char.json | 5 +++ 3 files changed, 109 insertions(+) -Index: qemu-5.1.0/chardev/char-socket.c +Index: qemu-5.2.0/chardev/char-socket.c =================================================================== ---- qemu-5.1.0.orig/chardev/char-socket.c -+++ qemu-5.1.0/chardev/char-socket.c -@@ -1292,6 +1292,67 @@ static bool qmp_chardev_validate_socket( +--- qemu-5.2.0.orig/chardev/char-socket.c ++++ qemu-5.2.0/chardev/char-socket.c +@@ -1308,6 +1308,67 @@ static bool qmp_chardev_validate_socket( return true; } @@ -123,7 +123,7 @@ Index: qemu-5.1.0/chardev/char-socket.c static void qmp_chardev_open_socket(Chardev *chr, ChardevBackend *backend, -@@ -1300,6 +1361,9 @@ static void qmp_chardev_open_socket(Char +@@ -1316,6 +1377,9 @@ static void qmp_chardev_open_socket(Char { SocketChardev *s = SOCKET_CHARDEV(chr); ChardevSocket *sock = backend->u.socket.data; @@ -133,7 +133,7 @@ Index: qemu-5.1.0/chardev/char-socket.c bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; bool is_listen = sock->has_server ? sock->server : true; bool is_telnet = sock->has_telnet ? sock->telnet : false; -@@ -1365,6 +1429,14 @@ static void qmp_chardev_open_socket(Char +@@ -1381,6 +1445,14 @@ static void qmp_chardev_open_socket(Char update_disconnected_filename(s); @@ -148,15 +148,17 @@ Index: qemu-5.1.0/chardev/char-socket.c if (s->is_listen) { if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, is_waitconnect, errp) < 0) { -@@ -1384,11 +1456,27 @@ static void qemu_chr_parse_socket(QemuOp +@@ -1400,6 +1472,9 @@ static void qemu_chr_parse_socket(QemuOp const char *host = qemu_opt_get(opts, "host"); const char *port = qemu_opt_get(opts, "port"); const char *fd = qemu_opt_get(opts, "fd"); +#ifndef _WIN32 + const char *cmd = qemu_opt_get(opts, "cmd"); +#endif + #ifdef CONFIG_LINUX bool tight = qemu_opt_get_bool(opts, "tight", true); bool abstract = qemu_opt_get_bool(opts, "abstract", false); +@@ -1407,6 +1482,20 @@ static void qemu_chr_parse_socket(QemuOp SocketAddressLegacy *addr; ChardevSocket *sock; @@ -173,19 +175,19 @@ Index: qemu-5.1.0/chardev/char-socket.c + } + } else +#endif ++ if ((!!path + !!fd + !!host) != 1) { error_setg(errp, "Exactly one of 'path', 'fd' or 'host' required"); -@@ -1431,12 +1519,24 @@ static void qemu_chr_parse_socket(QemuOp +@@ -1448,13 +1537,24 @@ static void qemu_chr_parse_socket(QemuOp + sock->tls_creds = g_strdup(qemu_opt_get(opts, "tls-creds")); sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); - -- addr = g_new0(SocketAddressLegacy, 1); +#ifndef _WIN32 + sock->cmd = g_strdup(cmd); +#endif -+ -+ addr = g_new0(SocketAddressLegacy, 1); + + addr = g_new0(SocketAddressLegacy, 1); +#ifndef _WIN32 + if (path || cmd) { +#else @@ -199,14 +201,14 @@ Index: qemu-5.1.0/chardev/char-socket.c +#else q_unix->path = g_strdup(path); +#endif + #ifdef CONFIG_LINUX + q_unix->has_tight = true; q_unix->tight = tight; - q_unix->abstract = abstract; - } else if (host) { -Index: qemu-5.1.0/chardev/char.c +Index: qemu-5.2.0/chardev/char.c =================================================================== ---- qemu-5.1.0.orig/chardev/char.c -+++ qemu-5.1.0/chardev/char.c -@@ -826,6 +826,9 @@ QemuOptsList qemu_chardev_opts = { +--- qemu-5.2.0.orig/chardev/char.c ++++ qemu-5.2.0/chardev/char.c +@@ -839,6 +839,9 @@ QemuOptsList qemu_chardev_opts = { .name = "path", .type = QEMU_OPT_STRING, },{ @@ -216,10 +218,10 @@ Index: qemu-5.1.0/chardev/char.c .name = "host", .type = QEMU_OPT_STRING, },{ -Index: qemu-5.1.0/qapi/char.json +Index: qemu-5.2.0/qapi/char.json =================================================================== ---- qemu-5.1.0.orig/qapi/char.json -+++ qemu-5.1.0/qapi/char.json +--- qemu-5.2.0.orig/qapi/char.json ++++ qemu-5.2.0/qapi/char.json @@ -250,6 +250,10 @@ # # @addr: socket address to listen on (server=true) diff --git a/poky/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch b/poky/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch index 034ac5782..294cf5129 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch +++ b/poky/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch @@ -29,11 +29,11 @@ Signed-off-by: He Zhe <zhe.he@windriver.com> hw/intc/apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: qemu-5.1.0/hw/intc/apic.c +Index: qemu-5.2.0/hw/intc/apic.c =================================================================== ---- qemu-5.1.0.orig/hw/intc/apic.c -+++ qemu-5.1.0/hw/intc/apic.c -@@ -603,7 +603,7 @@ int apic_accept_pic_intr(DeviceState *de +--- qemu-5.2.0.orig/hw/intc/apic.c ++++ qemu-5.2.0/hw/intc/apic.c +@@ -605,7 +605,7 @@ int apic_accept_pic_intr(DeviceState *de APICCommonState *s = APIC(dev); uint32_t lvt0; diff --git a/poky/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/poky/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch index d7e3fffdd..c5d206b91 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/poky/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -14,11 +14,11 @@ Signed-off-by: He Zhe <zhe.he@windriver.com> configure | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) -Index: qemu-5.1.0/configure +Index: qemu-5.2.0/configure =================================================================== ---- qemu-5.1.0.orig/configure -+++ qemu-5.1.0/configure -@@ -3084,6 +3084,30 @@ has_libgcrypt() { +--- qemu-5.2.0.orig/configure ++++ qemu-5.2.0/configure +@@ -2956,6 +2956,30 @@ has_libgcrypt() { return 0 } @@ -49,7 +49,7 @@ Index: qemu-5.1.0/configure if test "$nettle" != "no"; then pass="no" -@@ -3124,7 +3148,14 @@ fi +@@ -2994,7 +3018,14 @@ fi if test "$gcrypt" != "no"; then pass="no" @@ -65,7 +65,7 @@ Index: qemu-5.1.0/configure gcrypt_cflags=$(libgcrypt-config --cflags) gcrypt_libs=$(libgcrypt-config --libs) # Debian has removed -lgpg-error from libgcrypt-config -@@ -3134,15 +3165,16 @@ if test "$gcrypt" != "no"; then +@@ -3004,12 +3035,12 @@ if test "$gcrypt" != "no"; then then gcrypt_libs="$gcrypt_libs -lgpg-error" fi @@ -74,18 +74,11 @@ Index: qemu-5.1.0/configure - # Link test to make sure the given libraries work (e.g for static). - write_c_skeleton - if compile_prog "" "$gcrypt_libs" ; then -- LIBS="$gcrypt_libs $LIBS" -- QEMU_CFLAGS="$QEMU_CFLAGS $gcrypt_cflags" -- pass="yes" -- fi + # Link test to make sure the given libraries work (e.g for static). + write_c_skeleton + if compile_prog "" "$gcrypt_libs" ; then -+ LIBS="$gcrypt_libs $LIBS" -+ QEMU_CFLAGS="$QEMU_CFLAGS $gcrypt_cflags" -+ pass="yes" + pass="yes" +- fi fi -+ if test "$pass" = "yes"; then gcrypt="yes" - cat > $TMPC << EOF diff --git a/poky/meta/recipes-devtools/qemu/qemu/cross.patch b/poky/meta/recipes-devtools/qemu/qemu/cross.patch new file mode 100644 index 000000000..438c1ad08 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/cross.patch @@ -0,0 +1,30 @@ +We need to be able to trigger configure's cross code but we don't want +to set cross_prefix as it does other things we don't want. Patch things +so we can do what we need in the target config case. + +Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + + +Index: qemu-5.2.0/configure +=================================================================== +--- qemu-5.2.0.orig/configure ++++ qemu-5.2.0/configure +@@ -6973,7 +6973,6 @@ if has $sdl2_config; then + fi + echo "strip = [$(meson_quote $strip)]" >> $cross + echo "windres = [$(meson_quote $windres)]" >> $cross +-if test -n "$cross_prefix"; then + cross_arg="--cross-file config-meson.cross" + echo "[host_machine]" >> $cross + if test "$mingw32" = "yes" ; then +@@ -6999,9 +6998,6 @@ if test -n "$cross_prefix"; then + else + echo "endian = 'little'" >> $cross + fi +-else +- cross_arg="--native-file config-meson.cross" +-fi + mv $cross config-meson.cross + + rm -rf meson-private meson-info meson-logs diff --git a/poky/meta/recipes-devtools/qemu/qemu/determinism.patch b/poky/meta/recipes-devtools/qemu/qemu/determinism.patch new file mode 100644 index 000000000..cb1c90777 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/determinism.patch @@ -0,0 +1,41 @@ +When sources are included within debug information, a couple of areas of the +qemu build are not reproducible due to either full buildpaths or timestamps. + +Replace the full paths with relative ones. I couldn't figure out how to get +meson to pass relative paths but we can fix that in the script. + +For the keymaps, omit the timestamps as they don't matter to us. + +Upstream-Status: Pending [some version of all/part of this may be accepted] +RP 2021/3/1 + +Index: qemu-5.2.0/scripts/decodetree.py +=================================================================== +--- qemu-5.2.0.orig/scripts/decodetree.py ++++ qemu-5.2.0/scripts/decodetree.py +@@ -1303,8 +1303,8 @@ def main(): + toppat = ExcMultiPattern(0) + + for filename in args: +- input_file = filename +- f = open(filename, 'r') ++ input_file = os.path.relpath(filename) ++ f = open(input_file, 'r') + parse_file(f, toppat) + f.close() + +Index: qemu-5.2.0/ui/keycodemapdb/tools/keymap-gen +=================================================================== +--- qemu-5.2.0.orig/ui/keycodemapdb/tools/keymap-gen ++++ qemu-5.2.0/ui/keycodemapdb/tools/keymap-gen +@@ -317,9 +317,8 @@ class LanguageGenerator(object): + raise NotImplementedError() + + def generate_header(self, database, args): +- today = time.strftime("%Y-%m-%d %H:%M") + self._boilerplate([ +- "This file is auto-generated from keymaps.csv on %s" % today, ++ "This file is auto-generated from keymaps.csv", + "Database checksum sha256(%s)" % database.mapchecksum, + "To re-generate, run:", + " %s" % args, diff --git a/poky/meta/recipes-devtools/qemu/qemu/mingwfix.patch b/poky/meta/recipes-devtools/qemu/qemu/mingwfix.patch new file mode 100644 index 000000000..8d76cef63 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/mingwfix.patch @@ -0,0 +1,21 @@ +OE assumes that mingw files are in a unix like file layout. The +'flattening' done by configure in qemu for mingw32 breaks things +for us. We are discussing with upstream but for now, hack this to +disable it and use the unix like layout everywhere. + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01073.html] + +Index: qemu-5.2.0/configure +=================================================================== +--- qemu-5.2.0.orig/configure ++++ qemu-5.2.0/configure +@@ -1541,7 +1541,7 @@ libdir="${libdir:-$prefix/lib}" + libexecdir="${libexecdir:-$prefix/libexec}" + includedir="${includedir:-$prefix/include}" + +-if test "$mingw32" = "yes" ; then ++if test "$mingw32" = "dontwantthis" ; then + mandir="$prefix" + datadir="$prefix" + docdir="$prefix" diff --git a/poky/meta/recipes-devtools/qemu/qemu/mmap.patch b/poky/meta/recipes-devtools/qemu/qemu/mmap.patch new file mode 100644 index 000000000..edd9734f3 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/mmap.patch @@ -0,0 +1,29 @@ +If mremap() is called without the MREMAP_MAYMOVE flag with a start address +just before the end of memory (reserved_va) where new_size would exceed +GUEST_ADD_MAX, the assert(end - 1 <= GUEST_ADDR_MAX) in page_set_flags() +would trigger. + +Add an extra guard to the guest_range_valid() checks to prevent this and +avoid asserting binaries when reserved_va is set. + +This meant a test case now gives the same behaviour regardless of whether +reserved_va is set or not. + +Upstream-Status: Backport [https://github.com/qemu/qemu/commit/ccc5ccc17f8cfbfd87d9aede5d12a2d47c56e712] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org + +Index: qemu-5.2.0/linux-user/mmap.c +=================================================================== +--- qemu-5.2.0.orig/linux-user/mmap.c ++++ qemu-5.2.0/linux-user/mmap.c +@@ -727,7 +727,9 @@ abi_long target_mremap(abi_ulong old_add + + if (!guest_range_valid(old_addr, old_size) || + ((flags & MREMAP_FIXED) && +- !guest_range_valid(new_addr, new_size))) { ++ !guest_range_valid(new_addr, new_size)) || ++ ((flags & MREMAP_MAYMOVE) == 0 && ++ !guest_range_valid(old_addr, new_size))) { + errno = ENOMEM; + return -1; + } diff --git a/poky/meta/recipes-devtools/qemu/qemu/mmap2.patch b/poky/meta/recipes-devtools/qemu/qemu/mmap2.patch new file mode 100644 index 000000000..165213175 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/mmap2.patch @@ -0,0 +1,40 @@ +When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an +infinite loop of mremap calls of ever decreasing/increasing addresses. + +I suspect something in the musl memory allocation code loops indefinitely +if it only sees ENOMEM and only exits when it hits EFAULT. + +According to the docs, trying to mremap outside the address space +can/should return EFAULT and changing this allows the build to succeed. + +A better return value for the other cases of invalid addresses is EINVAL +rather than ENOMEM so adjust the other part of the test to this. + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org + +Index: qemu-5.2.0/linux-user/mmap.c +=================================================================== +--- qemu-5.2.0.orig/linux-user/mmap.c ++++ qemu-5.2.0/linux-user/mmap.c +@@ -722,12 +722,14 @@ abi_long target_mremap(abi_ulong old_add + int prot; + void *host_addr; + +- if (!guest_range_valid(old_addr, old_size) || +- ((flags & MREMAP_FIXED) && +- !guest_range_valid(new_addr, new_size)) || +- ((flags & MREMAP_MAYMOVE) == 0 && +- !guest_range_valid(old_addr, new_size))) { +- errno = ENOMEM; ++ if (!guest_range_valid(old_addr, old_size)) { ++ errno = EFAULT; ++ return -1; ++ } ++ ++ if (((flags & MREMAP_FIXED) && !guest_range_valid(new_addr, new_size)) || ++ ((flags & MREMAP_MAYMOVE) == 0 && !guest_range_valid(old_addr, new_size))) { ++ errno = EINVAL; + return -1; + } + diff --git a/poky/meta/recipes-devtools/qemu/qemu/run-ptest b/poky/meta/recipes-devtools/qemu/qemu/run-ptest index b25a792d4..f9a4e8fb2 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/run-ptest +++ b/poky/meta/recipes-devtools/qemu/qemu/run-ptest @@ -7,4 +7,7 @@ ptestdir=$(dirname "$(readlink -f "$0")") export SRC_PATH=$ptestdir cd $ptestdir/tests -make -f Makefile.include -k runtest-TESTS | sed '/^ok /s/ok /PASS: /g' +tests=$(find . -name "test-*" ! -name "*.p") +for f in $tests; do + $f | sed '/^ok/ s/ok/PASS:/g' +done diff --git a/poky/meta/recipes-devtools/qemu/qemu_5.1.0.bb b/poky/meta/recipes-devtools/qemu/qemu_5.2.0.bb index 599ff82fc..7afa66e39 100644 --- a/poky/meta/recipes-devtools/qemu/qemu_5.1.0.bb +++ b/poky/meta/recipes-devtools/qemu/qemu_5.2.0.bb @@ -6,7 +6,7 @@ require qemu.inc # void (*_function)(sigval_t); COMPATIBLE_HOST_libc-musl = 'null' -DEPENDS = "glib-2.0 zlib pixman bison-native" +DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" RDEPENDS_${PN}_class-target += "bash" diff --git a/poky/meta/recipes-devtools/quilt/quilt.inc b/poky/meta/recipes-devtools/quilt/quilt.inc index d6d06c049..d7ecda7aa 100644 --- a/poky/meta/recipes-devtools/quilt/quilt.inc +++ b/poky/meta/recipes-devtools/quilt/quilt.inc @@ -30,7 +30,7 @@ EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" EXTRA_OECONF_append_class-native = " --disable-nls" EXTRA_AUTORECONF += "--exclude=aclocal" -CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" +CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash ac_cv_path_COLUMN=column" # Make sure we don't have "-w" in shebang lines: it breaks using # "/usr/bin/env perl" as parser diff --git a/poky/meta/recipes-devtools/rsync/files/determism.patch b/poky/meta/recipes-devtools/rsync/files/determism.patch new file mode 100644 index 000000000..e3494fdde --- /dev/null +++ b/poky/meta/recipes-devtools/rsync/files/determism.patch @@ -0,0 +1,34 @@ +The Makefile calls awk on a "*.c" glob. The results of this glob are sorted +but the order depends on the locale settings, particularly whether +"util.c" and "util2.c" sort before or after each other. In en_US.UTF-8 +they sort one way, in C, they sort the other. The sorting order changes +the output binaries. The behaviour also changes dependning on whether +SHELL (/bin/sh) is dash or bash. + +Specify a C locale setting to be deterministic. + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Submitted: https://github.com/WayneD/rsync/pull/155 + +Upstream-Status: Backport [ish, see below] + +After discussion upstream renamed util.c to util1.c which avoids the problem +in a different way. This patch can be dropped when we upgrade to include: +https://github.com/WayneD/rsync/commit/d3085f7add38a5cf833a0b31cb0637ff46c80f8d + +Index: rsync-3.2.3/Makefile.in +=================================================================== +--- rsync-3.2.3.orig/Makefile.in ++++ rsync-3.2.3/Makefile.in +@@ -26,6 +26,11 @@ MKDIR_P=@MKDIR_P@ + VPATH=$(srcdir) + SHELL=/bin/sh + ++# We use globbing in commands, need to be deterministic ++unexport LC_ALL ++LC_COLLATE=C ++export LC_COLLATE ++ + .SUFFIXES: + .SUFFIXES: .c .o + diff --git a/poky/meta/recipes-devtools/rsync/rsync_3.2.3.bb b/poky/meta/recipes-devtools/rsync/rsync_3.2.3.bb index b7205e5bd..8b36a8ebd 100644 --- a/poky/meta/recipes-devtools/rsync/rsync_3.2.3.bb +++ b/poky/meta/recipes-devtools/rsync/rsync_3.2.3.bb @@ -1,5 +1,6 @@ SUMMARY = "File synchronization tool" HOMEPAGE = "http://rsync.samba.org/" +DESCRIPTION = "rsync is an open source utility that provides fast incremental file transfer." BUGTRACKER = "http://rsync.samba.org/bugzilla.html" SECTION = "console/network" # GPLv2+ (<< 3.0.0), GPLv3+ (>= 3.0.0) @@ -12,6 +13,7 @@ DEPENDS = "popt" SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ file://rsyncd.conf \ file://makefile-no-rebuild.patch \ + file://determism.patch \ " SRC_URI[sha256sum] = "becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e" @@ -38,7 +40,7 @@ PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd" CACHED_CONFIGUREVARS += "rsync_cv_can_hardlink_special=yes rsync_cv_can_hardlink_symlink=yes" EXTRA_OEMAKE = 'STRIP=""' -EXTRA_OECONF = "--disable-simd --disable-md2man --disable-asm" +EXTRA_OECONF = "--disable-simd --disable-md2man --disable-asm --with-nobody-group=nogroup" # rsync 3.0 uses configure.sh instead of configure, and # makefile checks the existence of configure.sh diff --git a/poky/meta/recipes-devtools/ruby/ruby.inc b/poky/meta/recipes-devtools/ruby/ruby.inc index 7b6d4edc6..1cede8d47 100644 --- a/poky/meta/recipes-devtools/ruby/ruby.inc +++ b/poky/meta/recipes-devtools/ruby/ruby.inc @@ -7,12 +7,11 @@ It is simple, straight-forward, and extensible. \ HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=5b8c87559868796979806100db3f3805 \ - file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ - file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ -" +LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ + file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \ + file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LEGAL;md5=cfe5b0bc9f051b58c7e78db882ca5f9b \ + " DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi" DEPENDS_class-native = "openssl-native libyaml-native readline-native zlib-native" diff --git a/poky/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch b/poky/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch deleted file mode 100644 index f316bed7b..000000000 --- a/poky/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch +++ /dev/null @@ -1,38 +0,0 @@ -From eed7bc855fd8d232d4d203cc9027dd07cee8eca2 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <wangmy@cn.fujitsu.com> -Date: Sat, 8 Feb 2020 15:16:14 +0800 -Subject: [PATCH] Modify shebang of libexec/y2racc and libexec/racc2y. - -change /usr/local/bin/ruby to /usr/bin/env ruby. - -Upstream-Status: Pending - -Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> ---- - libexec/racc2y | 2 +- - libexec/y2racc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libexec/racc2y b/libexec/racc2y -index f88d73ed2c..74e49cfa21 100755 ---- a/libexec/racc2y -+++ b/libexec/racc2y -@@ -1,4 +1,4 @@ --#!/usr/local/bin/ruby -+#!/usr/bin/env ruby - # - # $Id$ - # -diff --git a/libexec/y2racc b/libexec/y2racc -index 7933f94153..36daf864e1 100755 ---- a/libexec/y2racc -+++ b/libexec/y2racc -@@ -1,4 +1,4 @@ --#!/usr/local/bin/ruby -+#!/usr/bin/env ruby - # - # $Id$ - # --- -2.17.1 - diff --git a/poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index b31dee112..4b954e439 100644 --- a/poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -1,27 +1,25 @@ -From 6d608326970b1613633d7715ebb7d628dfcd16ee Mon Sep 17 00:00:00 2001 +From 07fd1ada322eda6c05ac45c08fc814976f31b596 Mon Sep 17 00:00:00 2001 From: Christopher Larson <chris_larson@mentor.com> Date: Thu, 5 May 2016 10:59:07 -0700 -Subject: [PATCH 2/3] Obey LDFLAGS for the link of libruby +Subject: [PATCH] Obey LDFLAGS for the link of libruby Signed-off-by: Christopher Larson <chris_larson@mentor.com> Upstream-Status: Pending + --- template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/Makefile.in b/template/Makefile.in -index fa1e19ef37..bbd07fa34b 100644 +index f5a3149..5cc75ae 100644 --- a/template/Makefile.in +++ b/template/Makefile.in -@@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ - ENABLE_SHARED = @ENABLE_SHARED@ +@@ -114,7 +114,7 @@ ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ DLDSHARED = @DLDSHARED@ + XDLDFLAGS = @DLDFLAGS@ -DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) +DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) SOLIBS = @SOLIBS@ ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ MAINLIBS = @MAINLIBS@ --- -2.23.0.rc1 - diff --git a/poky/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch b/poky/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch index a1e633044..6e90a8ee7 100644 --- a/poky/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch +++ b/poky/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch @@ -1,4 +1,7 @@ -Filter out __has_include* compiler defines +From 303fe0d20184203f1ac86d2a77b1447d47c8c29d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 26 Jan 2020 11:27:40 -0800 +Subject: [PATCH] Filter out __has_include* compiler defines They are internal to compiler and this header is later on includes in C files, but newer gcc >= 10 complains about it. @@ -13,12 +16,18 @@ error in initial header file: Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + common.mk | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/common.mk b/common.mk +index 7633050..422aa9c 100644 --- a/common.mk +++ b/common.mk -@@ -221,6 +221,8 @@ $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT - $(TIMESTAMPDIR)/$(arch)/.time +@@ -233,6 +233,8 @@ $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJE $(ECHO) building $(@F:.time=.h) - $(Q) $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new + $(MINIRUBY) $(tooldir)/mjit_tabs.rb "$(MJIT_TABS)" \ + $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new + $(Q)sed -i -e "/#define __has_include __has_include/d" $(@F:.time=.h).new + $(Q)sed -i -e "/#define __has_include_next __has_include_next/d" $(@F:.time=.h).new $(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new diff --git a/poky/meta/recipes-devtools/ruby/ruby_2.7.2.bb b/poky/meta/recipes-devtools/ruby/ruby_3.0.0.bb index db6d67298..28e12c3cd 100644 --- a/poky/meta/recipes-devtools/ruby/ruby_2.7.2.bb +++ b/poky/meta/recipes-devtools/ruby/ruby_3.0.0.bb @@ -5,12 +5,10 @@ DEPENDS_append_libc-musl = " libucontext" SRC_URI += " \ file://remove_has_include_macros.patch \ file://run-ptest \ - file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \ " -SRC_URI[md5sum] = "2d4a28dcfa38352a627a597f6057c465" -SRC_URI[sha256sum] = "6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4" +SRC_URI[sha256sum] = "a13ed141a1c18eb967aac1e33f4d6ad5f21be1ac543c344e0d6feeee54af8e28" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" @@ -34,6 +32,13 @@ EXTRA_OECONF_append_libc-musl = "\ ac_cv_func_isinf=yes \ " +EXTRA_OECONF_append_libc-musl_riscv64 = "\ + --with-coroutine=copy \ +" +EXTRA_OECONF_append_libc-musl_riscv32 = "\ + --with-coroutine=copy \ +" + do_install() { oe_runmake 'DESTDIR=${D}' install } diff --git a/poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb b/poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb index 85b3fc867..c353d4b79 100644 --- a/poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb +++ b/poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb @@ -1,4 +1,5 @@ SUMMARY = "Runs postinstall scripts on first boot of the target device" +DESCRIPTION = "${SUMMARY}" SECTION = "devel" PR = "r10" LICENSE = "MIT" diff --git a/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index b06951df3..2b1409d78 100644 --- a/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -1,6 +1,8 @@ # Note, we can probably remove the lzma option as it has be replaced with xz, # and I don't think the kernel supports it any more. SUMMARY = "Tools for manipulating SquashFS filesystems" +HOMEPAGE = "https://github.com/plougher/squashfs-tools" +DESCRIPTION = "Tools to create and extract Squashfs filesystems." SECTION = "base" LICENSE = "GPL-2" LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/poky/meta/recipes-devtools/strace/strace/run-ptest b/poky/meta/recipes-devtools/strace/strace/run-ptest index 466020722..3a51fb0be 100755 --- a/poky/meta/recipes-devtools/strace/strace/run-ptest +++ b/poky/meta/recipes-devtools/strace/strace/run-ptest @@ -1,5 +1,5 @@ #!/bin/sh -export TIMEOUT_DURATION=120 +export TIMEOUT_DURATION=240 chown nobody tests chown nobody tests/* chown nobody ../ptest diff --git a/poky/meta/recipes-devtools/strace/strace_5.10.bb b/poky/meta/recipes-devtools/strace/strace_5.10.bb index 22572fb93..17bde082a 100644 --- a/poky/meta/recipes-devtools/strace/strace_5.10.bb +++ b/poky/meta/recipes-devtools/strace/strace_5.10.bb @@ -1,5 +1,6 @@ SUMMARY = "System call tracing tool" HOMEPAGE = "http://strace.io" +DESCRIPTION = "strace is a diagnostic, debugging and instructional userspace utility for Linux. It is used to monitor and tamper with interactions between processes and the Linux kernel, which include system calls, signal deliveries, and changes of process state." SECTION = "console/utils" LICENSE = "LGPL-2.1+ & GPL-2+" LIC_FILES_CHKSUM = "file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c" diff --git a/poky/meta/recipes-devtools/subversion/subversion_1.14.0.bb b/poky/meta/recipes-devtools/subversion/subversion_1.14.1.bb index 452a025fc..0f8a76453 100644 --- a/poky/meta/recipes-devtools/subversion/subversion_1.14.0.bb +++ b/poky/meta/recipes-devtools/subversion/subversion_1.14.1.bb @@ -1,5 +1,6 @@ SUMMARY = "Subversion (svn) version control system client" HOMEPAGE = "http://subversion.apache.org" +DESCRIPTION = "Subversion is an open source version control system." SECTION = "console/network" LICENSE = "Apache-2 & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6487ae7094d359fa90fb9c4096e52e2b" @@ -13,7 +14,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://serfmacro.patch \ " -SRC_URI[sha256sum] = "6ba8e218f9f97a83a799e58a3c6da1221d034b18d9d8cbbcb6ec52ab11722102" +SRC_URI[sha256sum] = "2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9" inherit autotools pkgconfig gettext python3native diff --git a/poky/meta/recipes-devtools/swig/swig/determinism.patch b/poky/meta/recipes-devtools/swig/swig/determinism.patch new file mode 100644 index 000000000..8ffb4bce8 --- /dev/null +++ b/poky/meta/recipes-devtools/swig/swig/determinism.patch @@ -0,0 +1,19 @@ +Remove the compiler commandline/platform from the compiled binary as this +breaks reproducibilty. + +Upstream-Status: Inappropriate [OE reproducibiity fix upstream unlikely to take] +RP 2021/3/1 + + +Index: swig-3.0.12/Source/Modules/main.cxx +=================================================================== +--- swig-3.0.12.orig/Source/Modules/main.cxx ++++ swig-3.0.12/Source/Modules/main.cxx +@@ -636,7 +636,6 @@ void SWIG_getoptions(int argc, char *arg + } + } else if (strcmp(argv[i], "-version") == 0) { + fprintf(stdout, "\nSWIG Version %s\n", Swig_package_version()); +- fprintf(stdout, "\nCompiled with %s [%s]\n", SWIG_CXX, SWIG_PLATFORM); + fprintf(stdout, "\nConfigured options: %cpcre\n", + #ifdef HAVE_PCRE + '+' diff --git a/poky/meta/recipes-devtools/swig/swig_3.0.12.bb b/poky/meta/recipes-devtools/swig/swig_3.0.12.bb index 45026c970..090aaa811 100644 --- a/poky/meta/recipes-devtools/swig/swig_3.0.12.bb +++ b/poky/meta/recipes-devtools/swig/swig_3.0.12.bb @@ -6,6 +6,7 @@ SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.pat file://swig-3.0.12-Coverity-fix-issue-reported-for-SWIG_Python_FixMetho.patch \ file://Python-Fix-new-GCC8-warnings-in-generated-code.patch \ file://0001-Fix-generated-code-for-constant-expressions-containi.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "82133dfa7bba75ff9ad98a7046be687c" SRC_URI[sha256sum] = "7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d" diff --git a/poky/meta/recipes-devtools/syslinux/syslinux/determinism.patch b/poky/meta/recipes-devtools/syslinux/syslinux/determinism.patch new file mode 100644 index 000000000..2fb8c64df --- /dev/null +++ b/poky/meta/recipes-devtools/syslinux/syslinux/determinism.patch @@ -0,0 +1,22 @@ +In order to build deterministic binaries, we need to sort the wildcard expansion +so the libraries are linked in the same order each time. This fixes reproducibility +issues within syslinux builds. + +Upstream-Status: Pending +RP 2021/3/1 + +Index: syslinux-6.04-pre2/mk/lib.mk +=================================================================== +--- syslinux-6.04-pre2.orig/mk/lib.mk ++++ syslinux-6.04-pre2/mk/lib.mk +@@ -130,8 +130,8 @@ LIBENTRY_OBJS = \ + exit.o + + LIBGCC_OBJS = \ +- $(patsubst $(com32)/lib/%.c,%.o,$(wildcard $(com32)/lib/$(ARCH)/libgcc/*.c)) \ +- $(patsubst $(com32)/lib/%.S,%.o,$(wildcard $(com32)/lib/$(ARCH)/libgcc/*.S)) ++ $(sort $(patsubst $(com32)/lib/%.c,%.o,$(wildcard $(com32)/lib/$(ARCH)/libgcc/*.c))) \ ++ $(sort $(patsubst $(com32)/lib/%.S,%.o,$(wildcard $(com32)/lib/$(ARCH)/libgcc/*.S))) + + LIBCONSOLE_OBJS = \ + \ 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 1b0b45f2f..dadba9eca 100644 --- a/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +++ b/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb @@ -1,5 +1,6 @@ SUMMARY = "Multi-purpose linux bootloader" HOMEPAGE = "http://www.syslinux.org/" +DESCRIPTION = "The Syslinux Project covers lightweight bootloaders for MS-DOS FAT filesystems (SYSLINUX), network booting (PXELINUX), bootable "El Torito" CD-ROMs (ISOLINUX), and Linux ext2/ext3/ext4 or btrfs filesystems (EXTLINUX). The project also includes MEMDISK, a tool to boot legacy operating systems (such as DOS) from nontraditional media; it is usually used in conjunction with PXELINUX and ISOLINUX." LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://README;beginline=35;endline=41;md5=558f2c71cb1fb9ba511ccd4858e48e8a" @@ -19,11 +20,16 @@ SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz file://0009-linux-syslinux-implement-install_bootblock.patch \ file://0010-Workaround-multiple-definition-of-symbol-errors.patch \ file://0001-install-don-t-install-obsolete-file-com32.ld.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "2b31c78f087f99179feb357da312d7ec" SRC_URI[sha256sum] = "4441a5d593f85bb6e8d578cf6653fb4ec30f9e8f4a2315a3d8f2d0a8b3fadf94" +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" + RECIPE_NO_UPDATE_REASON = "6.04-pre3 is broken" UPSTREAM_CHECK_URI = "https://www.zytor.com/pub/syslinux/" UPSTREAM_CHECK_REGEX = "syslinux-(?P<pver>.+)\.tar" @@ -43,6 +49,8 @@ TARGET_LDFLAGS = "" SECURITY_LDFLAGS = "" LDFLAGS_SECTION_REMOVAL = "" +CFLAGS_append = " -DNO_INLINE_FUNCS" + EXTRA_OEMAKE = " \ BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \ DATADIR=${datadir} MANDIR=${mandir} INCDIR=${includedir} \ diff --git a/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/no_lto.patch b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/no_lto.patch new file mode 100644 index 000000000..1fdf8dbcc --- /dev/null +++ b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/no_lto.patch @@ -0,0 +1,19 @@ +LTO output is not reproducible. Until it is, disable this. Sadly +there is no configuration option to do so at this time. + +Upstream-Status: Pending [may be accept addition of configuration option?] +RP 2021/3/1 + +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac ++++ git/configure.ac +@@ -124,7 +124,7 @@ AS_CASE([$CC], [*clang*], + + AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], + [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ +- -flto -ffat-lto-objects])], ++ ])], + [AC_MSG_RESULT([skipping -flto, optimization not enabled])]) + AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags") + diff --git a/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb index 4c857c3fd..905a0cbb7 100644 --- a/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb +++ b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb @@ -1,3 +1,9 @@ +SUMMARY = "Boot performance graphing tool" +DESCRIPTION = "For systemd-bootchart, several proc debug interfaces are required in the kernel config: \ + CONFIG_SCHEDSTATS \ +below is optional, for additional info: \ + CONFIG_SCHED_DEBUG" +HOMEPAGE = "https://github.com/systemd/systemd-bootchart" LICENSE = "LGPLv2.1 & GPLv2" LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \ file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe" @@ -5,6 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https \ file://0001-architecture-Recognise-RISCV-32-RISCV-64.patch \ file://mips64.patch \ + file://no_lto.patch \ " SRC_URI_append_libc-musl = " \ diff --git a/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index ed14fe66b..854269a0f 100644 --- a/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -1,5 +1,6 @@ SUMMARY = "Target Communication Framework for the Eclipse IDE" HOMEPAGE = "http://wiki.eclipse.org/TCF" +DESCRIPTION = "TCF is a vendor-neutral, lightweight, extensible network protocol mainly for communicating with embedded systems (targets)." BUGTRACKER = "https://bugs.eclipse.org/bugs/" LICENSE = "EPL-1.0 | EDL-1.0" @@ -48,6 +49,7 @@ CFLAGS_append_libc-musl = " ${LCL_STOP_SERVICES}" CFLAGS_append_powerpc64 = " ${LCL_STOP_SERVICES}" CFLAGS_append_powerpc64le = " ${LCL_STOP_SERVICES}" CFLAGS_append_riscv64 = " ${LCL_STOP_SERVICES}" +CFLAGS_append_riscv32 = " ${LCL_STOP_SERVICES}" do_install() { oe_runmake install INSTALLROOT=${D} diff --git a/poky/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch b/poky/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch deleted file mode 100644 index 3cd34155e..000000000 --- a/poky/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f7fa48c4c75a1e748dc5071e709c0b62ff739eaa Mon Sep 17 00:00:00 2001 -From: "jan.nijtmans" <nijtmans@users.sourceforge.net> -Date: Mon, 9 Dec 2019 10:02:20 +0000 -Subject: [PATCH] Fix [abd4abedd2]: Failed to build tk 8.6.10 with cross - compile - -Upstream-Status: Backport -[https://github.com/tcltk/tcl/commit/f7fa48c4c75a1e748dc5071e709c0b62ff739eaa] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - compat/strtol.c | 2 +- - compat/strtoul.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/compat/strtol.c b/compat/strtol.c -index b7f69196c..811006a64 100644 ---- a/compat/strtol.c -+++ b/compat/strtol.c -@@ -53,7 +53,7 @@ strtol( - */ - - p = string; -- while (TclIsSpaceProc(*p)) { -+ while (isspace(UCHAR(*p))) { - p += 1; - } - -diff --git a/compat/strtoul.c b/compat/strtoul.c -index e37eb05f8..15587f1da 100644 ---- a/compat/strtoul.c -+++ b/compat/strtoul.c -@@ -74,7 +74,7 @@ strtoul( - */ - - p = string; -- while (TclIsSpaceProc(*p)) { -+ while (isspace(UCHAR(*p))) { - p += 1; - } - if (*p == '-') { --- -2.17.1 - diff --git a/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch index 86632d914..66c395d40 100644 --- a/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch +++ b/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch @@ -1,4 +1,4 @@ -Lets install the include header and private header files into +Lets install the include header and private header files into usr/include/tcl8.6 when version of tcl is 8.6.x Upstream-Status: Inappropriate [Configuration Specific] @@ -9,18 +9,19 @@ Fixed the TCL_INCLUDE_SPEC Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + --- - Makefile.in | 2 +- - configure | 4 ++-- - configure.in | 4 ++-- + Makefile.in | 2 +- + configure | 4 ++-- + configure.in | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 97b983b..dc2a4df 100644 +index 0370491..daa569a 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -53,7 +53,7 @@ DLL_INSTALL_DIR = @DLL_INSTALL_DIR@ - SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) +@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) + MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8 # Directory in which to install the include file tcl.h: -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) @@ -29,10 +30,10 @@ index 97b983b..dc2a4df 100644 # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ diff --git a/configure b/configure -index 3e78b49..24b3f92 100755 +index 181b9b3..f4cc225 100755 --- a/configure +++ b/configure -@@ -19134,7 +19134,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" +@@ -10166,7 +10166,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' @@ -41,7 +42,7 @@ index 3e78b49..24b3f92 100755 HTML_DIR='$(DISTDIR)/html' # Note: in the following variable, it's important to use the absolute -@@ -19293,7 +19293,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" +@@ -10323,7 +10323,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" # Install time header dir can be set via --includedir @@ -51,10 +52,10 @@ index 3e78b49..24b3f92 100755 #------------------------------------------------------------------------ # tclConfig.sh refers to this by a different name diff --git a/configure.in b/configure.in -index 0e28b14..62d9b41 100755 +index 9f96e2b..e323e02 100644 --- a/configure.in +++ b/configure.in -@@ -791,7 +791,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" +@@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' @@ -63,7 +64,7 @@ index 0e28b14..62d9b41 100755 HTML_DIR='$(DISTDIR)/html' # Note: in the following variable, it's important to use the absolute -@@ -912,7 +912,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" +@@ -894,7 +894,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" # Install time header dir can be set via --includedir @@ -73,5 +74,5 @@ index 0e28b14..62d9b41 100755 #------------------------------------------------------------------------ # tclConfig.sh refers to this by a different name -- -1.7.10.4 +2.25.1 diff --git a/poky/meta/recipes-devtools/tcltk/tcl_8.6.10.bb b/poky/meta/recipes-devtools/tcltk/tcl_8.6.11.bb index e6feb25a7..efb36b32d 100644 --- a/poky/meta/recipes-devtools/tcltk/tcl_8.6.10.bb +++ b/poky/meta/recipes-devtools/tcltk/tcl_8.6.11.bb @@ -1,5 +1,6 @@ SUMMARY = "Tool Command Language" HOMEPAGE = "http://tcl.sourceforge.net" +DESCRIPTION = "Tool Command Language, is an open-source multi-purpose C library which includes a powerful dynamic scripting language. Together they provide ideal cross-platform development environment for any programming project." SECTION = "devel/tcltk" # http://www.tcl.tk/software/tcltk/license.html @@ -22,11 +23,9 @@ SRC_URI = "${BASE_SRC_URI} \ file://no_packages.patch \ file://tcl-remove-hardcoded-install-path.patch \ file://alter-includedir.patch \ - file://0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch;patchdir=.. \ file://run-ptest \ " -SRC_URI[md5sum] = "97c55573f8520bcab74e21bfd8d0aadc" -SRC_URI[sha256sum] = "5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed" +SRC_URI[sha256sum] = "8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258" SRC_URI_class-native = "${BASE_SRC_URI}" @@ -71,7 +70,6 @@ ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3" # isn't getting picked up by shlibs code RDEPENDS_${PN} += "tcl-lib" -RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}-ptest += "libgcc" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/unfs3/unfs3/no-yywrap.patch b/poky/meta/recipes-devtools/unfs3/unfs3/no-yywrap.patch new file mode 100644 index 000000000..e0746ad51 --- /dev/null +++ b/poky/meta/recipes-devtools/unfs3/unfs3/no-yywrap.patch @@ -0,0 +1,12 @@ +diff --git a/Config/exports.l b/Config/exports.l +index 662603c..7e7c4fc 100644 +--- a/Config/exports.l ++++ b/Config/exports.l +@@ -50,6 +50,7 @@ OLDNET {IP}"/"{IP} + + %option nounput + %option noinput ++%option noyywrap + + %% + diff --git a/poky/meta/recipes-devtools/unfs3/unfs3_git.bb b/poky/meta/recipes-devtools/unfs3/unfs3_git.bb index d60cee87c..a21fb5839 100644 --- a/poky/meta/recipes-devtools/unfs3/unfs3_git.bb +++ b/poky/meta/recipes-devtools/unfs3/unfs3_git.bb @@ -2,6 +2,7 @@ SUMMARY = "Userspace NFS server v3 protocol" DESCRIPTION = "UNFS3 is a user-space implementation of the NFSv3 server \ specification. It provides a daemon for the MOUNT and NFS protocols, which \ are used by NFS clients for accessing files on the server." +HOMEPAGE = "https://github.com/unfs3/unfs3" SECTION = "console/network" LICENSE = "unfs3" LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e" @@ -24,6 +25,7 @@ SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https \ file://0001-daemon.c-Libtirpc-porting-fixes.patch \ file://0001-attr-fix-utime-for-symlink.patch \ file://0001-Add-listen-action-for-a-tcp-socket.patch \ + file://no-yywrap.patch \ " SRCREV = "c12a5c69a8d59be6916cbd0e0f41c159f1962425" UPSTREAM_CHECK_GITTAGREGEX = "unfs3\-(?P<pver>.+)" diff --git a/poky/meta/recipes-devtools/unifdef/unifdef_2.12.bb b/poky/meta/recipes-devtools/unifdef/unifdef_2.12.bb index 22b10ba23..b42051b8b 100644 --- a/poky/meta/recipes-devtools/unifdef/unifdef_2.12.bb +++ b/poky/meta/recipes-devtools/unifdef/unifdef_2.12.bb @@ -2,6 +2,7 @@ SUMMARY = "Selectively remove #ifdef statements from sources" SECTION = "devel" LICENSE = "BSD-2-Clause" HOMEPAGE = "http://dotat.at/prog/unifdef/" +DESCRIPTION = "The unifdef utility selectively processes conditional C preprocessor #if and #ifdef directives. It removes from a file both the directives and the additional text that they delimit, while otherwise leaving the file alone." LIC_FILES_CHKSUM = "file://COPYING;md5=3498caf346f6b77934882101749ada23 \ file://unifdef.c;endline=32;md5=6f4ee8085d6e6ab0f7cb4390e1a9c497 \ diff --git a/poky/meta/recipes-devtools/vala/vala.inc b/poky/meta/recipes-devtools/vala/vala.inc index 703ed1aa8..71da2ef07 100644 --- a/poky/meta/recipes-devtools/vala/vala.inc +++ b/poky/meta/recipes-devtools/vala/vala.inc @@ -1,4 +1,5 @@ SUMMARY = "C#-like programming language for easing GObject programming" +HOMEPAGE = "http://vala-project.org" DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. \ Vala compiles to plain C and has no runtime environment nor penalities whatsoever." SECTION = "devel" @@ -12,7 +13,6 @@ DEPENDS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-doc # vala-native contains a native version of vapigen, which we use instead of the target one DEPENDS_append_class-target = " vala-native" BBCLASSEXTEND = "native" -HOMEPAGE = "http://vala-project.org" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" diff --git a/poky/meta/recipes-devtools/vala/vala_0.50.2.bb b/poky/meta/recipes-devtools/vala/vala_0.50.3.bb index b5913fca8..302f56254 100644 --- a/poky/meta/recipes-devtools/vala/vala_0.50.2.bb +++ b/poky/meta/recipes-devtools/vala/vala_0.50.3.bb @@ -2,4 +2,4 @@ require ${BPN}.inc SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch" -SRC_URI[sha256sum] = "2c0d5dc6d65d070f724063075424c403765ab7935c9e6fbcb84981b94d07ceda" +SRC_URI[sha256sum] = "6165c1b42beca4856e2fb9a31c5e81949d76fa670e2f0cfc8389ce9b95eca5db" diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch new file mode 100644 index 000000000..0bd8273cd --- /dev/null +++ b/poky/meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch @@ -0,0 +1,36 @@ +From d8c19e0bb9ca2fd48f223e1fdeffcafeb0aa1745 Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Wed, 17 Feb 2021 14:53:44 -0500 +Subject: [PATCH] gdbserver_tests: Disable nlcontrolc.vgtest for x86-64 + +Test hangs after glibc 2.33 uprev + +Using gdb to modify the timeout argument no longer +affects how long `select` wait. + +https://bugs.kde.org/show_bug.cgi?id=432870 +Upstream-Status: Pending +Waiting for upstream to take action. + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +--- + gdbserver_tests/nlcontrolc.vgtest | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gdbserver_tests/nlcontrolc.vgtest b/gdbserver_tests/nlcontrolc.vgtest +index bb5308403..96d2b52bb 100644 +--- a/gdbserver_tests/nlcontrolc.vgtest ++++ b/gdbserver_tests/nlcontrolc.vgtest +@@ -13,7 +13,8 @@ args: 1000000000 1000000000 1000000000 BSBSBSBS 1 + vgopts: --tool=none --vgdb=yes --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-nlcontrolc + stderr_filter: filter_stderr + # Bug 338633 nlcontrol hangs on arm64 currently. +-prereq: test -e gdb -a -f vgdb.invoker && ! ../tests/arch_test arm64 && ! ../tests/os_test solaris ++# Bug 432870 nlcontrolc hangs on x86-64 starting with glibc 2.33 ++prereq: test -e gdb -a -f vgdb.invoker && ! ../tests/arch_test arm64 && ! ../tests/os_test solaris && ! ../tests/arch_test amd64 + progB: gdb + argsB: --quiet -l 60 --nx ./sleepers + stdinB: nlcontrolc.stdinB.gdb +-- +2.29.2 + diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch index 7985308e4..0c399ef52 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch +++ b/poky/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch @@ -19,6 +19,11 @@ Upstream-Status: Pending Signed-off-by: Dave Lerner <dave.lerner@windriver.com> Signed-off-by: Tudor Florea <tudor.florea@enea.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +Increase time limit to 90 s. +(double of the expected time of drd/tests/std_list on qemuarm64) + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> --- tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 20 deletions(-) @@ -66,7 +71,7 @@ index a441f42..cb05b52 100755 # Since most of the program time is spent in system() calls, need this to # propagate a Ctrl-C enabling us to quit. -sub mysystem($) -+# Enforce 30 seconds limit for the test. ++# Enforce 90 seconds limit for the test. +# This resume execution of the remaining tests if valgrind hangs. +sub mysystem($) { @@ -76,7 +81,7 @@ index a441f42..cb05b52 100755 + my $exit_code=0; + eval { + local $SIG{'ALRM'} = sub { die "timed out\n" }; -+ alarm(30); ++ alarm(90); + $exit_code = system($_[0]); + alarm (0); + ($exit_code == 2) and die "SIGINT\n"; # 2 is SIGINT diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest b/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest index 7217dfca5..e8a1a668f 100755 --- a/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest +++ b/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest @@ -12,7 +12,7 @@ VALGRIND_BIN=@bindir@/valgrind LOG="${VALGRIND_LIB}/ptest/valgrind_ptest_$(date +%Y%m%d-%H%M%S).log" TOOLS="memcheck cachegrind callgrind helgrind drd massif dhat lackey none" -EXP_TOOLS="exp-bbv exp-dhat exp-sgcheck" +EXP_TOOLS="exp-bbv" GDB_BIN=@bindir@/gdb cd ${VALGRIND_LIB}/ptest && ./gdbserver_tests/make_local_links ${GDB_BIN} 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 25fa58249..d0aefdf39 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb +++ b/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb @@ -1,5 +1,6 @@ SUMMARY = "Valgrind memory debugger and instrumentation framework" HOMEPAGE = "http://valgrind.org/" +DESCRIPTION = "Valgrind is an instrumentation framework for building dynamic analysis tools. There are Valgrind tools that can automatically detect many memory management and threading bugs, and profile your programs in detail." BUGTRACKER = "http://valgrind.org/support/bug_reports.html" LICENSE = "GPLv2 & GPLv2+ & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ @@ -44,6 +45,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-drd-Port-to-Fedora-33.patch \ file://0001-drd-musl-fix.patch \ file://0001-helgrind-Intercept-libc-functions.patch \ + file://0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch \ " SRC_URI[md5sum] = "d1b153f1ab17cf1f311705e7a83ef589" SRC_URI[sha256sum] = "c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca" @@ -174,8 +176,6 @@ do_install_ptest() { none/tests \ tests \ exp-bbv/tests \ - exp-dhat/tests \ - exp-sgcheck/tests \ " # Get the vg test scripts, filters, and expected files for dir in $subdirs ; do diff --git a/poky/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/poky/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb index 7d27c43c8..d988e1ffc 100644 --- a/poky/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb +++ b/poky/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb @@ -1,5 +1,6 @@ SUMMARY = "A shell-script tool for converting XML files to various formats" -HOMEPAGE = "https://releases.pagure.org/xmlto/" +HOMEPAGE = "https://pagure.io/xmlto" +DESCRIPTION = "Utility xmlto is a simple shell-script tool for converting XML files to various formats. It serves as easy to use command line frontend to make fine output without remembering many long options and searching for the syntax of the backends." SECTION = "docs/xmlto" LICENSE = "GPLv2" @@ -29,7 +30,7 @@ RDEPENDS_${PN}_append_class-target = " \ libxslt-bin \ coreutils \ " -CACHED_CONFIGUREVARS += "ac_cv_path_TAIL=tail" +CACHED_CONFIGUREVARS += "ac_cv_path_TAIL=tail ac_cv_path_GREP=grep" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-extended/acpica/acpica_20201217.bb b/poky/meta/recipes-extended/acpica/acpica_20210105.bb index 91bcd8a46..0188dc8a1 100644 --- a/poky/meta/recipes-extended/acpica/acpica_20201217.bb +++ b/poky/meta/recipes-extended/acpica/acpica_20210105.bb @@ -10,14 +10,14 @@ 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" +LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=c33ce358fdcd142684e41e336b7992e8" 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" +SRC_URI[sha256sum] = "a9be7b749025e60f93fde2fe531bfe0d84a33641d3e0c9b0f6049f996dbb1ff8" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" @@ -34,6 +34,8 @@ EXTRA_OEMAKE = "CC='${CC}' \ PREFIX=${prefix} \ INSTALLDIR=${bindir} \ INSTALLFLAGS= \ + YACC=bison \ + YFLAGS='-y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \ " do_install() { diff --git a/poky/meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb b/poky/meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb index 51d12cb8c..bb4248a5e 100644 --- a/poky/meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb +++ b/poky/meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb @@ -8,7 +8,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \ file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 " -SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https \ +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=main \ file://auto-catalogs.patch" SRCREV = "8de61a75572b5b8f90c1f87634aa3767472be7a7" @@ -29,3 +29,5 @@ RDEPENDS_${PN} += "python3" RDEPENDS_remove_class-native = "python3" BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))$" diff --git a/poky/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch b/poky/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch index 7fdecc7fd..fd57f94cd 100644 --- a/poky/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch +++ b/poky/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch @@ -18,21 +18,21 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com> parsetime.y | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -diff --git a/parsetime.y b/parsetime.y -index 7005e88..324e6d3 100644 ---- a/parsetime.y -+++ b/parsetime.y -@@ -8,6 +8,9 @@ - - #define YYDEBUG 1 +Index: at-3.2.1/parsetime.y +=================================================================== +--- at-3.2.1.orig/parsetime.y ++++ at-3.2.1/parsetime.y +@@ -14,6 +14,9 @@ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + #endif +#define is_leap_year(y) \ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + struct tm exectm; static int isgmt; - static int yearspec; -@@ -217,8 +220,8 @@ date : month_name day_number + static char *tz = NULL; +@@ -230,8 +233,8 @@ date : month_name day_number mnum == 12) && dnum > 31) || ((mnum == 4 || mnum == 6 || mnum == 9 || mnum == 11) && dnum > 30) @@ -43,7 +43,7 @@ index 7005e88..324e6d3 100644 ) { yyerror("Error in day of month"); -@@ -261,8 +264,8 @@ date : month_name day_number +@@ -274,8 +277,8 @@ date : month_name day_number mnum == 12) && dnum > 31) || ((mnum == 4 || mnum == 6 || mnum == 9 || mnum == 11) && dnum > 30) @@ -54,6 +54,3 @@ index 7005e88..324e6d3 100644 ) { yyerror("Error in day of month"); --- -2.8.1 - diff --git a/poky/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch b/poky/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch index d5ef0032b..11023bdf5 100644 --- a/poky/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch +++ b/poky/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch @@ -10,11 +10,11 @@ update the Copyright file information to reflect the replaced files. Date: 2010/08/31 Nitin A Kamble nitin.a.kamble@intel.com -Index: at-3.1.12/Copyright +Index: at-3.2.1/Copyright =================================================================== ---- at-3.1.12.orig/Copyright -+++ at-3.1.12/Copyright -@@ -31,10 +31,10 @@ The files posixtm.c and posixtm.h have t +--- at-3.2.1.orig/Copyright ++++ at-3.2.1/Copyright +@@ -34,10 +34,10 @@ The files posixtm.c and posixtm.h have t Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation Inc. diff --git a/poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch b/poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch index 30d232412..e4f32b82b 100644 --- a/poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch +++ b/poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch @@ -22,10 +22,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Makefile.in | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/Makefile.in b/Makefile.in -index 4c11913..18ecc23 100644 ---- a/Makefile.in -+++ b/Makefile.in +Index: at-3.2.1/Makefile.in +=================================================================== +--- at-3.2.1.orig/Makefile.in ++++ at-3.2.1/Makefile.in @@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y lex.yy.c: parsetime.l $(LEX) -i parsetime.l @@ -35,6 +35,3 @@ index 4c11913..18ecc23 100644 atd.service: atd.service.in cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ --- -2.7.4 - diff --git a/poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch b/poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch index d6056dcef..adb865205 100644 --- a/poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch +++ b/poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch @@ -15,11 +15,11 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: at-3.1.20/Makefile.in +Index: at-3.2.1/Makefile.in =================================================================== ---- at-3.1.20.orig/Makefile.in -+++ at-3.1.20/Makefile.in -@@ -76,7 +76,9 @@ at: $(ATOBJECTS) +--- at-3.2.1.orig/Makefile.in ++++ at-3.2.1/Makefile.in +@@ -77,7 +77,9 @@ at: $(ATOBJECTS) atd: $(RUNOBJECTS) $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) diff --git a/poky/meta/recipes-extended/at/at_3.1.23.bb b/poky/meta/recipes-extended/at/at_3.2.1.bb index b74882d34..ae15df866 100644 --- a/poky/meta/recipes-extended/at/at_3.1.23.bb +++ b/poky/meta/recipes-extended/at/at_3.2.1.bb @@ -22,7 +22,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" RCONFLICTS_${PN} = "atd" RREPLACES_${PN} = "atd" -SRC_URI = "http://snapshot.debian.org/archive/debian/20180825T090248Z/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \ +SRC_URI = "http://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \ file://fix_parallel_build_error.patch \ file://posixtm.c \ file://posixtm.h \ @@ -37,10 +37,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20180825T090248Z/pool/main/ PAM_SRC_URI = "file://pam.conf.patch \ file://configure-add-enable-pam.patch" -SRC_URI[md5sum] = "1cec945506b5ddf1d776c92c315fc581" -SRC_URI[sha256sum] = "97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710" - -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/at/" +SRC_URI[sha256sum] = "aabe6e5cb6dd19fe9fb25c2747492f2db38762b95ea41b86f949609c39fb55c4" EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ --with-daemon_username=root \ diff --git a/poky/meta/recipes-extended/bash/bash.inc b/poky/meta/recipes-extended/bash/bash.inc index 1ebb33bdc..db326660e 100644 --- a/poky/meta/recipes-extended/bash/bash.inc +++ b/poky/meta/recipes-extended/bash/bash.inc @@ -6,7 +6,7 @@ DEPENDS = "ncurses bison-native virtual/libiconv" inherit autotools gettext texinfo update-alternatives ptest -EXTRA_AUTORECONF += "--exclude=autoheader --exclude=aclocal" +EXTRA_AUTORECONF += "--exclude=autoheader" EXTRA_OECONF = "--enable-job-control --without-bash-malloc bash_cv_wexitstatus_offset=8" # If NON_INTERACTIVE_LOGIN_SHELLS is defined, all login shells read the @@ -14,6 +14,13 @@ EXTRA_OECONF = "--enable-job-control --without-bash-malloc bash_cv_wexitstatus_o # This is what other major distros do. And this is what we wanted. See bug#5359 and bug#7137. CFLAGS += "-DNON_INTERACTIVE_LOGIN_SHELLS" +# This can vary depending upon the host +CFLAGS += "-DHEREDOC_PIPESIZE=65536" + +# Disable bracketed paste mode by default (enabled by default in bash 5.1). It +# causes a lot of garbage in non-interactive shells +CFLAGS += "-DBRACKETED_PASTE_DEFAULT=0" + ALTERNATIVE_${PN} = "bash sh" ALTERNATIVE_LINK_NAME[bash] = "${base_bindir}/bash" ALTERNATIVE_TARGET[bash] = "${base_bindir}/bash" @@ -38,6 +45,12 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = " \ CACHED_CONFIGUREVARS += "headersdir=${includedir}/${PN}" +do_configure_prepend () { + if [ ! -e ${S}/acinclude.m4 ]; then + cat ${S}/aclocal.m4 > ${S}/acinclude.m4 + fi +} + do_compile_prepend() { # Remove any leftover .build files. This ensures that bash always has the # same version number and keeps builds reproducible diff --git a/poky/meta/recipes-extended/bash/bash/CVE-2019-18276.patch b/poky/meta/recipes-extended/bash/bash/CVE-2019-18276.patch deleted file mode 100644 index 7b2073201..000000000 --- a/poky/meta/recipes-extended/bash/bash/CVE-2019-18276.patch +++ /dev/null @@ -1,386 +0,0 @@ -From 951bdaad7a18cc0dc1036bba86b18b90874d39ff Mon Sep 17 00:00:00 2001 -From: Chet Ramey <chet.ramey@case.edu> -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 <De.Huo@windriver.com> -Signed-off-by: Kai Kang <kai.kang@windriver.com> -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - 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/build-tests.patch b/poky/meta/recipes-extended/bash/bash/build-tests.patch index 5f2dae94a..ea38bace9 100644 --- a/poky/meta/recipes-extended/bash/bash/build-tests.patch +++ b/poky/meta/recipes-extended/bash/bash/build-tests.patch @@ -1,19 +1,24 @@ -Add 'ptest' target to Makefile, to run tests without checking dependencies. +From 318b762837c2ad25319caeaf0320eff613b64daf Mon Sep 17 00:00:00 2001 +From: Anders Roxell <anders.roxell@enea.com> +Date: Wed, 19 Dec 2012 17:18:31 +0100 +Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking + dependencies. Upstream-Status: Pending Signed-off-by: Anders Roxell <anders.roxell@enea.com> Rebase to 5.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- Makefile.in | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 5fcb44b..de1c255 100644 +index bc97049..937ce39 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -932,20 +932,34 @@ maybe-clean: +@@ -943,20 +943,34 @@ maybe-clean: fi recho$(EXEEXT): $(SUPPORT_SRC)recho.c @@ -51,8 +56,5 @@ index 5fcb44b..de1c255 100644 + +runtest: @( cd $(srcdir)/tests && \ - PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} ) + BUILD_DIR=$(BUILD_DIR) PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} ) --- -2.7.4 - diff --git a/poky/meta/recipes-extended/bash/bash/makerace.patch b/poky/meta/recipes-extended/bash/bash/makerace.patch new file mode 100644 index 000000000..9bd7c280f --- /dev/null +++ b/poky/meta/recipes-extended/bash/bash/makerace.patch @@ -0,0 +1,52 @@ +We're seeing pipesize.h being created in parallel: + +/bin/sh ../../bash-5.1/builtins/psize.sh > pipesize.h +/bin/sh ../../bash-5.1/builtins/psize.sh > pipesize.h + +./mkbuiltins -D ../../bash-5.1/builtins ../../bash-5.1/builtins/ulimit.def +x86_64-pokysdk-linux-gcc --sysroot=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot -c -DHAVE_CONFIG_H -DSHELL -I. -I.. -I../../bash-5.1 -I../../bash-5.1/include -I../../bash-5.1/lib -I../../bash-5.1/builtins -O2 -pipe -fmacro-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot-native= ulimit.c || ( rm -f ulimit.c ; exit 1 ) +make[1]: Leaving directory '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/build/builtins' +rm -f redir.o +x86_64-pokysdk-linux-gcc --sysroot=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot -DPROGRAM='"bash"' -DCONF_HOSTTYPE='"x86_64"' -DCONF_OSTYPE='"linux-gnu"' -DCONF_MACHTYPE='"x86_64-pokysdk-linux-gnu"' -DCONF_VENDOR='"pokysdk"' -DLOCALEDIR='"/opt/poky/3.2+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/locale"' -DPACKAGE='"bash"' -DSHELL -DHAVE_CONFIG_H -I. -I../bash-5.1 -I../bash-5.1/include -I../bash-5.1/lib -O2 -pipe -fmacro-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot-native= -c ../bash-5.1/redir.c +In file included from ../../bash-5.1/builtins/../../bash-5.1/builtins/ulimit.def:95: +pipesize.h:9:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token + 9 | bash-5.1/builtins/psize.sh: 37: ../../bash-5.1/builtins/psize.sh: ./psize.aux: Text file busy + | ^ +make[1]: *** [Makefile:119: ulimit.o] Error 1 +make[1]: Leaving directory '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/build/builtins' +make: *** [Makefile:737: builtins/libbuiltins.a] Error 1 +make: *** Waiting for unfinished jobs.... +In file included from ../bash-5.1/redir.c:61: +./builtins/pipesize.h:9:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token + 9 | bash-5.1/builtins/psize.sh: 37: ../../bash-5.1/builtins/psize.sh: ./psize.aux: Text file busy + | ^ +make: *** [Makefile:101: redir.o] Error 1 +WARNING: exit code 1 from a shell command. + +which happens since builtins/ulimit.o depends on pipesize.h as well as a top +level dependency. This means: + + @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) pipesize.h ) || exit 1 + +races with: + + @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) DEBUG=${DEBUG} targets ) || exit 1 + +Hack around this by forcing BUILTINS_LIBRARY onto pipesize.h as a dependency. + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-bash/2021-01/msg00152.html] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: bash-5.1/Makefile.in +=================================================================== +--- bash-5.1.orig/Makefile.in ++++ bash-5.1/Makefile.in +@@ -746,7 +746,7 @@ ${DEFDIR}/bashgetopt.o: $(BUILTIN_SRCDIR + ${DEFDIR}/builtext.h: $(BUILTIN_DEFS) + @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) builtext.h ) || exit 1 + +-${DEFDIR}/pipesize.h: ++${DEFDIR}/pipesize.h: $(BUILTINS_LIBRARY) + @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) pipesize.h ) || exit 1 + + $(SDIR)/man2html$(EXEEXT): ${SUPPORT_SRC}/man2html.c diff --git a/poky/meta/recipes-extended/bash/bash/use_aclocal.patch b/poky/meta/recipes-extended/bash/bash/use_aclocal.patch new file mode 100644 index 000000000..bebaa08bf --- /dev/null +++ b/poky/meta/recipes-extended/bash/bash/use_aclocal.patch @@ -0,0 +1,59 @@ +Including m4 files directly like this confuses autotools.bbclass, remove +the references and rely upon aclocal to collect the m4 files together +as needed instead making it work like other autotools based projects. + +Upstream-Status: Inappropriate [OE configuration specific] +RP 2021/1/20 + +Index: bash-5.1/configure.ac +=================================================================== +--- bash-5.1.orig/configure.ac ++++ bash-5.1/configure.ac +@@ -688,47 +688,6 @@ if test x$SIZE = x; then + fi + AC_SUBST(SIZE) + +-m4_include([m4/stat-time.m4]) +-m4_include([m4/timespec.m4]) +- +-dnl include files for gettext +- +-m4_include([m4/codeset.m4]) +-m4_include([m4/extern-inline.m4]) +-m4_include([m4/fcntl-o.m4]) +-m4_include([m4/gettext.m4]) +-m4_include([m4/glibc2.m4]) +-m4_include([m4/glibc21.m4]) +-m4_include([m4/host-cpu-c-abi.m4]) +-m4_include([m4/iconv.m4]) +-m4_include([m4/intdiv0.m4]) +-m4_include([m4/intl.m4]) +-m4_include([m4/intlmacosx.m4]) +-m4_include([m4/intl-thread-locale.m4]) +-m4_include([m4/intmax.m4]) +-m4_include([m4/inttypes-pri.m4]) +-m4_include([m4/inttypes.m4]) +-m4_include([m4/inttypes_h.m4]) +-m4_include([m4/lcmessage.m4]) +-m4_include([m4/lib-ld.m4]) +-m4_include([m4/lib-link.m4]) +-m4_include([m4/lib-prefix.m4]) +-m4_include([m4/lock.m4]) +-m4_include([m4/nls.m4]) +-m4_include([m4/po.m4]) +-m4_include([m4/printf-posix.m4]) +-m4_include([m4/progtest.m4]) +-m4_include([m4/pthread_rwlock_rdlock.m4]) +-m4_include([m4/size_max.m4]) +-m4_include([m4/stdint_h.m4]) +-m4_include([m4/threadlib.m4]) +-m4_include([m4/uintmax_t.m4]) +-m4_include([m4/ulonglong.m4]) +-m4_include([m4/visibility.m4]) +-m4_include([m4/wchar_t.m4]) +-m4_include([m4/wint_t.m4]) +-m4_include([m4/xsize.m4]) +- + dnl Turn on any extensions available in the GNU C library. + AC_DEFINE(_GNU_SOURCE, 1) + diff --git a/poky/meta/recipes-extended/bash/bash_5.0.bb b/poky/meta/recipes-extended/bash/bash_5.0.bb deleted file mode 100644 index 53e05869c..000000000 --- a/poky/meta/recipes-extended/bash/bash_5.0.bb +++ /dev/null @@ -1,80 +0,0 @@ -require bash.inc - -# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-001;apply=yes;striplevel=0;name=patch001 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-002;apply=yes;striplevel=0;name=patch002 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-003;apply=yes;striplevel=0;name=patch003 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-004;apply=yes;striplevel=0;name=patch004 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-005;apply=yes;striplevel=0;name=patch005 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-006;apply=yes;striplevel=0;name=patch006 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-007;apply=yes;striplevel=0;name=patch007 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-008;apply=yes;striplevel=0;name=patch008 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-009;apply=yes;striplevel=0;name=patch009 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-010;apply=yes;striplevel=0;name=patch010 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-011;apply=yes;striplevel=0;name=patch011 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-012;apply=yes;striplevel=0;name=patch012 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-013;apply=yes;striplevel=0;name=patch013 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-014;apply=yes;striplevel=0;name=patch014 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-015;apply=yes;striplevel=0;name=patch015 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-016;apply=yes;striplevel=0;name=patch016 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-017;apply=yes;striplevel=0;name=patch017 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-018;apply=yes;striplevel=0;name=patch018 \ - file://execute_cmd.patch \ - file://mkbuiltins_have_stringize.patch \ - file://build-tests.patch \ - file://test-output.patch \ - file://run-ptest \ - file://run-bash-ptests \ - file://fix-run-builtins.patch \ - file://CVE-2019-18276.patch \ - " - -SRC_URI[tarball.md5sum] = "2b44b47b905be16f45709648f671820b" -SRC_URI[tarball.sha256sum] = "b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d" - -SRC_URI[patch001.md5sum] = "b026862ab596a5883bb4f0d1077a3819" -SRC_URI[patch001.sha256sum] = "f2fe9e1f0faddf14ab9bfa88d450a75e5d028fedafad23b88716bd657c737289" -SRC_URI[patch002.md5sum] = "2f4a7787365790ae57f36b311701ea7e" -SRC_URI[patch002.sha256sum] = "87e87d3542e598799adb3e7e01c8165bc743e136a400ed0de015845f7ff68707" -SRC_URI[patch003.md5sum] = "af7f2dd93fd5429fb5e9a642ff74f87d" -SRC_URI[patch003.sha256sum] = "4eebcdc37b13793a232c5f2f498a5fcbf7da0ecb3da2059391c096db620ec85b" -SRC_URI[patch004.md5sum] = "b60545b273bfa4e00a760f2c648bed9c" -SRC_URI[patch004.sha256sum] = "14447ad832add8ecfafdce5384badd933697b559c4688d6b9e3d36ff36c62f08" -SRC_URI[patch005.md5sum] = "875a0bedf48b74e453e3997c84b5d8a4" -SRC_URI[patch005.sha256sum] = "5bf54dd9bd2c211d2bfb34a49e2c741f2ed5e338767e9ce9f4d41254bf9f8276" -SRC_URI[patch006.md5sum] = "4a8ee95adb72c3aba03d9e8c9f96ece6" -SRC_URI[patch006.sha256sum] = "d68529a6ff201b6ff5915318ab12fc16b8a0ebb77fda3308303fcc1e13398420" -SRC_URI[patch007.md5sum] = "411560d81fde2dc5b17b83c3f3b58c6f" -SRC_URI[patch007.sha256sum] = "17b41e7ee3673d8887dd25992417a398677533ab8827938aa41fad70df19af9b" -SRC_URI[patch008.md5sum] = "dd7cf7a784d1838822cad8d419315991" -SRC_URI[patch008.sha256sum] = "eec64588622a82a5029b2776e218a75a3640bef4953f09d6ee1f4199670ad7e3" -SRC_URI[patch009.md5sum] = "c1b3e937cd6dccbb7fd772f32812a0da" -SRC_URI[patch009.sha256sum] = "ed3ca21767303fc3de93934aa524c2e920787c506b601cc40a4897d4b094d903" -SRC_URI[patch010.md5sum] = "19b41e73b03602d0e261c471b53e670c" -SRC_URI[patch010.sha256sum] = "d6fbc325f0b5dc54ddbe8ee43020bced8bd589ddffea59d128db14b2e52a8a11" -SRC_URI[patch011.md5sum] = "414339330a3634137081a97f2c8615a8" -SRC_URI[patch011.sha256sum] = "2c4de332b91eaf797abbbd6c79709690b5cbd48b12e8dfe748096dbd7bf474ea" -SRC_URI[patch012.md5sum] = "1870268f62b907221b078ad109e1fa94" -SRC_URI[patch012.sha256sum] = "2943ee19688018296f2a04dbfe30b7138b889700efa8ff1c0524af271e0ee233" -SRC_URI[patch013.md5sum] = "40d923af4b952b01983ed4c889ae2653" -SRC_URI[patch013.sha256sum] = "f5d7178d8da30799e01b83a0802018d913d6aa972dd2ddad3b927f3f3eb7099a" -SRC_URI[patch014.md5sum] = "57857b22053c8167677e5e5ac5c6669b" -SRC_URI[patch014.sha256sum] = "5d6eee6514ee6e22a87bba8d22be0a8621a0ae119246f1c5a9a35db1f72af589" -SRC_URI[patch015.md5sum] = "c4c6ea23d09a74eaa9385438e48fdf02" -SRC_URI[patch015.sha256sum] = "a517df2dda93b26d5cbf00effefea93e3a4ccd6652f152f4109170544ebfa05e" -SRC_URI[patch016.md5sum] = "a682ed6fa2c2e7a7c3ba6bdeada07fb5" -SRC_URI[patch016.sha256sum] = "ffd1d7a54a99fa7f5b1825e4f7e95d8c8876bc2ca151f150e751d429c650b06d" -SRC_URI[patch017.md5sum] = "d9dcaa1d8e7a24850449a1aac43a12a9" -SRC_URI[patch017.sha256sum] = "4cf3b9fafb8a66d411dd5fc9120032533a4012df1dc6ee024c7833373e2ddc31" -SRC_URI[patch018.md5sum] = "a64d950d5de72ae590455b13e6afefcb" -SRC_URI[patch018.sha256sum] = "7c314e375a105a6642e8ed44f3808b9def89d15f7492fe2029a21ba9c0de81d3" - - -DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" - -BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-extended/bash/bash_5.1.bb b/poky/meta/recipes-extended/bash/bash_5.1.bb new file mode 100644 index 000000000..e5e013b73 --- /dev/null +++ b/poky/meta/recipes-extended/bash/bash_5.1.bb @@ -0,0 +1,32 @@ +require bash.inc + +# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-001;apply=yes;striplevel=0;name=patch001 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-002;apply=yes;striplevel=0;name=patch002 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-003;apply=yes;striplevel=0;name=patch003 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-004;apply=yes;striplevel=0;name=patch004 \ + file://execute_cmd.patch \ + file://mkbuiltins_have_stringize.patch \ + file://build-tests.patch \ + file://test-output.patch \ + file://run-ptest \ + file://run-bash-ptests \ + file://fix-run-builtins.patch \ + file://use_aclocal.patch \ + file://makerace.patch \ + " + +SRC_URI[tarball.sha256sum] = "cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa" +SRC_URI[patch001.sha256sum] = "ebb07b3dbadd98598f078125d0ae0d699295978a5cdaef6282fe19adef45b5fa" +SRC_URI[patch002.sha256sum] = "15ea6121a801e48e658ceee712ea9b88d4ded022046a6147550790caf04f5dbe" +SRC_URI[patch003.sha256sum] = "22f2cc262f056b22966281babf4b0a2f84cb7dd2223422e5dcd013c3dcbab6b1" +SRC_URI[patch004.sha256sum] = "9aaeb65664ef0d28c0067e47ba5652b518298b3b92d33327d84b98b28d873c86" + +DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" +DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" + +BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-extended/cups/cups.inc b/poky/meta/recipes-extended/cups/cups.inc index e7a704134..244c87001 100644 --- a/poky/meta/recipes-extended/cups/cups.inc +++ b/poky/meta/recipes-extended/cups/cups.inc @@ -15,6 +15,7 @@ SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.t file://0004-cups-fix-multilib-install-file-conflicts.patch \ file://volatiles.99_cups \ file://cups-volatiles.conf \ + file://CVE-2020-10001.patch \ " UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" @@ -54,6 +55,8 @@ EXTRA_OECONF = " \ --enable-debug \ --disable-relro \ --enable-libusb \ + --with-system-groups=lpadmin \ + --with-cups-group=lp \ --with-domainsocket=/run/cups/cups.sock \ DSOFLAGS='${LDFLAGS}' \ " diff --git a/poky/meta/recipes-extended/cups/cups/CVE-2020-10001.patch b/poky/meta/recipes-extended/cups/cups/CVE-2020-10001.patch new file mode 100644 index 000000000..09a0a5765 --- /dev/null +++ b/poky/meta/recipes-extended/cups/cups/CVE-2020-10001.patch @@ -0,0 +1,74 @@ +From efbea1742bd30f842fbbfb87a473e5c84f4162f9 Mon Sep 17 00:00:00 2001 +From: Michael R Sweet <msweet@msweet.org> +Date: Mon, 1 Feb 2021 15:02:32 -0500 +Subject: [PATCH] Fix a buffer (read) overflow in ippReadIO (CVE-2020-10001) + +Upstream-Status: Backport +CVE: CVE-2020-10001 + +Reference to upstream patch: +[https://github.com/OpenPrinting/cups/commit/efbea1742bd30f842fbbfb87a473e5c84f4162f9] + +[SG: Addapted for version 2.3.3] +Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com> +--- + CHANGES.md | 2 ++ + cups/ipp.c | 8 +++++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/CHANGES.md b/CHANGES.md +index df72892..5ca12da 100644 +--- a/CHANGES.md ++++ b/CHANGES.md +@@ -4,6 +4,8 @@ CHANGES - 2.3.3 - 2020-04-24 + Changes in CUPS v2.3.3 + ---------------------- + ++- Security: Fixed a buffer (read) overflow in the `ippReadIO` function ++ (CVE-2020-10001) + - CVE-2020-3898: The `ppdOpen` function did not handle invalid UI + constraint. `ppdcSource::get_resolution` function did not handle + invalid resolution strings. +diff --git a/cups/ipp.c b/cups/ipp.c +index 3d52934..adbb26f 100644 +--- a/cups/ipp.c ++++ b/cups/ipp.c +@@ -2866,7 +2866,8 @@ ippReadIO(void *src, /* I - Data source */ + unsigned char *buffer, /* Data buffer */ + string[IPP_MAX_TEXT], + /* Small string buffer */ +- *bufptr; /* Pointer into buffer */ ++ *bufptr, /* Pointer into buffer */ ++ *bufend; /* End of buffer */ + ipp_attribute_t *attr; /* Current attribute */ + ipp_tag_t tag; /* Current tag */ + ipp_tag_t value_tag; /* Current value tag */ +@@ -3441,6 +3442,7 @@ ippReadIO(void *src, /* I - Data source */ + } + + bufptr = buffer; ++ bufend = buffer + n; + + /* + * text-with-language and name-with-language are composite +@@ -3454,7 +3456,7 @@ ippReadIO(void *src, /* I - Data source */ + + n = (bufptr[0] << 8) | bufptr[1]; + +- if ((bufptr + 2 + n) >= (buffer + IPP_BUF_SIZE) || n >= (int)sizeof(string)) ++ if ((bufptr + 2 + n + 2) > bufend || n >= (int)sizeof(string)) + { + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, + _("IPP language length overflows value."), 1); +@@ -3481,7 +3483,7 @@ ippReadIO(void *src, /* I - Data source */ + bufptr += 2 + n; + n = (bufptr[0] << 8) | bufptr[1]; + +- if ((bufptr + 2 + n) >= (buffer + IPP_BUF_SIZE)) ++ if ((bufptr + 2 + n) > bufend) + { + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, + _("IPP string length overflows value."), 1); +-- +2.17.1 + diff --git a/poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb b/poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb index 65a99fc28..02b016fdf 100644 --- a/poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb +++ b/poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb @@ -13,7 +13,7 @@ do_configure() { } do_install() { - oe_runmake CWAUTOMACROSPREFIX=${D}${prefix} install + oe_runmake LABEL=`date -d @${SOURCE_DATE_EPOCH} +%Y%m%d` CWAUTOMACROSPREFIX=${D}${prefix} install # cleanup buildpaths in autogen.sh sed -i -e 's,${D},,g' ${D}${prefix}/share/cwautomacros/scripts/autogen.sh diff --git a/poky/meta/recipes-extended/ed/ed_1.16.bb b/poky/meta/recipes-extended/ed/ed_1.17.bb index f383007b5..e905eed3c 100644 --- a/poky/meta/recipes-extended/ed/ed_1.16.bb +++ b/poky/meta/recipes-extended/ed/ed_1.17.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.gnu.org/software/ed/" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7 \ - file://ed.h;endline=20;md5=0226a8dd88c76afba773f2f0f7c83f5e \ - file://main.c;endline=17;md5=ebd4aff86dc9fa5027d55bc5191746b9 \ + file://ed.h;endline=20;md5=b72aa5eaafef318c6bfc37f858469113 \ + file://main.c;endline=17;md5=2c93e24f4db3528a00a24c7df5618e41 \ " SECTION = "base" @@ -18,8 +18,7 @@ bindir = "${base_bindir}" SRC_URI = "${GNU_MIRROR}/ed/${BP}.tar.lz" UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/" -SRC_URI[md5sum] = "ab480d982289064ca040bc5c75fceffd" -SRC_URI[sha256sum] = "cfc07a14ab048a758473ce222e784fbf031485bcd54a76f74acfee1f390d8b2c" +SRC_URI[sha256sum] = "71de39883c25b6fab44add80635382a10c9bf154515b94729f4a6529ddcc5e54" EXTRA_OEMAKE = "-e MAKEFLAGS=" diff --git a/poky/meta/recipes-extended/findutils/findutils_4.7.0.bb b/poky/meta/recipes-extended/findutils/findutils_4.8.0.bb index 59688e528..675e53c0d 100644 --- a/poky/meta/recipes-extended/findutils/findutils_4.7.0.bb +++ b/poky/meta/recipes-extended/findutils/findutils_4.8.0.bb @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" DEPENDS = "bison-native" -SRC_URI[md5sum] = "731356dec4b1109b812fecfddfead6b2" -SRC_URI[sha256sum] = "c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a" +SRC_URI[sha256sum] = "57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164" # http://savannah.gnu.org/bugs/?27299 CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes" diff --git a/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index ab70ea98a..d3f7525dc 100644 --- a/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -6,13 +6,14 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "git://${GO_IMPORT}" -SRCREV = "46695d81d1fae905a270fb7db8a4d11a334562fe" +SRCREV = "bcf50bfd7dcd8020c90965747d857ae42802e0c5" UPSTREAM_CHECK_COMMITS = "1" GO_IMPORT = "github.com/golang/example" GO_INSTALL = "${GO_IMPORT}/hello" +GO_WORKDIR = "${GO_INSTALL}" -inherit go +inherit go-mod # This is just to make clear where this example is do_install_append() { diff --git a/poky/meta/recipes-extended/groff/files/0001-Include-config.h.patch b/poky/meta/recipes-extended/groff/files/0001-Include-config.h.patch index 348a61d9d..46065bc51 100644 --- a/poky/meta/recipes-extended/groff/files/0001-Include-config.h.patch +++ b/poky/meta/recipes-extended/groff/files/0001-Include-config.h.patch @@ -17,6 +17,9 @@ In file included from TOPDIR/build/tmp/work/aarch64-yoe-linux-musl/groff/1.22.4- ^ ./lib/math.h:40:1: error: unknown type name '_GL_INLINE_HEADER_BEGIN' +We delete eqn.cpp and qen.hpp in do_configure +to ensure they're regenerated and deterministic. + Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- @@ -140,1029 +143,6 @@ index f95c05e..d875045 100644 #include <string.h> #include <stdlib.h> -diff --git a/src/preproc/eqn/eqn.cpp b/src/preproc/eqn/eqn.cpp -index 4ede465..fdd9484 100644 ---- a/src/preproc/eqn/eqn.cpp -+++ b/src/preproc/eqn/eqn.cpp -@@ -1,8 +1,9 @@ --/* A Bison parser, made by GNU Bison 3.2. */ -+/* A Bison parser, made by GNU Bison 3.4.1. */ - - /* Bison implementation for Yacc-like parsers in C - -- Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc. -+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, -+ Inc. - - 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 -@@ -47,7 +48,7 @@ - #define YYBISON 1 - - /* Bison version. */ --#define YYBISON_VERSION "3.2" -+#define YYBISON_VERSION "3.4.1" - - /* Skeleton name. */ - #define YYSKELETON_NAME "yacc.c" -@@ -65,7 +66,11 @@ - - - /* First part of user prologue. */ --#line 18 "../src/preproc/eqn/eqn.ypp" /* yacc.c:338 */ -+#line 18 "src/preproc/eqn/eqn.ypp" -+ -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif - - #include <stdio.h> - #include <string.h> -@@ -77,7 +82,8 @@ extern int non_empty_flag; - int yylex(); - void yyerror(const char *); - --#line 81 "src/preproc/eqn/eqn.cpp" /* yacc.c:338 */ -+#line 86 "src/preproc/eqn/eqn.cpp" -+ - # ifndef YY_NULLPTR - # if defined __cplusplus - # if 201103L <= __cplusplus -@@ -98,8 +104,8 @@ void yyerror(const char *); - # define YYERROR_VERBOSE 0 - #endif - --/* In a future release of Bison, this section will be replaced -- by #include "y.tab.h". */ -+/* Use api.header.include to #include this header -+ instead of duplicating it here. */ - #ifndef YY_YY_SRC_PREPROC_EQN_EQN_HPP_INCLUDED - # define YY_YY_SRC_PREPROC_EQN_EQN_HPP_INCLUDED - /* Debug traces. */ -@@ -237,10 +243,9 @@ extern int yydebug; - - /* Value type. */ - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -- - union YYSTYPE - { --#line 30 "../src/preproc/eqn/eqn.ypp" /* yacc.c:353 */ -+#line 34 "src/preproc/eqn/eqn.ypp" - - char *str; - box *b; -@@ -249,9 +254,9 @@ union YYSTYPE - int n; - column *col; - --#line 253 "src/preproc/eqn/eqn.cpp" /* yacc.c:353 */ --}; -+#line 258 "src/preproc/eqn/eqn.cpp" - -+}; - typedef union YYSTYPE YYSTYPE; - # define YYSTYPE_IS_TRIVIAL 1 - # define YYSTYPE_IS_DECLARED 1 -@@ -366,6 +371,8 @@ typedef short yytype_int16; - #endif - - -+#define YY_ASSERT(E) ((void) (0 && (E))) -+ - #if ! defined yyoverflow || YYERROR_VERBOSE - - /* The parser invokes alloca or malloc; define the necessary symbols. */ -@@ -508,16 +515,16 @@ union yyalloc - /* YYNSTATES -- Number of states. */ - #define YYNSTATES 142 - --/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned -- by yylex, with out-of-bounds checking. */ - #define YYUNDEFTOK 2 - #define YYMAXUTOK 315 - -+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM -+ as returned by yylex, with out-of-bounds checking. */ - #define YYTRANSLATE(YYX) \ - ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) - - /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM -- as returned by yylex, without out-of-bounds checking. */ -+ as returned by yylex. */ - static const yytype_uint8 yytranslate[] = - { - 0, 2, 2, 2, 2, 2, 2, 2, 2, 63, -@@ -558,14 +565,14 @@ static const yytype_uint8 yytranslate[] = - /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ - static const yytype_uint16 yyrline[] = - { -- 0, 121, 121, 123, 128, 130, 141, 143, 145, 150, -- 152, 154, 156, 158, 163, 165, 167, 169, 174, 176, -- 181, 183, 185, 190, 192, 194, 196, 198, 200, 202, -- 204, 206, 208, 210, 212, 214, 216, 218, 220, 222, -- 224, 226, 228, 230, 232, 234, 236, 238, 240, 242, -- 244, 246, 248, 250, 252, 254, 259, 269, 271, 276, -- 278, 283, 285, 290, 292, 297, 299, 304, 306, 308, -- 310, 314, 316, 321, 323, 325 -+ 0, 125, 125, 127, 132, 134, 145, 147, 149, 154, -+ 156, 158, 160, 162, 167, 169, 171, 173, 178, 180, -+ 185, 187, 189, 194, 196, 198, 200, 202, 204, 206, -+ 208, 210, 212, 214, 216, 218, 220, 222, 224, 226, -+ 228, 230, 232, 234, 236, 238, 240, 242, 244, 246, -+ 248, 250, 252, 254, 256, 258, 263, 273, 275, 280, -+ 282, 287, 289, 294, 296, 301, 303, 308, 310, 312, -+ 314, 318, 320, 325, 327, 329 - }; - #endif - -@@ -818,22 +825,22 @@ static const yytype_uint8 yyr2[] = - - #define YYRECOVERING() (!!yyerrstatus) - --#define YYBACKUP(Token, Value) \ --do \ -- if (yychar == YYEMPTY) \ -- { \ -- yychar = (Token); \ -- yylval = (Value); \ -- YYPOPSTACK (yylen); \ -- yystate = *yyssp; \ -- goto yybackup; \ -- } \ -- else \ -- { \ -- yyerror (YY_("syntax error: cannot back up")); \ -- YYERROR; \ -- } \ --while (0) -+#define YYBACKUP(Token, Value) \ -+ do \ -+ if (yychar == YYEMPTY) \ -+ { \ -+ yychar = (Token); \ -+ yylval = (Value); \ -+ YYPOPSTACK (yylen); \ -+ yystate = *yyssp; \ -+ goto yybackup; \ -+ } \ -+ else \ -+ { \ -+ yyerror (YY_("syntax error: cannot back up")); \ -+ YYERROR; \ -+ } \ -+ while (0) - - /* Error token number */ - #define YYTERROR 1 -@@ -948,7 +955,7 @@ yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) - YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, - yystos[yyssp[yyi + 1 - yynrhs]], -- &(yyvsp[(yyi + 1) - (yynrhs)]) -+ &yyvsp[(yyi + 1) - (yynrhs)] - ); - YYFPRINTF (stderr, "\n"); - } -@@ -1052,7 +1059,10 @@ yytnamerr (char *yyres, const char *yystr) - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; -- /* Fall through. */ -+ else -+ goto append; -+ -+ append: - default: - if (yyres) - yyres[yyn] = *yyp; -@@ -1148,10 +1158,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, - yyarg[yycount++] = yytname[yyx]; - { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); -- if (! (yysize <= yysize1 -- && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) -+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) -+ yysize = yysize1; -+ else - return 2; -- yysize = yysize1; - } - } - } -@@ -1175,9 +1185,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, - - { - YYSIZE_T yysize1 = yysize + yystrlen (yyformat); -- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) -+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) -+ yysize = yysize1; -+ else - return 2; -- yysize = yysize1; - } - - if (*yymsg_alloc < yysize) -@@ -1303,23 +1314,33 @@ yyparse (void) - yychar = YYEMPTY; /* Cause a token to be read. */ - goto yysetstate; - -+ - /*------------------------------------------------------------. --| yynewstate -- Push a new state, which is found in yystate. | -+| yynewstate -- push a new state, which is found in yystate. | - `------------------------------------------------------------*/ -- yynewstate: -+yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. So pushing a state here evens the stacks. */ - yyssp++; - -- yysetstate: -+ -+/*--------------------------------------------------------------------. -+| yynewstate -- set current state (the top of the stack) to yystate. | -+`--------------------------------------------------------------------*/ -+yysetstate: -+ YYDPRINTF ((stderr, "Entering state %d\n", yystate)); -+ YY_ASSERT (0 <= yystate && yystate < YYNSTATES); - *yyssp = (yytype_int16) yystate; - - if (yyss + yystacksize - 1 <= yyssp) -+#if !defined yyoverflow && !defined YYSTACK_RELOCATE -+ goto yyexhaustedlab; -+#else - { - /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1); - --#ifdef yyoverflow -+# if defined yyoverflow - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into -@@ -1338,10 +1359,7 @@ yyparse (void) - yyss = yyss1; - yyvs = yyvs1; - } --#else /* no yyoverflow */ --# ifndef YYSTACK_RELOCATE -- goto yyexhaustedlab; --# else -+# else /* defined YYSTACK_RELOCATE */ - /* Extend the stack our own way. */ - if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; -@@ -1357,12 +1375,11 @@ yyparse (void) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); --# undef YYSTACK_RELOCATE -+# undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); - } - # endif --#endif /* no yyoverflow */ - - yyssp = yyss + yysize - 1; - yyvsp = yyvs + yysize - 1; -@@ -1373,19 +1390,18 @@ yyparse (void) - if (yyss + yystacksize - 1 <= yyssp) - YYABORT; - } -- -- YYDPRINTF ((stderr, "Entering state %d\n", yystate)); -+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ - - if (yystate == YYFINAL) - YYACCEPT; - - goto yybackup; - -+ - /*-----------. - | yybackup. | - `-----------*/ - yybackup: -- - /* Do appropriate processing given the current state. Read a - lookahead token if we need one and don't already have one. */ - -@@ -1443,7 +1459,6 @@ yybackup: - YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - *++yyvsp = yylval; - YY_IGNORE_MAYBE_UNINITIALIZED_END -- - goto yynewstate; - - -@@ -1458,7 +1473,7 @@ yydefault: - - - /*-----------------------------. --| yyreduce -- Do a reduction. | -+| yyreduce -- do a reduction. | - `-----------------------------*/ - yyreduce: - /* yyn is the number of a rule to reduce with. */ -@@ -1478,20 +1493,20 @@ yyreduce: - YY_REDUCE_PRINT (yyn); - switch (yyn) - { -- case 3: --#line 124 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+ case 3: -+#line 128 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].b)->top_level(); non_empty_flag = 1; } --#line 1485 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1500 "src/preproc/eqn/eqn.cpp" - break; - - case 4: --#line 129 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 133 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[0].b); } --#line 1491 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1506 "src/preproc/eqn/eqn.cpp" - break; - - case 5: --#line 131 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 135 "src/preproc/eqn/eqn.ypp" - { - list_box *lb = (yyvsp[-1].b)->to_list_box(); - if (!lb) -@@ -1499,436 +1514,437 @@ yyreduce: - lb->append((yyvsp[0].b)); - (yyval.b) = lb; - } --#line 1503 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1518 "src/preproc/eqn/eqn.cpp" - break; - - case 6: --#line 142 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 146 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[0].b); } --#line 1509 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1524 "src/preproc/eqn/eqn.cpp" - break; - - case 7: --#line 144 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 148 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_mark_box((yyvsp[0].b)); } --#line 1515 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1530 "src/preproc/eqn/eqn.cpp" - break; - - case 8: --#line 146 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 150 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_lineup_box((yyvsp[0].b)); } --#line 1521 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1536 "src/preproc/eqn/eqn.cpp" - break; - - case 9: --#line 151 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 155 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[0].b); } --#line 1527 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1542 "src/preproc/eqn/eqn.cpp" - break; - - case 10: --#line 153 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 157 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_limit_box((yyvsp[-2].b), 0, (yyvsp[0].b)); } --#line 1533 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1548 "src/preproc/eqn/eqn.cpp" - break; - - case 11: --#line 155 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 159 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_limit_box((yyvsp[-2].b), (yyvsp[0].b), 0); } --#line 1539 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1554 "src/preproc/eqn/eqn.cpp" - break; - - case 12: --#line 157 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 161 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_limit_box((yyvsp[-4].b), (yyvsp[-2].b), (yyvsp[0].b)); } --#line 1545 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1560 "src/preproc/eqn/eqn.cpp" - break; - - case 13: --#line 159 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 163 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_limit_box((yyvsp[-4].b), make_limit_box((yyvsp[-2].b), (yyvsp[0].b), 0), 0); } --#line 1551 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1566 "src/preproc/eqn/eqn.cpp" - break; - - case 14: --#line 164 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 168 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[0].b); } --#line 1557 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1572 "src/preproc/eqn/eqn.cpp" - break; - - case 15: --#line 166 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 170 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_sqrt_box((yyvsp[0].b)); } --#line 1563 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1578 "src/preproc/eqn/eqn.cpp" - break; - - case 16: --#line 168 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 172 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_over_box((yyvsp[-2].b), (yyvsp[0].b)); } --#line 1569 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1584 "src/preproc/eqn/eqn.cpp" - break; - - case 17: --#line 170 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 174 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_small_over_box((yyvsp[-2].b), (yyvsp[0].b)); } --#line 1575 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1590 "src/preproc/eqn/eqn.cpp" - break; - - case 18: --#line 175 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 179 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[0].b); } --#line 1581 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1596 "src/preproc/eqn/eqn.cpp" - break; - - case 19: --#line 177 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 181 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_script_box((yyvsp[-2].b), 0, (yyvsp[0].b)); } --#line 1587 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1602 "src/preproc/eqn/eqn.cpp" - break; - - case 20: --#line 182 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 186 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[0].b); } --#line 1593 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1608 "src/preproc/eqn/eqn.cpp" - break; - - case 21: --#line 184 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 188 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_script_box((yyvsp[-2].b), (yyvsp[0].b), 0); } --#line 1599 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1614 "src/preproc/eqn/eqn.cpp" - break; - - case 22: --#line 186 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 190 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_script_box((yyvsp[-4].b), (yyvsp[-2].b), (yyvsp[0].b)); } --#line 1605 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1620 "src/preproc/eqn/eqn.cpp" - break; - - case 23: --#line 191 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 195 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = split_text((yyvsp[0].str)); } --#line 1611 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1626 "src/preproc/eqn/eqn.cpp" - break; - - case 24: --#line 193 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 197 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new quoted_text_box((yyvsp[0].str)); } --#line 1617 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1632 "src/preproc/eqn/eqn.cpp" - break; - - case 25: --#line 195 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 199 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = split_text((yyvsp[0].str)); } --#line 1623 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1638 "src/preproc/eqn/eqn.cpp" - break; - - case 26: --#line 197 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 201 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new quoted_text_box((yyvsp[0].str)); } --#line 1629 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1644 "src/preproc/eqn/eqn.cpp" - break; - - case 27: --#line 199 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 203 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new half_space_box; } --#line 1635 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1650 "src/preproc/eqn/eqn.cpp" - break; - - case 28: --#line 201 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 205 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new space_box; } --#line 1641 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1656 "src/preproc/eqn/eqn.cpp" - break; - - case 29: --#line 203 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 207 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new tab_box; } --#line 1647 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1662 "src/preproc/eqn/eqn.cpp" - break; - - case 30: --#line 205 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 209 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[-1].b); } --#line 1653 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1668 "src/preproc/eqn/eqn.cpp" - break; - - case 31: --#line 207 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 211 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].pb)->set_alignment(CENTER_ALIGN); (yyval.b) = (yyvsp[0].pb); } --#line 1659 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1674 "src/preproc/eqn/eqn.cpp" - break; - - case 32: --#line 209 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 213 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].pb)->set_alignment(LEFT_ALIGN); (yyval.b) = (yyvsp[0].pb); } --#line 1665 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1680 "src/preproc/eqn/eqn.cpp" - break; - - case 33: --#line 211 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 215 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].pb)->set_alignment(RIGHT_ALIGN); (yyval.b) = (yyvsp[0].pb); } --#line 1671 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1686 "src/preproc/eqn/eqn.cpp" - break; - - case 34: --#line 213 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 217 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].pb)->set_alignment(CENTER_ALIGN); (yyval.b) = (yyvsp[0].pb); } --#line 1677 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1692 "src/preproc/eqn/eqn.cpp" - break; - - case 35: --#line 215 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 219 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[-1].mb); } --#line 1683 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1698 "src/preproc/eqn/eqn.cpp" - break; - - case 36: --#line 217 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 221 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_delim_box((yyvsp[-3].str), (yyvsp[-2].b), (yyvsp[0].str)); } --#line 1689 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1704 "src/preproc/eqn/eqn.cpp" - break; - - case 37: --#line 219 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 223 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_delim_box((yyvsp[-1].str), (yyvsp[0].b), 0); } --#line 1695 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1710 "src/preproc/eqn/eqn.cpp" - break; - - case 38: --#line 221 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 225 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_overline_box((yyvsp[-1].b)); } --#line 1701 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1716 "src/preproc/eqn/eqn.cpp" - break; - - case 39: --#line 223 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 227 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_underline_box((yyvsp[-1].b)); } --#line 1707 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1722 "src/preproc/eqn/eqn.cpp" - break; - - case 40: --#line 225 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 229 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_prime_box((yyvsp[-1].b)); } --#line 1713 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1728 "src/preproc/eqn/eqn.cpp" - break; - - case 41: --#line 227 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 231 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_accent_box((yyvsp[-2].b), (yyvsp[0].b)); } --#line 1719 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1734 "src/preproc/eqn/eqn.cpp" - break; - - case 42: --#line 229 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 233 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_uaccent_box((yyvsp[-2].b), (yyvsp[0].b)); } --#line 1725 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1740 "src/preproc/eqn/eqn.cpp" - break; - - case 43: --#line 231 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 235 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new font_box(strsave(get_grfont()), (yyvsp[0].b)); } --#line 1731 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1746 "src/preproc/eqn/eqn.cpp" - break; - - case 44: --#line 233 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 237 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new font_box(strsave(get_gbfont()), (yyvsp[0].b)); } --#line 1737 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1752 "src/preproc/eqn/eqn.cpp" - break; - - case 45: --#line 235 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 239 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new font_box(strsave(get_gfont()), (yyvsp[0].b)); } --#line 1743 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1758 "src/preproc/eqn/eqn.cpp" - break; - - case 46: --#line 237 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 241 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new fat_box((yyvsp[0].b)); } --#line 1749 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1764 "src/preproc/eqn/eqn.cpp" - break; - - case 47: --#line 239 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 243 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new font_box((yyvsp[-1].str), (yyvsp[0].b)); } --#line 1755 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1770 "src/preproc/eqn/eqn.cpp" - break; - - case 48: --#line 241 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 245 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new size_box((yyvsp[-1].str), (yyvsp[0].b)); } --#line 1761 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1776 "src/preproc/eqn/eqn.cpp" - break; - - case 49: --#line 243 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 247 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new hmotion_box((yyvsp[-1].n), (yyvsp[0].b)); } --#line 1767 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1782 "src/preproc/eqn/eqn.cpp" - break; - - case 50: --#line 245 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 249 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new hmotion_box(-(yyvsp[-1].n), (yyvsp[0].b)); } --#line 1773 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1788 "src/preproc/eqn/eqn.cpp" - break; - - case 51: --#line 247 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 251 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new vmotion_box((yyvsp[-1].n), (yyvsp[0].b)); } --#line 1779 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1794 "src/preproc/eqn/eqn.cpp" - break; - - case 52: --#line 249 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 253 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new vmotion_box(-(yyvsp[-1].n), (yyvsp[0].b)); } --#line 1785 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1800 "src/preproc/eqn/eqn.cpp" - break; - - case 53: --#line 251 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 255 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].b)->set_spacing_type((yyvsp[-1].str)); (yyval.b) = (yyvsp[0].b); } --#line 1791 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1806 "src/preproc/eqn/eqn.cpp" - break; - - case 54: --#line 253 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 257 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new vcenter_box((yyvsp[0].b)); } --#line 1797 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1812 "src/preproc/eqn/eqn.cpp" - break; - - case 55: --#line 255 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 259 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_special_box((yyvsp[-1].str), (yyvsp[0].b)); } --#line 1803 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1818 "src/preproc/eqn/eqn.cpp" - break; - - case 56: --#line 260 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 264 "src/preproc/eqn/eqn.ypp" - { - int n; - if (sscanf((yyvsp[0].str), "%d", &n) == 1) - (yyval.n) = n; - a_delete (yyvsp[0].str); - } --#line 1814 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1829 "src/preproc/eqn/eqn.cpp" - break; - - case 57: --#line 270 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 274 "src/preproc/eqn/eqn.ypp" - { (yyval.pb) = new pile_box((yyvsp[0].b)); } --#line 1820 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1835 "src/preproc/eqn/eqn.cpp" - break; - - case 58: --#line 272 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 276 "src/preproc/eqn/eqn.ypp" - { (yyvsp[-2].pb)->append((yyvsp[0].b)); (yyval.pb) = (yyvsp[-2].pb); } --#line 1826 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1841 "src/preproc/eqn/eqn.cpp" - break; - - case 59: --#line 277 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 281 "src/preproc/eqn/eqn.ypp" - { (yyval.pb) = (yyvsp[-1].pb); } --#line 1832 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1847 "src/preproc/eqn/eqn.cpp" - break; - - case 60: --#line 279 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 283 "src/preproc/eqn/eqn.ypp" - { (yyvsp[-1].pb)->set_space((yyvsp[-3].n)); (yyval.pb) = (yyvsp[-1].pb); } --#line 1838 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1853 "src/preproc/eqn/eqn.cpp" - break; - - case 61: --#line 284 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 288 "src/preproc/eqn/eqn.ypp" - { (yyval.mb) = new matrix_box((yyvsp[0].col)); } --#line 1844 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1859 "src/preproc/eqn/eqn.cpp" - break; - - case 62: --#line 286 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 290 "src/preproc/eqn/eqn.ypp" - { (yyvsp[-1].mb)->append((yyvsp[0].col)); (yyval.mb) = (yyvsp[-1].mb); } --#line 1850 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1865 "src/preproc/eqn/eqn.cpp" - break; - - case 63: --#line 291 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 295 "src/preproc/eqn/eqn.ypp" - { (yyval.col) = new column((yyvsp[0].b)); } --#line 1856 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1871 "src/preproc/eqn/eqn.cpp" - break; - - case 64: --#line 293 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 297 "src/preproc/eqn/eqn.ypp" - { (yyvsp[-2].col)->append((yyvsp[0].b)); (yyval.col) = (yyvsp[-2].col); } --#line 1862 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1877 "src/preproc/eqn/eqn.cpp" - break; - - case 65: --#line 298 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 302 "src/preproc/eqn/eqn.ypp" - { (yyval.col) = (yyvsp[-1].col); } --#line 1868 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1883 "src/preproc/eqn/eqn.cpp" - break; - - case 66: --#line 300 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 304 "src/preproc/eqn/eqn.ypp" - { (yyvsp[-1].col)->set_space((yyvsp[-3].n)); (yyval.col) = (yyvsp[-1].col); } --#line 1874 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1889 "src/preproc/eqn/eqn.cpp" - break; - - case 67: --#line 305 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 309 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].col)->set_alignment(CENTER_ALIGN); (yyval.col) = (yyvsp[0].col); } --#line 1880 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1895 "src/preproc/eqn/eqn.cpp" - break; - - case 68: --#line 307 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 311 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].col)->set_alignment(LEFT_ALIGN); (yyval.col) = (yyvsp[0].col); } --#line 1886 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1901 "src/preproc/eqn/eqn.cpp" - break; - - case 69: --#line 309 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 313 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].col)->set_alignment(RIGHT_ALIGN); (yyval.col) = (yyvsp[0].col); } --#line 1892 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1907 "src/preproc/eqn/eqn.cpp" - break; - - case 70: --#line 311 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 315 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].col)->set_alignment(CENTER_ALIGN); (yyval.col) = (yyvsp[0].col); } --#line 1898 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1913 "src/preproc/eqn/eqn.cpp" - break; - - case 71: --#line 315 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 319 "src/preproc/eqn/eqn.ypp" - { (yyval.str) = (yyvsp[0].str); } --#line 1904 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1919 "src/preproc/eqn/eqn.cpp" - break; - - case 72: --#line 317 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 321 "src/preproc/eqn/eqn.ypp" - { (yyval.str) = (yyvsp[0].str); } --#line 1910 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1925 "src/preproc/eqn/eqn.cpp" - break; - - case 73: --#line 322 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 326 "src/preproc/eqn/eqn.ypp" - { (yyval.str) = (yyvsp[0].str); } --#line 1916 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1931 "src/preproc/eqn/eqn.cpp" - break; - - case 74: --#line 324 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 328 "src/preproc/eqn/eqn.ypp" - { (yyval.str) = strsave("{"); } --#line 1922 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1937 "src/preproc/eqn/eqn.cpp" - break; - - case 75: --#line 326 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 330 "src/preproc/eqn/eqn.ypp" - { (yyval.str) = strsave("}"); } --#line 1928 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1943 "src/preproc/eqn/eqn.cpp" - break; - - --#line 1932 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1947 "src/preproc/eqn/eqn.cpp" -+ - default: break; - } - /* User semantic actions sometimes alter yychar, and that requires -@@ -2042,12 +2058,10 @@ yyerrlab: - | yyerrorlab -- error raised explicitly by YYERROR. | - `---------------------------------------------------*/ - yyerrorlab: -- -- /* Pacify compilers like GCC when the user code never invokes -- YYERROR and the label yyerrorlab therefore never appears in user -- code. */ -- if (/*CONSTCOND*/ 0) -- goto yyerrorlab; -+ /* Pacify compilers when the user code never invokes YYERROR and the -+ label yyerrorlab therefore never appears in user code. */ -+ if (0) -+ YYERROR; - - /* Do not reclaim the symbols of the rule whose action triggered - this YYERROR. */ -@@ -2109,6 +2123,7 @@ yyacceptlab: - yyresult = 0; - goto yyreturn; - -+ - /*-----------------------------------. - | yyabortlab -- YYABORT comes here. | - `-----------------------------------*/ -@@ -2116,6 +2131,7 @@ yyabortlab: - yyresult = 1; - goto yyreturn; - -+ - #if !defined yyoverflow || YYERROR_VERBOSE - /*-------------------------------------------------. - | yyexhaustedlab -- memory exhaustion comes here. | -@@ -2126,6 +2142,10 @@ yyexhaustedlab: - /* Fall through. */ - #endif - -+ -+/*-----------------------------------------------------. -+| yyreturn -- parsing is finished, return the result. | -+`-----------------------------------------------------*/ - yyreturn: - if (yychar != YYEMPTY) - { -@@ -2155,5 +2175,5 @@ yyreturn: - #endif - return yyresult; - } --#line 329 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1903 */ -+#line 333 "src/preproc/eqn/eqn.ypp" - -diff --git a/src/preproc/eqn/eqn.hpp b/src/preproc/eqn/eqn.hpp -index 32a32a5..9a092c1 100644 ---- a/src/preproc/eqn/eqn.hpp -+++ b/src/preproc/eqn/eqn.hpp -@@ -1,8 +1,9 @@ --/* A Bison parser, made by GNU Bison 3.2. */ -+/* A Bison parser, made by GNU Bison 3.4.1. */ - - /* Bison interface for Yacc-like parsers in C - -- Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc. -+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, -+ Inc. - - 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 -@@ -170,10 +171,9 @@ extern int yydebug; - - /* Value type. */ - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -- - union YYSTYPE - { --#line 30 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1906 */ -+#line 34 "src/preproc/eqn/eqn.ypp" - - char *str; - box *b; -@@ -182,9 +182,9 @@ union YYSTYPE - int n; - column *col; - --#line 186 "src/preproc/eqn/eqn.hpp" /* yacc.c:1906 */ --}; -+#line 186 "src/preproc/eqn/eqn.hpp" - -+}; - typedef union YYSTYPE YYSTYPE; - # define YYSTYPE_IS_TRIVIAL 1 - # define YYSTYPE_IS_DECLARED 1 diff --git a/src/preproc/eqn/eqn.ypp b/src/preproc/eqn/eqn.ypp index fb318c3..b7b647e 100644 --- a/src/preproc/eqn/eqn.ypp 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 0867452ce..983cb9aea 100644 --- a/poky/meta/recipes-extended/groff/groff_1.22.4.bb +++ b/poky/meta/recipes-extended/groff/groff_1.22.4.bb @@ -18,6 +18,9 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f" SRC_URI[sha256sum] = "e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293" +# Remove at the next upgrade +PR = "r1" + DEPENDS = "bison-native" RDEPENDS_${PN} += "perl sed" @@ -30,6 +33,13 @@ PARALLEL_MAKE = "" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl' ac_cv_path_BASH_PROG='no' PAGE=A4" +# Delete these generated files since we depend on bison-native +# and regenerate them. Do it deterministically (always). +do_configure_prepend() { + rm -f ${S}/src/preproc/eqn/eqn.cpp + rm -f ${S}/src/preproc/eqn/eqn.hpp +} + do_install_append() { # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location # for target as /usr/bin/perl, so fix it to /usr/bin/perl. diff --git a/poky/meta/recipes-extended/iptables/iptables_1.8.6.bb b/poky/meta/recipes-extended/iptables/iptables_1.8.7.bb index 9c15b0bc9..621f87ff8 100644 --- a/poky/meta/recipes-extended/iptables/iptables_1.8.6.bb +++ b/poky/meta/recipes-extended/iptables/iptables_1.8.7.bb @@ -16,7 +16,7 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://ip6tables.service \ file://ip6tables.rules \ " -SRC_URI[sha256sum] = "a0f4fe0c3eb8faa5bd9c8376d132f340b9558e750c91deb2d5028aa3d0047767" +SRC_URI[sha256sum] = "c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0" SYSTEMD_SERVICE_${PN} = "\ iptables.service \ diff --git a/poky/meta/recipes-extended/iputils/iputils_s20200821.bb b/poky/meta/recipes-extended/iputils/iputils_s20200821.bb index 28dd194a1..e43abf262 100644 --- a/poky/meta/recipes-extended/iputils/iputils_s20200821.bb +++ b/poky/meta/recipes-extended/iputils/iputils_s20200821.bb @@ -26,7 +26,7 @@ CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" PACKAGECONFIG ??= "libcap rarpd \ ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" +PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false -DNO_SETCAP_OR_SUID=true, libcap libcap-native" PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," @@ -38,8 +38,7 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN inherit meson systemd update-alternatives -# Have to disable setcap/suid as its not deterministic -EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" +EXTRA_OEMESON += "--prefix=${root_prefix}/" ALTERNATIVE_PRIORITY = "100" diff --git a/poky/meta/recipes-extended/libarchive/libarchive_3.4.3.bb b/poky/meta/recipes-extended/libarchive/libarchive_3.5.1.bb index dbfc067b9..1387b6906 100644 --- a/poky/meta/recipes-extended/libarchive/libarchive_3.4.3.bb +++ b/poky/meta/recipes-extended/libarchive/libarchive_3.5.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "C library and command-line tools for reading and writing tar, cpi HOMEPAGE = "http://www.libarchive.org/" SECTION = "devel" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=fe01f5e02b1f0cc934d593a7b0ddceb6" +LIC_FILES_CHKSUM = "file://COPYING;md5=d499814247adaee08d88080841cb5665" DEPENDS = "e2fsprogs-native" @@ -34,7 +34,7 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[sha256sum] = "ee1e749213c108cb60d53147f18c31a73d6717d7e3d2481c157e1b34c881ea39" +SRC_URI[sha256sum] = "9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a" inherit autotools update-alternatives pkgconfig diff --git a/poky/meta/recipes-extended/libsolv/libsolv_0.7.16.bb b/poky/meta/recipes-extended/libsolv/libsolv_0.7.17.bb index f7902727c..8597ea3ed 100644 --- a/poky/meta/recipes-extended/libsolv/libsolv_0.7.16.bb +++ b/poky/meta/recipes-extended/libsolv/libsolv_0.7.17.bb @@ -10,7 +10,7 @@ DEPENDS = "expat zlib" SRC_URI = "git://github.com/openSUSE/libsolv.git \ " -SRCREV = "7046fb004987c7f1b3722628d9a4ca1c67577188" +SRCREV = "4bc791c0d235eb14bfe4c5da607206bfdfa6983d" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.57.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb index 9a9cad68c..705ece8e1 100644 --- a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.57.bb +++ b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb @@ -19,7 +19,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ " -SRC_URI[sha256sum] = "52ca961b89c12f7ecbb2e4e0c5a9e79b2863c64e33c42832a165e7f894d6217f" +SRC_URI[sha256sum] = "fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5" PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ diff --git a/poky/meta/recipes-extended/logrotate/logrotate_3.17.0.bb b/poky/meta/recipes-extended/logrotate/logrotate_3.18.0.bb index 08001f38e..270052f46 100644 --- a/poky/meta/recipes-extended/logrotate/logrotate_3.17.0.bb +++ b/poky/meta/recipes-extended/logrotate/logrotate_3.18.0.bb @@ -18,7 +18,7 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz file://disable-check-different-filesystems.patch \ " -SRC_URI[sha256sum] = "58cc2178ff57faa3c0490181cce041345aeca6cff18dba1c5cd1398bf1c19294" +SRC_URI[sha256sum] = "841f81bf09d0014e4a2e11af166bb33fcd8429cc0c2d4a7d3d9ceb3858cfccc5" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}" 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 deleted file mode 100644 index 381ac417c..000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-ltp-pan-Use-long-long-int-to-print-time_t.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6c2085badea7b461245837c452a0d3d8a8c2afff Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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", -- "<<<test_start>>>", running->cmd->name, running->mystime, -+ ("%s\ntag=%s stime=%lld\ncmdline=\"%s\"\ncontacts=\"%s\"\nanalysis=%s\n%s\n", -+ "<<<test_start>>>", running->cmd->name, (long long)running->mystime, - running->cmd->cmdline, "", "exit", "<<<test_output>>>"); - } - fflush(stdout); --- -2.29.2 - diff --git a/poky/meta/recipes-extended/ltp/ltp/determinism.patch b/poky/meta/recipes-extended/ltp/ltp/determinism.patch new file mode 100644 index 000000000..76d40721b --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/determinism.patch @@ -0,0 +1,43 @@ +open_posix_testsuite/generate-makefiles.sh: Fix determinism issue + +Currently the list of tests is generated by the order of the files found +within the directories. This results in differences in the run.sh and +Makefiles. Within Yocto Project this results in differing target +test packages. The fix is simple, just sort the output from locate-test. + +mk/lib.mk: Sort wildcard expansion for determinism + +The order of the objects linked into libltp.a varies depending on the +order of the files found on disk. This results in most ltp binaries +differing depending on that order too. + +Sort the wildcard expansion of *.c which leads to reproducible binaries. + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2021-March/021272.html http://lists.linux.it/pipermail/ltp/2021-March/021273.html] + +Index: git/testcases/open_posix_testsuite/scripts/generate-makefiles.sh +=================================================================== +--- git.orig/testcases/open_posix_testsuite/scripts/generate-makefiles.sh ++++ git/testcases/open_posix_testsuite/scripts/generate-makefiles.sh +@@ -24,7 +24,7 @@ generate_locate_test_makefile() { + + echo "Generating $maketype Makefiles" + +- locate-test --$maketype | sed -e 's,^./,,g' > make-gen.$maketype ++ locate-test --$maketype | sed -e 's,^./,,g' | sort > make-gen.$maketype + + generate_makefiles make-gen.$maketype $* + +Index: git/include/mk/lib.mk +=================================================================== +--- git.orig/include/mk/lib.mk ++++ git/include/mk/lib.mk +@@ -50,6 +50,7 @@ endif + MAKE_TARGETS += $(LIB) + + LIBSRCS ?= $(wildcard $(abs_srcdir)/*.c) ++LIBSRCS := $(sort $(LIBSRCS)) + LIBSRCS := $(abspath $(LIBSRCS)) + LIBSRCS := $(subst $(abs_srcdir)/,,$(wildcard $(LIBSRCS))) + LIBSRCS := $(filter-out $(FILTER_OUT_LIBSRCS),$(LIBSRCS)) diff --git a/poky/meta/recipes-extended/ltp/ltp_20200930.bb b/poky/meta/recipes-extended/ltp/ltp_20210121.bb index e3c49fbf5..593f07087 100644 --- a/poky/meta/recipes-extended/ltp/ltp_20200930.bb +++ b/poky/meta/recipes-extended/ltp/ltp_20210121.bb @@ -27,14 +27,18 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "da2f34028f046a208aa2fed5e287df2538e69f91" +SRCREV = "4d005621edd109d119627eb9210b224a63bf22cb" + +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ 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 \ + file://determinism.patch \ " S = "${WORKDIR}/git" @@ -52,6 +56,14 @@ EXTRA_OECONF = " --with-realtime-testsuite --with-open-posix-testsuite " # ltp network/rpc test cases ftbfs when libtirpc is found EXTRA_OECONF += " --without-tirpc " +do_compile_prepend() { + # Reported at http://lists.linux.it/pipermail/ltp/2021-March/021274.html + # Avoid a race over construction of libswapon.o which is built by swapon and swapoff + # but the object differs depending upon which one built it + # ("../swapon/libswapon.c" vs "libswapon.c" references) + make -C ${B}/testcases/kernel/syscalls/swapon/ +} + do_install(){ install -d ${D}${prefix}/ oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install diff --git a/poky/meta/recipes-extended/lzip/lzip_1.21.bb b/poky/meta/recipes-extended/lzip/lzip_1.22.bb index bb3d2a6fe..d21c36a3f 100644 --- a/poky/meta/recipes-extended/lzip/lzip_1.21.bb +++ b/poky/meta/recipes-extended/lzip/lzip_1.22.bb @@ -3,11 +3,11 @@ HOMEPAGE = "http://lzip.nongnu.org/lzip.html" SECTION = "console/utils" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ - file://decoder.cc;beginline=3;endline=16;md5=db09fe3f9573f94d0076f7f07959e6e1" + file://decoder.cc;beginline=3;endline=16;md5=18c279060cd0be128188404b45837f88 \ + " SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz" -SRC_URI[md5sum] = "c0061730d017ea593a09308edc547128" -SRC_URI[sha256sum] = "e48b5039d3164d670791f9c5dbaa832bf2df080cb1fbb4f33aa7b3300b670d8b" +SRC_URI[sha256sum] = "c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948" B = "${WORKDIR}/build" do_configure[cleandirs] = "${B}" 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.4.bb index e8da92bd1..432953a1b 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.4.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ file://99_mandb \ file://man_db.conf-avoid-multilib-install-file-conflict.patch" -SRC_URI[sha256sum] = "fa5aa11ab0692daf737e76947f45669225db310b2801a5911bceb7551c5597b8" +SRC_URI[sha256sum] = "b66c99edfad16ad928c889f87cf76380263c1609323c280b3a9e6963fdb16756" DEPENDS = "libpipeline gdbm groff-native base-passwd" RDEPENDS_${PN} += "base-passwd" @@ -21,11 +21,6 @@ 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/mc/mc_4.8.25.bb b/poky/meta/recipes-extended/mc/mc_4.8.26.bb index 83c8a6ecf..3eb19309b 100644 --- a/poky/meta/recipes-extended/mc/mc_4.8.25.bb +++ b/poky/meta/recipes-extended/mc/mc_4.8.26.bb @@ -11,7 +11,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://nomandate.patch \ " -SRC_URI[sha256sum] = "407dc20f70082f26c7f5716406cb755cbb6cba3f2f13b841b79a991282d310c2" +SRC_URI[sha256sum] = "9d6358d0a351a455a1410aab57f33b6b48b0fcf31344b9a10b0ff497595979d1" inherit autotools gettext pkgconfig @@ -22,6 +22,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[smb] = "--enable-vfs-smb,--disable-vfs-smb,samba," PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," +CFLAGS_append_libc-musl = ' -DNCURSES_WIDECHAR=1 ' EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable-configure-args" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" diff --git a/poky/meta/recipes-extended/net-tools/net-tools/Bug_443075-ifconfig.c-pointtopoint_spelling.patch b/poky/meta/recipes-extended/net-tools/net-tools/Bug_443075-ifconfig.c-pointtopoint_spelling.patch deleted file mode 100644 index 74d74668c..000000000 --- a/poky/meta/recipes-extended/net-tools/net-tools/Bug_443075-ifconfig.c-pointtopoint_spelling.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Accept "pointtopoint" as a synonym for "pointopoint" -Bug-Debian: https://bugs.debian.org/443075 -Author: Justin Pryzby <pryzbyj@libra> - -Upstream-Status: Pending -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - ---- a/ifconfig.c -+++ b/ifconfig.c -@@ -644,14 +644,14 @@ - spp++; - continue; - } -- if (!strcmp(*spp, "-pointopoint")) { -+ if (!strcmp(*spp, "-pointopoint") || !strcmp(*spp, "-pointtopoint")) { - goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT); - spp++; - if (test_flag(ifr.ifr_name, IFF_POINTOPOINT) > 0) - fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name); - continue; - } -- if (!strcmp(*spp, "pointopoint")) { -+ if (!strcmp(*spp, "pointopoint") || !strcmp(*spp, "pointtopoint")) { - if (*(spp + 1) != NULL) { - spp++; - safe_strncpy(host, *spp, (sizeof host)); diff --git a/poky/meta/recipes-extended/net-tools/net-tools/Bug_541172-netstat.c-exit-codes.patch b/poky/meta/recipes-extended/net-tools/net-tools/Bug_541172-netstat.c-exit-codes.patch deleted file mode 100644 index 782b94bc6..000000000 --- a/poky/meta/recipes-extended/net-tools/net-tools/Bug_541172-netstat.c-exit-codes.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Bug#541172: netstat.c exit codes - -Upstream-Status: Pending -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - ---- a/netstat.c -+++ b/netstat.c -@@ -2237,12 +2237,14 @@ - parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp); - #else - ENOSUPP("netstat", "AF INET"); -+ exit(1); - #endif - } else if(!strcmp(afname, "inet6")) { - #if HAVE_AFINET6 - parsesnmp6(flag_raw, flag_tcp, flag_udp); - #else - ENOSUPP("netstat", "AF INET6"); -+ exit(1); - #endif - } else { - printf(_("netstat: No statistics support for specified address family: %s\n"), afname); diff --git a/poky/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb b/poky/meta/recipes-extended/net-tools/net-tools_2.10.bb index e97731073..de4a71597 100644 --- a/poky/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb +++ b/poky/meta/recipes-extended/net-tools/net-tools_2.10.bb @@ -6,18 +6,13 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://ifconfig.c;beginline=11;endline=15;md5=d1ca372080ad5401e23ca0afc35cf9ba" -PV = "1.60-20181103+git${SRCPV}" -SRCREV = "0eebece8c964e3cfa8a018f42b2e7e751a7009a0" +SRCREV = "80d7b95067f1f22fece9537dea6dff53081f4886" SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https \ file://net-tools-config.h \ file://net-tools-config.make \ file://Add_missing_headers.patch \ - file://Bug_443075-ifconfig.c-pointtopoint_spelling.patch \ - file://Bug_541172-netstat.c-exit-codes.patch \ " -UPSTREAM_VERSION_UNKNOWN = "1" - S = "${WORKDIR}/git" inherit gettext @@ -30,6 +25,8 @@ PACKAGECONFIG[hostname] = "" PACKAGECONFIG[arp] = "" PACKAGECONFIG[serial] = "" PACKAGECONFIG[plip] = "" +PACKAGECONFIG[slattach] = "" +PACKAGECONFIG[plipconfig] = "" do_configure() { # net-tools has its own config mechanism requiring "make config" @@ -107,4 +104,18 @@ python __anonymous() { } ALTERNATIVE_PRIORITY = "100" +NETTOOLS_PACKAGES = "${PN}-mii-tool" +NETTOOLS_PACKAGES_class-native = "" + +PACKAGE_BEFORE_PN = "${NETTOOLS_PACKAGES}" +RDEPENDS_${PN} += "${NETTOOLS_PACKAGES}" + +FILES_${PN}-mii-tool = "${base_sbindir}/mii-tool" + +ALTERNATIVE_${PN}_remove = "mii-tool" + +ALTERNATIVE_${PN}-mii-tool = "mii-tool" +ALTERNATIVE_TARGET[mii-tool] = "${base_sbindir}/mii-tool" +ALTERNATIVE_LINK_NAME[mii-tool] = "${base_sbindir}/mii-tool" + BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-extended/pam/libpam/run-ptest b/poky/meta/recipes-extended/pam/libpam/run-ptest new file mode 100644 index 000000000..69e729ce2 --- /dev/null +++ b/poky/meta/recipes-extended/pam/libpam/run-ptest @@ -0,0 +1,31 @@ +#! /bin/sh + +cd tests + +failed=0 +all=0 + +for f in tst-*; do + "./$f" > /dev/null 2>&1 + case "$?" in + 0) + echo "PASS: $f" + all=$((all + 1)) + ;; + 77) + echo "SKIP: $f" + ;; + *) + echo "FAIL: $f" + failed=$((failed + 1)) + all=$((all + 1)) + ;; + esac +done + +if [ "$failed" -eq 0 ] ; then + echo "All $all tests passed" +else + echo "$failed of $all tests failed" +fi + diff --git a/poky/meta/recipes-extended/pam/libpam_1.3.1.bb b/poky/meta/recipes-extended/pam/libpam_1.3.1.bb index b58b9ac5f..adc641505 100644 --- a/poky/meta/recipes-extended/pam/libpam_1.3.1.bb +++ b/poky/meta/recipes-extended/pam/libpam_1.3.1.bb @@ -128,6 +128,13 @@ python populate_packages_prepend () { do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') } +do_compile_ptest() { + cd tests + sed -i -e 's/$(MAKE) $(AM_MAKEFLAGS) check-TESTS//' Makefile + oe_runmake check-am + cd - +} + do_install() { autotools_do_install @@ -147,6 +154,13 @@ do_install() { fi } +do_install_ptest() { + if [ ${PTEST_ENABLED} = "1" ]; then + mkdir -p ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests + fi +} + inherit features_check REQUIRED_DISTRO_FEATURES = "pam" diff --git a/poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch b/poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch deleted file mode 100644 index 829c0c8b7..000000000 --- a/poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ddbefd80d74c3baaae328332458db447e1666240 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 27 Apr 2017 16:37:24 +0300 -Subject: [PATCH] Move python helper scripts (used only in tests) to Python 3 - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - tests/gpt-header-move | 2 +- - tests/msdos-overlap | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/gpt-header-move b/tests/gpt-header-move -index 3dda5cb..a2b9508 100755 ---- a/tests/gpt-header-move -+++ b/tests/gpt-header-move -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python3 - - # open img file, subtract 33 from altlba address, and move the last 33 sectors - # back by 33 sectors -diff --git a/tests/msdos-overlap b/tests/msdos-overlap -index d6ae8d6..2c6747b 100755 ---- a/tests/msdos-overlap -+++ b/tests/msdos-overlap -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python3 - """ - Write an overlapping partition to a msdos disk - diff --git a/poky/meta/recipes-extended/parted/files/0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch b/poky/meta/recipes-extended/parted/files/0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch deleted file mode 100644 index 4dc2ab259..000000000 --- a/poky/meta/recipes-extended/parted/files/0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d60a8a86f6593738b5324ccd8fe3e6d84a1fe7bc Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 11 Dec 2019 14:18:36 +0100 -Subject: [PATCH] libparted/fs: add $sourcedir/lib to include paths - -Otherwise, getopt-pfx-core.h won't be found. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - libparted/fs/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am -index 286bff6..65f45d3 100644 ---- a/libparted/fs/Makefile.am -+++ b/libparted/fs/Makefile.am -@@ -3,7 +3,7 @@ - # - # This file may be modified and/or distributed without restriction. - --partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include -+partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib - - AM_CFLAGS = $(WARN_CFLAGS) - diff --git a/poky/meta/recipes-extended/parted/files/0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch b/poky/meta/recipes-extended/parted/files/0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch deleted file mode 100644 index 9524adf7b..000000000 --- a/poky/meta/recipes-extended/parted/files/0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 9f844484cedb39e301b016e9da7852c1a0fb6eea Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 11 Dec 2019 16:27:48 +0100 -Subject: [PATCH] tests: use skip_ rather than skip_test_ (which is undefined) - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - tests/t6001-psep.sh | 2 +- - tests/t6004-dm-many-partitions.sh | 2 +- - tests/t6005-dm-uuid.sh | 2 +- - tests/t6006-dm-512b-sectors.sh | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/t6001-psep.sh b/tests/t6001-psep.sh -index e350bd2..67014a0 100644 ---- a/tests/t6001-psep.sh -+++ b/tests/t6001-psep.sh -@@ -21,7 +21,7 @@ - require_root_ - require_udevadm_settle_ - --(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed" -+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed" - - # Device maps names - should be random to not conflict with existing ones on - # the system -diff --git a/tests/t6004-dm-many-partitions.sh b/tests/t6004-dm-many-partitions.sh -index b4be975..7214f60 100755 ---- a/tests/t6004-dm-many-partitions.sh -+++ b/tests/t6004-dm-many-partitions.sh -@@ -21,7 +21,7 @@ - - require_root_ - require_udevadm_settle_ --(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed" -+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed" - - ss=$sector_size_ - ns=300 -diff --git a/tests/t6005-dm-uuid.sh b/tests/t6005-dm-uuid.sh -index 4266747..4790a8b 100755 ---- a/tests/t6005-dm-uuid.sh -+++ b/tests/t6005-dm-uuid.sh -@@ -21,7 +21,7 @@ - - require_root_ - require_udevadm_settle_ --(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed" -+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed" - - ss=$sector_size_ - ns=300 -diff --git a/tests/t6006-dm-512b-sectors.sh b/tests/t6006-dm-512b-sectors.sh -index bf32135..b679adb 100644 ---- a/tests/t6006-dm-512b-sectors.sh -+++ b/tests/t6006-dm-512b-sectors.sh -@@ -25,7 +25,7 @@ require_scsi_debug_module_ - grep '^#define USE_BLKID 1' "$CONFIG_HEADER" > /dev/null || - skip_ 'this system lacks a new-enough libblkid' - --(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed" -+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed" - - # Device maps names - should be random to not conflict with existing ones on - # the system diff --git a/poky/meta/recipes-extended/parted/parted_3.3.bb b/poky/meta/recipes-extended/parted/parted_3.4.bb index ce40c04ad..79dad5468 100644 --- a/poky/meta/recipes-extended/parted/parted_3.3.bb +++ b/poky/meta/recipes-extended/parted/parted_3.4.bb @@ -9,14 +9,11 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://no_check.patch \ file://fix-doc-mandir.patch \ file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \ - file://0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch \ file://run-ptest \ - file://0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch \ - file://0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch \ " -SRC_URI[md5sum] = "090655d05f3c471aa8e15a27536889ec" -SRC_URI[sha256sum] = "57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44" +SRC_URI[md5sum] = "357d19387c6e7bc4a8a90fe2d015fe80" +SRC_URI[sha256sum] = "e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342" EXTRA_OECONF = "--disable-device-mapper" @@ -42,13 +39,14 @@ do_install_ptest() { sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" $t/tests/Makefile sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile + sed -i "/^BUILDINFO.*$/d" $t/tests/Makefile for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \ do cp ${B}/tests/.libs/$i $t/tests/; \ done sed -e 's| ../parted||' -i $t/tests/*.sh } -RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs" +RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs python3-core" RRECOMMENDS_${PN}-ptest = "kernel-module-scsi-debug" RDEPENDS_${PN}-ptest_append_libc-glibc = "\ glibc-utils \ diff --git a/poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb b/poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb index 7219c7d11..d42eadb58 100644 --- a/poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb +++ b/poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb @@ -13,7 +13,6 @@ inherit cpan ptest-perl BBCLASSEXTEND = "native" -RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local" RDEPENDS_${PN}-ptest += "perl-module-test-more perl-module-utf8" diff --git a/poky/meta/recipes-extended/pigz/pigz_2.4.bb b/poky/meta/recipes-extended/pigz/pigz_2.6.bb index 8c65ec34f..05be9b733 100644 --- a/poky/meta/recipes-extended/pigz/pigz_2.4.bb +++ b/poky/meta/recipes-extended/pigz/pigz_2.6.bb @@ -9,8 +9,7 @@ LICENSE = "Zlib & Apache-2.0" LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21" SRC_URI = "http://zlib.net/${BPN}/fossils/${BP}.tar.gz" -SRC_URI[md5sum] = "def2f6e19d9d8231445adc1349d346df" -SRC_URI[sha256sum] = "a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73" +SRC_URI[sha256sum] = "2eed7b0d7449d1d70903f2a62cd6005d262eb3a8c9e98687bc8cbb5809db2a7d" PROVIDES_class-native += "gzip-native" # Point this at the homepage in case /fossils/ isn't updated diff --git a/poky/meta/recipes-extended/procps/procps_3.3.16.bb b/poky/meta/recipes-extended/procps/procps_3.3.16.bb index 2810ebd28..ef3ac86e9 100644 --- a/poky/meta/recipes-extended/procps/procps_3.3.16.bb +++ b/poky/meta/recipes-extended/procps/procps_3.3.16.bb @@ -74,3 +74,28 @@ python __anonymous() { # 'ps' isn't suitable for use as a security tool so whitelist this CVE. # https://bugzilla.redhat.com/show_bug.cgi?id=1575473#c3 CVE_CHECK_WHITELIST += "CVE-2018-1121" + +PROCPS_PACKAGES = "${PN}-lib \ + ${PN}-ps \ + ${PN}-sysctl" + +PACKAGE_BEFORE_PN = "${PROCPS_PACKAGES}" +RDEPENDS_${PN} += "${PROCPS_PACKAGES}" + +RDEPENDS_${PN}-ps += "${PN}-lib" +RDEPENDS_${PN}-sysctl += "${PN}-lib" + +FILES_${PN}-lib = "${libdir}" +FILES_${PN}-ps = "${base_bindir}/ps.${BPN}" +FILES_${PN}-sysctl = "${base_sbindir}/sysctl.${BPN} ${sysconfdir}/sysctl.conf ${sysconfdir}/sysctl.d" + +ALTERNATIVE_${PN}_remove = "ps" +ALTERNATIVE_${PN}_remove = "sysctl" + +ALTERNATIVE_${PN}-ps = "ps" +ALTERNATIVE_TARGET[ps] = "${base_bindir}/ps" +ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps" + +ALTERNATIVE_${PN}-sysctl = "sysctl" +ALTERNATIVE_TARGET[sysctl] = "${base_sbindir}/sysctl" +ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl"
\ No newline at end of file diff --git a/poky/meta/recipes-extended/psmisc/psmisc_23.3.bb b/poky/meta/recipes-extended/psmisc/psmisc_23.4.bb index e569f1074..894443f4e 100644 --- a/poky/meta/recipes-extended/psmisc/psmisc_23.3.bb +++ b/poky/meta/recipes-extended/psmisc/psmisc_23.4.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \ file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ " -SRCREV = "78bde849041e6c914a2a517ebe1255b86dc98772" +SRCREV = "5fab6b7ab385080f1db725d6803136ec1841a15f" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/screen/screen/CVE-2021-26937.patch b/poky/meta/recipes-extended/screen/screen/CVE-2021-26937.patch new file mode 100644 index 000000000..983b35c1b --- /dev/null +++ b/poky/meta/recipes-extended/screen/screen/CVE-2021-26937.patch @@ -0,0 +1,68 @@ +Description: [CVE-2021-26937] Fix out of bounds array access +Author: Michael Schröder <mls@suse.de> +Bug-Debian: https://bugs.debian.org/982435 +Bug: https://savannah.gnu.org/bugs/?60030 +Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html +Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 +Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html + +CVE: CVE-2021-26937 +Upstream-Status: Pending +Signed-off-by: Scott Murray <scott.murray@konsulko.com> + +--- a/encoding.c ++++ b/encoding.c +@@ -43,7 +43,7 @@ + # ifdef UTF8 + static int recode_char __P((int, int, int)); + static int recode_char_to_encoding __P((int, int)); +-static void comb_tofront __P((int, int)); ++static void comb_tofront __P((int)); + # ifdef DW_CHARS + static int recode_char_dw __P((int, int *, int, int)); + static int recode_char_dw_to_encoding __P((int, int *, int)); +@@ -1263,6 +1263,8 @@ + {0x30000, 0x3FFFD}, + }; + ++ if (c >= 0xdf00 && c <= 0xdfff) ++ return 1; /* dw combining sequence */ + return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || + (cjkwidth && + bisearch(c, ambiguous, +@@ -1330,11 +1332,12 @@ + } + + static void +-comb_tofront(root, i) +-int root, i; ++comb_tofront(i) ++int i; + { + for (;;) + { ++ int root = i >= 0x700 ? 0x801 : 0x800; + debug1("bring to front: %x\n", i); + combchars[combchars[i]->prev]->next = combchars[i]->next; + combchars[combchars[i]->next]->prev = combchars[i]->prev; +@@ -1396,9 +1399,9 @@ + { + /* full, recycle old entry */ + if (c1 >= 0xd800 && c1 < 0xe000) +- comb_tofront(root, c1 - 0xd800); ++ comb_tofront(c1 - 0xd800); + i = combchars[root]->prev; +- if (c1 == i + 0xd800) ++ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) + { + /* completely full, can't recycle */ + debug("utf8_handle_comp: completely full!\n"); +@@ -1422,7 +1425,7 @@ + mc->font = (i >> 8) + 0xd8; + mc->fontx = 0; + debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); +- comb_tofront(root, i); ++ comb_tofront(i); + } + + #else /* !UTF8 */ diff --git a/poky/meta/recipes-extended/screen/screen_4.8.0.bb b/poky/meta/recipes-extended/screen/screen_4.8.0.bb index 4772eb6c7..fe640c262 100644 --- a/poky/meta/recipes-extended/screen/screen_4.8.0.bb +++ b/poky/meta/recipes-extended/screen/screen_4.8.0.bb @@ -21,6 +21,7 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ file://0002-comm.h-now-depends-on-term.h.patch \ file://0001-fix-for-multijob-build.patch \ file://0001-Remove-more-compatibility-stuff.patch \ + file://CVE-2021-26937.patch \ " SRC_URI[md5sum] = "d276213d3acd10339cd37848b8c4ab1e" 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.03.bb index 3b38b3989..73539c926 100644 --- a/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.00.bb +++ b/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.03.bb @@ -9,7 +9,7 @@ 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" +SRC_URI[sha256sum] = "f27ff439b76a17641291d4234c73655cddcb0a5a588441d6ade290b06ca4b805" DEPENDS = "coreutils-native" diff --git a/poky/meta/recipes-extended/sudo/sudo.inc b/poky/meta/recipes-extended/sudo/sudo.inc index 86a18be7e..97ecabe0f 100644 --- a/poky/meta/recipes-extended/sudo/sudo.inc +++ b/poky/meta/recipes-extended/sudo/sudo.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=828cd502ad216ff869bf83adf3301e02 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=fdff64d4fd19126330aa81b94d167173 \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ diff --git a/poky/meta/recipes-extended/sudo/sudo_1.9.4p1.bb b/poky/meta/recipes-extended/sudo/sudo_1.9.5p2.bb index 040130b49..ca23e94ac 100644 --- a/poky/meta/recipes-extended/sudo/sudo_1.9.4p1.bb +++ b/poky/meta/recipes-extended/sudo/sudo_1.9.5p2.bb @@ -7,7 +7,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "1172099dfcdd2fa497e13a3c274a9f5920abd36ae7d2f7aaacd6bc6bc92fd677" +SRC_URI[sha256sum] = "539e2ef43c8a55026697fb0474ab6a925a11206b5aa58710cb42a0e1c81f0978" 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)}" @@ -44,6 +44,16 @@ do_install_append () { 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" + +SUDO_PACKAGES = "${PN}-sudo\ + ${PN}-lib" + +PACKAGE_BEFORE_PN = "${SUDO_PACKAGES}" + +RDEPENDS_${PN}-sudo = "${PN}-lib" +RDEPENDS_${PN} += "${SUDO_PACKAGES}" + +FILES_${PN}-sudo = "${bindir}/sudo ${bindir}/sudoedit" +FILES_${PN}-lib = "${localstatedir} ${libexecdir} ${sysconfdir} ${libdir} ${nonarch_libdir}" diff --git a/poky/meta/recipes-extended/sysklogd/files/0001-Makefile.am-fixup-issue-17.patch b/poky/meta/recipes-extended/sysklogd/files/0001-Makefile.am-fixup-issue-17.patch deleted file mode 100644 index 96365648d..000000000 --- a/poky/meta/recipes-extended/sysklogd/files/0001-Makefile.am-fixup-issue-17.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a4a472c19eaaf03cc0e70797b2d24b540d6424e1 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 3 Jun 2020 13:39:18 +0800 -Subject: [PATCH] Makefile.am: fixup issue #17 - -only make $(LIBOBJS) depend on $(LTLIBOBJS) still have race condition, -library like pidfile.o may be changed when compile or link for -libsyslog_la_LIBADD, which will cause problem like below: - -ERROR: dwarfsrcfiles failed with exit code 1 (cmd was ['dwarfsrcfiles', /tmp/work/ppc7400-oe-linux/sysklogd/2.1.2-r0/package/usr/lib/libsyslog.a']): -dwarfsrcfiles: tmp/work/ppc7400-oe-linux/sysklogd/2.1.2-r0/package/usr/lib/libsyslog.a: not a valid ELF file - -arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=TOPDIR/tmp-glibc/work/armv7vet2hf-neon-oe-linux-gnueabi/sysklogd/2.1.2-r0/recipe-sysroot -shared -fPIC -DPIC .libs/libsyslog_la-syslog.o ../lib/.libs/pidfile.o ../lib/.libs/strlcpy.o ../lib/.libs/strlcat.o -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=TOPDIR/tmp-glibc/work/armv7vet2hf-neon-oe-linux-gnueabi/sysklogd/2.1.2-r0/recipe-sysroot -O2 -g -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-soname -Wl,libsyslog.so.0 -o .libs/libsyslog.so.0.0.0 -arm-oe-linux-gnueabi-libtool: link: (cd ".libs" && rm -f "libsyslog.so.0" && ln -s "libsyslog.so.0.0.0" "libsyslog.so.0") -arm-oe-linux-gnueabi-libtool: link: (cd ".libs" && rm -f "libsyslog.so" && ln -s "libsyslog.so.0.0.0" "libsyslog.so") -arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc-ar cru .libs/libsyslog.a libsyslog_la-syslog.o ../lib/pidfile.o ../lib/strlcpy.o ../lib/strlcat.o -TOPDIR/tmp-glibc/work/armv7vet2hf-neon-oe-linux-gnueabi/sysklogd/2.1.2-r0/recipe-sysroot-native/usr/bin/arm-oe-linux-gnueabi/../../libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/10.1.0/ar: `u' modifier ignored since `D' is the default (see `U') -TOPDIR/tmp-glibc/work/armv7vet2hf-neon-oe-linux-gnueabi/sysklogd/2.1.2-r0/recipe-sysroot-native/usr/bin/arm-oe-linux-gnueabi/../../libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/10.1.0/ar: ../lib/strlcat.o: No such file or directory - -Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/23/commits/e684939559341cb1c6373dfc6469b59e580d80af] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - src/Makefile.am | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index f8a6820..f45c773 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -66,6 +66,7 @@ libsyslog_la_LIBADD = $(LTLIBOBJS) - # ld: syslogd-syslogd.o: in function `main': syslogd.c:417: undefined - # reference to `__pidfile' - # --# Work around the problem by building one .o from lib at a time, this --# can be achieved by making LIBOBJS depend on LTLIBOBJS. --$(LIBOBJS): $(LTLIBOBJS) -+# Work around the problem by make LIBOBJS depend on libsyslog.la, -+# so that LIBOBJS/syslogd/logger will start compile after libsyslog.la -+# is completed -+$(LIBOBJS): $(lib_LTLIBRARIES) --- -2.17.1 diff --git a/poky/meta/recipes-extended/sysklogd/files/sysklogd b/poky/meta/recipes-extended/sysklogd/files/sysklogd index 2a356a637..050772b59 100755 --- a/poky/meta/recipes-extended/sysklogd/files/sysklogd +++ b/poky/meta/recipes-extended/sysklogd/files/sysklogd @@ -22,6 +22,9 @@ binpath_syslogd=/usr/sbin/syslogd test -x $binpath || exit 0 +# run secure by default +SYSLOGD="-ss" + test ! -r /etc/default/syslogd || . /etc/default/syslogd create_xconsole() diff --git a/poky/meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb b/poky/meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb deleted file mode 100644 index 2917c2aae..000000000 --- a/poky/meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require sysklogd.inc - -SRCREV = "6d6010add698370fc7d9828f0aaa18613dd2397f" diff --git a/poky/meta/recipes-extended/sysklogd/sysklogd.inc b/poky/meta/recipes-extended/sysklogd/sysklogd_2.2.1.bb index 162260f00..aa3f126fb 100644 --- a/poky/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/poky/meta/recipes-extended/sysklogd/sysklogd_2.2.1.bb @@ -12,8 +12,10 @@ inherit update-rc.d update-alternatives systemd autotools SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ file://sysklogd \ - file://0001-Makefile.am-fixup-issue-17.patch \ " + +SRCREV = "b115c7ec4e6d9f3587ac8d212bfc454bfbfe7023" + S = "${WORKDIR}/git" EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger" diff --git a/poky/meta/recipes-extended/sysstat/sysstat_12.4.1.bb b/poky/meta/recipes-extended/sysstat/sysstat_12.4.3.bb index 625d278ee..5a27de439 100644 --- a/poky/meta/recipes-extended/sysstat/sysstat_12.4.1.bb +++ b/poky/meta/recipes-extended/sysstat/sysstat_12.4.3.bb @@ -4,4 +4,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch" -SRC_URI[sha256sum] = "24af8d4eff5118a18f67d5eadda843b9cb9fd29ae4922c0e8b8399621313ce0b" +SRC_URI[sha256sum] = "ae432431f45aacbcabacfbbe129e2505e215cafa9ce996d7550c6091a46f0bfd" diff --git a/poky/meta/recipes-extended/tar/tar/musl_dirent.patch b/poky/meta/recipes-extended/tar/tar/musl_dirent.patch deleted file mode 100644 index 2d98ed131..000000000 --- a/poky/meta/recipes-extended/tar/tar/musl_dirent.patch +++ /dev/null @@ -1,19 +0,0 @@ -musl has valid d_ino implementation - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: tar-1.28/m4/d-ino.m4 -=================================================================== ---- tar-1.28.orig/m4/d-ino.m4 -+++ tar-1.28/m4/d-ino.m4 -@@ -40,7 +40,8 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_ - [gl_cv_struct_dirent_d_ino=no], - [case "$host_os" in - # Guess yes on glibc systems with Linux kernel. -- linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; -+ linux*-gnu*|linux*-musl*) -+ gl_cv_struct_dirent_d_ino="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;; - # If we don't know, assume the worst. diff --git a/poky/meta/recipes-extended/tar/tar_1.32.bb b/poky/meta/recipes-extended/tar/tar_1.34.bb index ebe6cb0db..af04919c4 100644 --- a/poky/meta/recipes-extended/tar/tar_1.32.bb +++ b/poky/meta/recipes-extended/tar/tar_1.34.bb @@ -6,12 +6,9 @@ SECTION = "base" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ - file://musl_dirent.patch \ -" +SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" -SRC_URI[md5sum] = "17917356fff5cb4bd3cd5a6c3e727b05" -SRC_URI[sha256sum] = "e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566" +SRC_URI[sha256sum] = "b44cc67f8a1f6b0250b7c860e952b37e8ed932a90bd9b1862a511079255646ff" inherit autotools gettext texinfo diff --git a/poky/meta/recipes-extended/timezone/timezone.inc b/poky/meta/recipes-extended/timezone/timezone.inc index 9a19093e2..a89560b42 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 = "2020f" +PV = "2021a" 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] = "cfeeea2a7745164f64bd9f6d76e47916f4ac820c4434493674adbbd4324329c5" -SRC_URI[tzdata.sha256sum] = "121131918c3ae6dc5d40f0eb87563a2be920b71a76e2392c09519a5e4a666881" +SRC_URI[tzcode.sha256sum] = "eb46bfa124b5b6bd13d61a609bfde8351bd192894708d33aa06e5c1e255802d0" +SRC_URI[tzdata.sha256sum] = "39e7d2ba08c68cbaefc8de3227aab0dec2521be8042cf56855f7dc3a9fb14e08" diff --git a/poky/meta/recipes-extended/watchdog/watchdog_5.16.bb b/poky/meta/recipes-extended/watchdog/watchdog_5.16.bb index 198895260..19e94757c 100644 --- a/poky/meta/recipes-extended/watchdog/watchdog_5.16.bb +++ b/poky/meta/recipes-extended/watchdog/watchdog_5.16.bb @@ -18,6 +18,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ SRC_URI[md5sum] = "1b4f51cabc64d1bee2fce7cdd626831f" SRC_URI[sha256sum] = "b8e7c070e1b72aee2663bdc13b5cc39f76c9232669cfbb1ac0adc7275a3b019d" +# Can be dropped when the output next changes, avoids failures after +# reproducibility issues +PR = "r1" + UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/watchdog/files/watchdog/" UPSTREAM_CHECK_REGEX = "/watchdog/(?P<pver>(\d+[\.\-_]*)+)/" @@ -28,6 +32,7 @@ CFLAGS += "-I${STAGING_INCDIR}/tirpc" LDFLAGS += "-ltirpc" EXTRA_OECONF += " --disable-nfs " +CACHED_CONFIGUREVARS += "ac_cv_path_PATH_SENDMAIL=${sbindir}/sendmail" INITSCRIPT_PACKAGES = "${PN} ${PN}-keepalive" diff --git a/poky/meta/recipes-extended/wget/wget_1.20.3.bb b/poky/meta/recipes-extended/wget/wget_1.20.3.bb deleted file mode 100644 index 4fa273d09..000000000 --- a/poky/meta/recipes-extended/wget/wget_1.20.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ - file://0002-improve-reproducibility.patch \ - " - -SRC_URI[md5sum] = "db4e6dc7977cbddcd543b240079a4899" -SRC_URI[sha256sum] = "31cccfc6630528db1c8e3a06f6decf2a370060b982841cfab2b8677400a5092e" - -require wget.inc diff --git a/poky/meta/recipes-extended/wget/wget_1.21.1.bb b/poky/meta/recipes-extended/wget/wget_1.21.1.bb new file mode 100644 index 000000000..21385bbfb --- /dev/null +++ b/poky/meta/recipes-extended/wget/wget_1.21.1.bb @@ -0,0 +1,7 @@ +SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ + file://0002-improve-reproducibility.patch \ + " + +SRC_URI[sha256sum] = "59ba0bdade9ad135eda581ae4e59a7a9f25e3a4bde6a5419632b31906120e26e" + +require wget.inc diff --git a/poky/meta/recipes-extended/zip/zip_3.0.bb b/poky/meta/recipes-extended/zip/zip_3.0.bb index c00a93276..97e5e5753 100644 --- a/poky/meta/recipes-extended/zip/zip_3.0.bb +++ b/poky/meta/recipes-extended/zip/zip_3.0.bb @@ -19,6 +19,12 @@ UPSTREAM_VERSION_UNKNOWN = "1" SRC_URI[md5sum] = "7b74551e63f8ee6aab6fbc86676c0d37" SRC_URI[sha256sum] = "f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369" +# Disputed and also Debian doesn't consider a vulnerability +CVE_CHECK_WHITELIST += "CVE-2018-13410" + +# Not for zip but for smart contract implementation for it +CVE_CHECK_WHITELIST += "CVE-2018-13684" + # zip.inc sets CFLAGS, but what Makefile actually uses is # CFLAGS_NOOPT. It will also force -O3 optimization, overriding # whatever we set. diff --git a/poky/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb b/poky/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb index 70148c96d..7fedc43a9 100644 --- a/poky/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb +++ b/poky/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb @@ -1,4 +1,7 @@ SUMMARY = "WebKit based web browser for GNOME" +DESCRIPTION = "Epiphany is an open source web browser for the Linux desktop environment. \ +It provides a simple and easy-to-use internet browsing experience." +HOMEPAGE = "https://wiki.gnome.org/Apps/Web" BUGTRACKER = "https://gitlab.gnome.org/GNOME/epiphany" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" @@ -13,6 +16,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ + file://migrator.patch \ + file://distributor.patch \ " SRC_URI[archive.sha256sum] = "8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d" diff --git a/poky/meta/recipes-gnome/epiphany/files/distributor.patch b/poky/meta/recipes-gnome/epiphany/files/distributor.patch new file mode 100644 index 000000000..b09c9b38d --- /dev/null +++ b/poky/meta/recipes-gnome/epiphany/files/distributor.patch @@ -0,0 +1,17 @@ +Don't encode the distro from /etc/os-release into the binaries. + +Upstream-Status: Pending +RP 2021/2/26 + +Index: epiphany-3.38.2/meson.build +=================================================================== +--- epiphany-3.38.2.orig/meson.build ++++ epiphany-3.38.2/meson.build +@@ -15,6 +15,7 @@ if r.returncode() == 0 + else + distributor_name = 'GNOME Web' + endif ++distributor_name = 'OpenEmbedded' + + prefix = get_option('prefix') + datadir = join_paths(prefix, get_option('datadir')) diff --git a/poky/meta/recipes-gnome/epiphany/files/migrator.patch b/poky/meta/recipes-gnome/epiphany/files/migrator.patch new file mode 100644 index 000000000..a9a650a64 --- /dev/null +++ b/poky/meta/recipes-gnome/epiphany/files/migrator.patch @@ -0,0 +1,24 @@ +We don't want to encide BUILD_ROOT into target packages. This is used +for build time tests but in our case those would be on target anyway +do use the target paths. + +Upstream-Status: Pending +RP 2021/2/25 + +Index: epiphany-3.38.2/lib/ephy-profile-utils.c +=================================================================== +--- epiphany-3.38.2.orig/lib/ephy-profile-utils.c ++++ epiphany-3.38.2/lib/ephy-profile-utils.c +@@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const c + argv[i++] = NULL; + + #if DEVELOPER_MODE +- argv[0] = BUILD_ROOT "/src/" EPHY_PROFILE_MIGRATOR; ++ argv[0] = PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR; + #else + if (debug) +- argv[0] = BUILD_ROOT "/src/" EPHY_PROFILE_MIGRATOR; ++ argv[0] = PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR; + #endif + + g_spawn_sync (NULL, (char **)argv, envp, G_SPAWN_SEARCH_PATH, diff --git a/poky/meta/recipes-gnome/gcr/gcr_3.38.0.bb b/poky/meta/recipes-gnome/gcr/gcr_3.38.1.bb index 49e8f1848..fe80439b0 100644 --- a/poky/meta/recipes-gnome/gcr/gcr_3.38.0.bb +++ b/poky/meta/recipes-gnome/gcr/gcr_3.38.1.bb @@ -11,13 +11,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt gnupg-native \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" +CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'" + GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg # depends on gtk+3, but also x11 through gtk+-x11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.sha256sum] = "a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1" +SRC_URI[archive.sha256sum] = "17fcaf9c4a93a65fb1c72b82643bb102c13344084687d5886ea66313868d9ec9" FILES_${PN} += " \ ${datadir}/dbus-1 \ @@ -28,3 +30,11 @@ FILES_${PN} += " \ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" ARM_INSTRUCTION_SET_armv6 = "arm" + +EXTRA_OEMESON += "--cross-file ${WORKDIR}/meson-${PN}.cross" +do_write_config_append() { + cat >${WORKDIR}/meson-${PN}.cross <<EOF +[binaries] +gpg2 = '${bindir}/gpg2' +EOF +} 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 16708fd58..226e1c7b8 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 @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SECTION = "libs" DEPENDS = "glib-2.0 gdk-pixbuf-native shared-mime-info" +DEPENDS_remove_class-native = "gdk-pixbuf-native" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch new file mode 100644 index 000000000..4ed5e151e --- /dev/null +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch @@ -0,0 +1,27 @@ +From 8b3b153b6b95662316528ef083365b46cf5f7841 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 30 May 2017 14:55:49 +0300 +Subject: [PATCH] Don't use AC_CANONICAL_HOST + +This won't work when building allarch (and is only used to find out if +target is windows). + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> + +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 449865d..888649e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,6 @@ AC_PREREQ(2.53) + + AC_INIT([adwaita-icon-theme], [3.34.3], + [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) +-AC_CANONICAL_HOST + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR([index.theme.in]) + diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb new file mode 100644 index 000000000..6cde6fffa --- /dev/null +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb @@ -0,0 +1,43 @@ +SUMMARY = "GTK+ icon theme" +HOMEPAGE = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/issues" +SECTION = "x11/gnome" + +LICENSE = "LGPL-3.0 | CC-BY-SA-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ + file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ + file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" + +inherit allarch autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ + file://0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch \ + file://0001-Run-installation-commands-as-shell-jobs.patch \ + " + +SRC_URI[md5sum] = "9aea4ad9bc002aacad155ee0748b357f" +SRC_URI[sha256sum] = "e7c2d8c259125d5f35ec09522b88c8fe7ecf625224ab0811213ef0a95d90b908" + +DEPENDS += "librsvg-native" + +PACKAGES = "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires ${PN}" + +RREPLACES_${PN} = "gnome-icon-theme" +RCONFLICTS_${PN} = "gnome-icon-theme" +RPROVIDES_${PN} = "gnome-icon-theme" + +FILES_${PN}-cursors = "${prefix}/share/icons/Adwaita/cursors/" +FILES_${PN}-symbolic-hires = "${prefix}/share/icons/Adwaita/96x96/*/*.symbolic.png \ + ${prefix}/share/icons/Adwaita/64x64/*/*.symbolic.png \ + ${prefix}/share/icons/Adwaita/48x48/*/*.symbolic.png \ + ${prefix}/share/icons/Adwaita/32x32/*/*.symbolic.png" +FILES_${PN}-symbolic = "${prefix}/share/icons/Adwaita/16x16/*/*.symbolic.png \ + ${prefix}/share/icons/Adwaita/24x24/*/*.symbolic.png \ + ${prefix}/share/icons/Adwaita/scalable/*/*-symbolic*.svg" +FILES_${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/ \ + ${prefix}/share/icons/Adwaita/512x512/" +FILES_${PN} = "${prefix}/share/icons/Adwaita/ \ + ${prefix}/share/pkgconfig/adwaita-icon-theme.pc" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb index ff557978d..a36a2b113 100644 --- a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb @@ -1,4 +1,6 @@ SUMMARY = "GTK+ icon theme" +DESCRIPTION = "The Adwaita icon theme is the default icon theme of the GNOME desktop \ +This package package contains an icon theme for Gtk+ 3 applications." HOMEPAGE = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme" BUGTRACKER = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/issues" SECTION = "x11/gnome" diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb index ee0ab2866..ebac8d3a4 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb @@ -28,14 +28,14 @@ GTKDOC_MESON_OPTION = "gtk_doc" MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" -DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" +DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" # target build needs qemu to run temporary introspection binaries created # on the fly by g-ir-scanner and a native version of itself to run # native versions of its own tools during build. # Also prelink-rtld is used to find out library dependencies of introspection binaries # (standard ldd doesn't work when cross-compiling). -DEPENDS_class-target_append = " gobject-introspection-native qemu-native prelink-native" +DEPENDS_append_class-target = " gobject-introspection-native qemu-native prelink-native" # needed for writing out the qemu wrapper script export STAGING_DIR_HOST diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.24.bb b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.25.bb index 01a2a94ce..8c5426f22 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.24.bb +++ b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.25.bb @@ -8,7 +8,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ " -SRC_URI[sha256sum] = "cc9d4367c55b724832f6b09ab85481738ea456871f0381768a6a99335a98378a" +SRC_URI[sha256sum] = "87e26b111d3b8a85ff218980a56f3e814257b8dd11e5c4d9a2803b423b08297c" S = "${WORKDIR}/gtk+-${PV}" diff --git a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.1.bb b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb index 5f9fe0a91..3b308318b 100644 --- a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.1.bb +++ b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb @@ -18,7 +18,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" -SRC_URI[archive.sha256sum] = "a5cfed2a0b73a09b796fff80ad6d8f040ab2b2655bdc941ac207ffe6d9c10f10" +SRC_URI[archive.sha256sum] = "cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43" SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ file://conditionaltests.patch \ @@ -39,6 +39,7 @@ do_install_append () { # configure values for python3 and pkg-config encoded in scripts for fn in ${bindir}/gtkdoc-depscan \ ${bindir}/gtkdoc-mkhtml2 \ + ${datadir}/gtk-doc/python/gtkdoc/config_data.py \ ${datadir}/gtk-doc/python/gtkdoc/config.py; do sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \ -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ diff --git a/poky/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch b/poky/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch deleted file mode 100644 index 0eb724418..000000000 --- a/poky/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0f06c4cb4a57083c08312144b03c8346cf620be6 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 30 Oct 2020 22:15:29 +0000 -Subject: [PATCH] json-glib/json-enum-types.c.in: fix build reproducibility - -Changes the comment and include to reference the file basename -instead of the full path. This ensures that the generated file is -reproducible when it is included in source packages meant for debugging. - -Upstream-Status: Backport [6f3842abd5dff68b6ee5f2ef48a4ebf1cbebf434] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - json-glib/json-enum-types.c.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/json-glib/json-enum-types.c.in b/json-glib/json-enum-types.c.in -index da07c46..7b39290 100644 ---- a/json-glib/json-enum-types.c.in -+++ b/json-glib/json-enum-types.c.in -@@ -9,8 +9,8 @@ - - /*** BEGIN file-production ***/ - --/* enumerations from "@filename@" */ --#include "@filename@" -+/* enumerations from "@basename@" */ -+#include "@basename@" - - /*** END file-production ***/ - diff --git a/poky/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb b/poky/meta/recipes-gnome/json-glib/json-glib_1.6.2.bb index 59b060990..fdf3b245e 100644 --- a/poky/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb +++ b/poky/meta/recipes-gnome/json-glib/json-glib_1.6.2.bb @@ -19,9 +19,8 @@ GTKDOC_MESON_OPTION = "gtk_doc" GTKDOC_MESON_ENABLE_FLAG = 'enabled' GTKDOC_MESON_DISABLE_FLAG = 'disabled' -SRC_URI += "file://run-ptest \ - file://0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch" -SRC_URI[archive.sha256sum] = "0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73" +SRC_URI += " file://run-ptest" +SRC_URI[archive.sha256sum] = "a33d66c6d038bda46b910c6c6d59c4e15db014e363dc997a0414c2e07d134f24" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" diff --git a/poky/meta/recipes-gnome/libhandy/libhandy/determinism.patch b/poky/meta/recipes-gnome/libhandy/libhandy/determinism.patch new file mode 100644 index 000000000..7c4177f5f --- /dev/null +++ b/poky/meta/recipes-gnome/libhandy/libhandy/determinism.patch @@ -0,0 +1,35 @@ +hdy-enums*.c.in: Fix reproducibility issue + +When full filenames are used in generated sources it makes the resulting +debug packages non-reproducible. Best practise is to use basename in +comments instead. + +Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/734] + +Index: a/src/hdy-enums-private.c.in +=================================================================== +--- a/src/hdy-enums-private.c.in ++++ b/src/hdy-enums-private.c.in +@@ -7,7 +7,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +Index: a/src/hdy-enums.c.in +=================================================================== +--- a/src/hdy-enums.c.in ++++ b/src/hdy-enums.c.in +@@ -13,7 +13,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ diff --git a/poky/meta/recipes-gnome/libhandy/libhandy_1.0.2.bb b/poky/meta/recipes-gnome/libhandy/libhandy_1.0.2.bb deleted file mode 100644 index 4daa3c1a5..000000000 --- a/poky/meta/recipes-gnome/libhandy/libhandy_1.0.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A library full of GTK+ widgets for mobile phones" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = "git://gitlab.gnome.org/GNOME/${BPN}.git;protocol=https" -SRCREV = "465c00f8f80c27330be494ed7c0ba2ffe26321c4" -S = "${WORKDIR}/git" - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' -GTKDOC_MESON_OPTION = 'gtk_doc' - -inherit meson gobject-introspection vala gettext gtk-doc features_check - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -DEPENDS += "gtk+3" - -PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "${bindir}" diff --git a/poky/meta/recipes-gnome/libhandy/libhandy_1.0.3.bb b/poky/meta/recipes-gnome/libhandy/libhandy_1.0.3.bb new file mode 100644 index 000000000..a53a1388f --- /dev/null +++ b/poky/meta/recipes-gnome/libhandy/libhandy_1.0.3.bb @@ -0,0 +1,28 @@ +SUMMARY = "A library full of GTK+ widgets for mobile phones" +DESCRIPTION = "Library with GTK widgets for mobile phones. Libhandy provides \ +GTK widgets and GObjects to ease developing applications for mobile phones. \ +It was developed by Purism (and used by several official GNOME projects) \ +to extend Gtk by providing mobile-friendly widgets and make the creation of \ +responsive apps easier." +HOMEPAGE = "https://gitlab.gnome.org/GNOME/libhandy" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-0 \ + file://determinism.patch" +SRCREV = "7126d2e8da9dcdeb5751e60ff6a74930804f9637" +S = "${WORKDIR}/git" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = 'gtk_doc' + +inherit meson gobject-introspection vala gettext gtk-doc features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +DEPENDS += "gtk+3" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}" diff --git a/poky/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb b/poky/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb index 29a28272e..1ff4b2e15 100644 --- a/poky/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb +++ b/poky/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb @@ -1,4 +1,8 @@ SUMMARY = "Library for sending desktop notifications to a notification daemon" +DESCRIPTION = "It sends desktop notifications to a notification daemon, as defined \ +in the Desktop Notifications spec. These notifications can be used to inform \ +the user about an event or display some form of information without getting \ +in the user's way." HOMEPAGE = "https://gitlab.gnome.org/GNOME/libnotify" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libnotify/issues" SECTION = "libs" diff --git a/poky/meta/recipes-gnome/libportal/libportal_0.3.bb b/poky/meta/recipes-gnome/libportal/libportal_0.3.bb index 022628b1a..bc4ff3784 100644 --- a/poky/meta/recipes-gnome/libportal/libportal_0.3.bb +++ b/poky/meta/recipes-gnome/libportal/libportal_0.3.bb @@ -1,4 +1,8 @@ SUMMARY = "libportal provides GIO-style async APIs for most Flatpak portals." +DESCRIPTION = "It provides simple asynchronous wrappers for most Flatpak portals \ +with a familiar GObject API along side the D-Bus API" +HOMEPAGE = "https://github.com/flatpak/libportal" +BUGTRACKER = "https://github.com/flatpak/libportal/issues" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" diff --git a/poky/meta/recipes-gnome/libsecret/libsecret/determinism.patch b/poky/meta/recipes-gnome/libsecret/libsecret/determinism.patch new file mode 100644 index 000000000..ad96e8f59 --- /dev/null +++ b/poky/meta/recipes-gnome/libsecret/libsecret/determinism.patch @@ -0,0 +1,37 @@ +secret-enum-types.c/h.template: Fix reproducibility issue + +When full filenames are used in generated sources it makes the resulting +debug packages non-reproducible. Best practise is to use basename in +comments instead. + +Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/68] + +Index: libsecret-0.20.4/libsecret/secret-enum-types.c.template +=================================================================== +--- libsecret-0.20.4.orig/libsecret/secret-enum-types.c.template ++++ libsecret-0.20.4/libsecret/secret-enum-types.c.template +@@ -23,8 +23,8 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-#include "@filename@" +-/* enumerations from "@filename@" */ ++#include "@basename@" ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +Index: libsecret-0.20.4/libsecret/secret-enum-types.h.template +=================================================================== +--- libsecret-0.20.4.orig/libsecret/secret-enum-types.h.template ++++ libsecret-0.20.4/libsecret/secret-enum-types.h.template +@@ -27,7 +27,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ diff --git a/poky/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb b/poky/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb index 96f646018..287ac70f1 100644 --- a/poky/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb +++ b/poky/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb @@ -4,6 +4,7 @@ the freedesktop.org project, a cross-desktop effort to access passwords, \ tokens and other types of secrets. libsecret provides a convenient wrapper \ for these methods so consumers do not have to call the low-level DBus methods." LICENSE = "LGPLv2.1" +HOMEPAGE = "https://github.com/GNOME/libsecret" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libsecret/issues" LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" @@ -13,6 +14,8 @@ inherit gnomebase gtk-doc vala gobject-introspection manpages DEPENDS += "glib-2.0 libgcrypt gettext-native" +SRC_URI += " file://determinism.patch" + SRC_URI[archive.sha256sum] = "325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28" GTKDOC_MESON_OPTION = 'gtk_doc' 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 index 890c08bf4..8dc4ceb39 100644 --- a/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb +++ b/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb @@ -13,6 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb1ef92b6909969a472a6ea3c4e99cb7" inherit gnomebase meson allarch fontcache pkgconfig SRC_URI[archive.sha256sum] = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83" +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".2" + EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false" FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig" diff --git a/poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc index 7d9db1f38..73315c97e 100644 --- a/poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc +++ b/poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc @@ -1,5 +1,9 @@ SUMMARY = "GStreamer integration library for Clutter" +DESCRIPTION = "Clutter-Gst is an integration library for using GStreamer with Clutter. \ +It provides a GStreamer sink to upload frames to GL and an actor that \ +implements the ClutterGstPlayer interface using playbin." HOMEPAGE = "http://www.clutter-project.org/" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/clutter-gst/-/issues" LICENSE = "LGPLv2+" inherit clutter features_check upstream-version-is-even gobject-introspection diff --git a/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc index 7bf227855..9a28b5219 100644 --- a/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc +++ b/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -1,5 +1,10 @@ SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" +DESCRIPTION = "Clutter-GTK is a library providing facilities to integrate Clutter into GTK+ \ +applications and vice versa. It provides a GTK+ widget, GtkClutterEmbed, for embedding the \ +a Clutter stage into any GtkContainer; and GtkClutterActor, a Clutter \ +actor for embedding any GtkWidget inside a Clutter stage." HOMEPAGE = "http://www.clutter-project.org/" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/clutter/-/issues" LICENSE = "LGPLv2+" CLUTTERBASEBUILDCLASS = "meson" diff --git a/poky/meta/recipes-graphics/drm/libdrm/0001-meson-Also-search-for-rst2man.py.patch b/poky/meta/recipes-graphics/drm/libdrm/0001-meson-Also-search-for-rst2man.py.patch new file mode 100644 index 000000000..67fafd40c --- /dev/null +++ b/poky/meta/recipes-graphics/drm/libdrm/0001-meson-Also-search-for-rst2man.py.patch @@ -0,0 +1,30 @@ +From 4129a8c6911b6b0ef3665cb167da6b635c29614d Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Mon, 8 Feb 2021 17:30:52 +0900 +Subject: [PATCH] meson: Also search for rst2man.py + +That's what upstream docutils installs by default. + +Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/drm/-/commit/62b9a3eee9bdaafa766e92d5bebeb4e59845c45a] + +Signed-off-by: Heiko Becker's avatarHeiko Becker <heirecka@exherbo.org> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index a4d8d70..07d2e08 100644 +--- a/meson.build ++++ b/meson.build +@@ -261,7 +261,7 @@ else + endif + + with_man_pages = get_option('man-pages') +-prog_rst2man = find_program('rst2man', required: with_man_pages == 'true') ++prog_rst2man = find_program('rst2man', 'rst2man.py', required: with_man_pages == 'true') + with_man_pages = with_man_pages != 'false' and prog_rst2man.found() + + config.set10('HAVE_VISIBILITY', +-- +2.25.1 + diff --git a/poky/meta/recipes-graphics/drm/libdrm_2.4.103.bb b/poky/meta/recipes-graphics/drm/libdrm_2.4.104.bb index 1028d618a..ff869d6db 100644 --- a/poky/meta/recipes-graphics/drm/libdrm_2.4.103.bb +++ b/poky/meta/recipes-graphics/drm/libdrm_2.4.104.bb @@ -10,9 +10,11 @@ LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c5 PROVIDES = "drm" DEPENDS = "libpthread-stubs" -SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz" +SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz \ + file://0001-meson-Also-search-for-rst2man.py.patch \ + " -SRC_URI[sha256sum] = "3fe0affdba6460166a7323290c18cf68e9b59edcb520722826cb244e9cb50222" +SRC_URI[sha256sum] = "d66ad8b5c2441015ac1333e40137bb803c3bde3612ff040286fcc12158ea1bcb" inherit meson pkgconfig manpages @@ -34,7 +36,7 @@ PACKAGECONFIG[valgrind] = "-Dvalgrind=true,-Dvalgrind=false,valgrind" PACKAGECONFIG[install-test-programs] = "-Dinstall-test-programs=true,-Dinstall-test-programs=false" PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false" PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" -PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native" +PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native python3-docutils-native" ALLOW_EMPTY_${PN}-drivers = "1" PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ diff --git a/poky/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/poky/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch new file mode 100644 index 000000000..ef092f17a --- /dev/null +++ b/poky/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch @@ -0,0 +1,47 @@ +From 6692611126b40d499c94bbcc8e29604560262072 Mon Sep 17 00:00:00 2001 +From: Jose Quaresma <quaresma.jose@gmail.com> +Date: Sun, 7 Feb 2021 01:30:39 +0000 +Subject: [PATCH] generate glslang pkg-config + +Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config-compatibility.patch + +Upstream-Status: Pending + +Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> + +--- + glslang/CMakeLists.txt | 2 ++ + glslang/glslang.pc.cmake.in | 11 +++++++++++ + 2 files changed, 13 insertions(+) + create mode 100644 glslang/glslang.pc.cmake.in + +diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt +index 1c7d22a2..10c1e841 100644 +--- a/glslang/CMakeLists.txt ++++ b/glslang/CMakeLists.txt +@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL) + EXPORT glslangTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + +diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in +new file mode 100644 +index 00000000..64b6882d +--- /dev/null ++++ b/glslang/glslang.pc.cmake.in +@@ -0,0 +1,11 @@ ++ prefix=@CMAKE_INSTALL_PREFIX@ ++ exec_prefix=@CMAKE_INSTALL_PREFIX@ ++ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ ++ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++ ++ Name: @PROJECT_NAME@ ++ Description: OpenGL and OpenGL ES shader front end and validator ++ Requires: ++ Version: @GLSLANG_VERSION@ ++ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper ++ Cflags: -I${includedir} diff --git a/poky/meta/recipes-graphics/glslang/glslang_8.13.3743.bb b/poky/meta/recipes-graphics/glslang/glslang_11.2.0.bb index 2c4f4be5a..902f7345f 100644 --- a/poky/meta/recipes-graphics/glslang/glslang_8.13.3743.bb +++ b/poky/meta/recipes-graphics/glslang/glslang_11.2.0.bb @@ -5,16 +5,27 @@ of the specifications for these languages. It is open and free for anyone to use either from a command line or programmatically." SECTION = "graphics" HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b" +LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229" -SRCREV = "e05cc20ec20a154d94256c744a3837c23719c0f9" -SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https" +SRCREV = "5421877c380d5f92c1965c7a94620dac861297dd" +SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https \ + file://0001-generate-glslang-pkg-config.patch" UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$" S = "${WORKDIR}/git" -PV = "8.13.3743+git${SRCPV}" - inherit cmake python3native +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=ON \ + -DENABLE_PCH=OFF \ + -DENABLE_CTEST=OFF \ + -DBUILD_EXTERNAL=OFF \ +" + +SOLIBSDEV = "glslang.so" +# all the other libraries are unversioned, so pack it on PN +FILES_${PN} += "${libdir}/*.so" + BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch b/poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch deleted file mode 100644 index d00656fc8..000000000 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch +++ /dev/null @@ -1,27 +0,0 @@ -From df5848f423ec0f4b3e519900014349a0c00b1969 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 17 Aug 2020 16:36:03 +0200 -Subject: [PATCH] Do not disable introspection in cross builds. - -Yocto can and does support introspection cross builds, through -running target binaries under qemu emulation. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index 1865633..5e1787c 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -634,7 +634,7 @@ if have_gobject - gir = find_program('g-ir-scanner', required: get_option('introspection')) - build_gir = gir.found() - -- build_gir = build_gir and not meson.is_cross_build() -+ build_gir = build_gir - if not build_gir and get_option('introspection').enabled() - error('Introspection support is requested but it isn\'t available in cross builds') - endif diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch b/poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch deleted file mode 100644 index d9fccfac0..000000000 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f316b794265f28e89821dfab0772caac1bb6b056 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 18 Aug 2020 10:31:47 +0000 -Subject: [PATCH] src/hb-gobject-enums.cc.tmpl: write out only the filename, - not the full path - -This is beneficial for reproducible builds, as build paths can vary -between builds. - -Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/e876886d1e877ad90b6f02badefd6ebee1bc0b09] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - src/hb-gobject-enums.cc.tmpl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hb-gobject-enums.cc.tmpl b/src/hb-gobject-enums.cc.tmpl -index 2ffd1c9..87a11dd 100644 ---- a/src/hb-gobject-enums.cc.tmpl -+++ b/src/hb-gobject-enums.cc.tmpl -@@ -43,7 +43,7 @@ - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* enumerations from "@filename@" */ -+/* enumerations from "@basename@" */ - /*** END file-production ***/ - - /*** BEGIN file-tail ***/ diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz/version-race.patch b/poky/meta/recipes-graphics/harfbuzz/harfbuzz/version-race.patch deleted file mode 100644 index a8b8f0353..000000000 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz/version-race.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 6ccadec1fae6a73749b7dfe2311f71d0e610e812 Mon Sep 17 00:00:00 2001 -From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> -Date: Wed, 30 Sep 2020 10:30:08 +0900 -Subject: [PATCH] No need to pass source directory to gen-hb-version - -The input file is by definition in the source directory, so dirname() -that instead of needing the directory to be passed. - -Needed because a follow-up commit will change when this is called, and the -source directory isn't trivially available at that point. - -generate hb-version.h once at configure time with Meson - -Currently with Meson hb-version.h is generated during the build without -any explicit dependencies which can result in build failures due races -over the file. - -Change this to be generated at configure time, so that the file is always -generated once before the build itself. - -Closes #2667 - -Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/5aff83104e03d6d2617987d24a51e490ab7a5cd1] -Signed-off-by: Ross Burton <ross.burton@arm.com> -Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> ---- - src/gen-hb-version.py | 6 +++--- - src/meson.build | 17 ++++++++--------- - 2 files changed, 11 insertions(+), 12 deletions(-) - -diff --git a/src/gen-hb-version.py b/src/gen-hb-version.py -index 15e56b9..bf16f88 100755 ---- a/src/gen-hb-version.py -+++ b/src/gen-hb-version.py -@@ -4,15 +4,15 @@ - - import os, sys, shutil - --if len (sys.argv) < 5: -+if len (sys.argv) < 4: - sys.exit(__doc__) - - version = sys.argv[1] - major, minor, micro = version.split (".") - - OUTPUT = sys.argv[2] --CURRENT_SOURCE_DIR = sys.argv[3] --INPUT = sys.argv[4] -+INPUT = sys.argv[3] -+CURRENT_SOURCE_DIR = os.path.dirname(INPUT) - - with open (INPUT, "r", encoding='utf-8') as template: - with open (OUTPUT, "wb") as output: -diff --git a/src/meson.build b/src/meson.build -index 5e1787c..56d8ae2 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -1,3 +1,10 @@ -+hb_version_h = configure_file( -+ command: [find_program('gen-hb-version.py'), meson.project_version(), '@OUTPUT@', '@INPUT@'], -+ input: 'hb-version.h.in', -+ output: 'hb-version.h', -+ install: true, -+ install_dir: join_paths(get_option('includedir'), meson.project_name())) -+ - # Base and default-included sources and headers - hb_base_sources = files( - 'hb-aat-layout-ankr-table.hh', -@@ -214,9 +221,9 @@ hb_base_headers = files( - 'hb-shape.h', - 'hb-style.h', - 'hb-unicode.h', -- 'hb-version.h', - 'hb.h', - ) -+hb_base_headers += hb_version_h - - # Optional Sources and Headers with external deps - -@@ -281,14 +288,6 @@ hb_gobject_headers = files( - 'hb-gobject-structs.h', - ) - --custom_target('hb-version.h', -- build_by_default: true, -- input: 'hb-version.h.in', -- output: 'hb-version.h', -- command: [find_program('gen-hb-version.py'), meson.project_version(), -- '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'], --) -- - ragel = find_program('ragel', required: false) - if not ragel.found() - warning('You have to install ragel if you are going to develop HarfBuzz itself') --- -2.25.1 - diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.7.2.bb b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.7.4.bb index f95273f68..b08f60255 100644 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.7.2.bb +++ b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.7.4.bb @@ -11,11 +11,8 @@ UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ - file://0001-Do-not-disable-introspection-in-cross-builds.patch \ - file://0001-src-hb-gobject-enums.cc.tmpl-write-out-only-the-file.patch \ - file://version-race.patch \ " -SRC_URI[sha256sum] = "b8c048d7c2964a12f2c80deb6634dfc836b603dd12bf0d0a3df1627698e220ce" +SRC_URI[sha256sum] = "6ad11d653347bd25d8317589df4e431a2de372c0cf9be3543368e07ec23bb8e7" inherit meson pkgconfig lib_package gtk-doc gobject-introspection diff --git a/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch b/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch new file mode 100644 index 000000000..38bd4550a --- /dev/null +++ b/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch @@ -0,0 +1,42 @@ +From 606349860d27492c328752dca5a3784c0e9a6d24 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 Feb 2021 11:05:45 -0800 +Subject: [PATCH i-g-t] lib/igt_edid: Allocate raw 8-bytes for VSDB + +hdmi_vsdb is an element of cea_vsdb which makes the size of cea_vsdb to +be 8 ( 3bytes ieee_oui ) + ( 5bytes hdmi_vsdb struct), its true that we +only use 7 bytes technically we can only allocate 7byte array but since +we are writing to elements of hdmi_vsdb struct which is sitting at offet +4-8 in cea_vsdb, compiler thinks we have an element which is out of +array bounds since out allocated size is 7bytes + +This errors out +../git/lib/igt_edid.c:365:13: error: array subscript 'struct hdmi_vsdb[0]' is partly outside array bounds of 'char[7]' [-Werror=array-bounds] + 365 | hdmi->src_phy_addr[0] = 0x10; + | ^~ + +allocating one extra byte matches with size of cea_vsdb and compiler is +happy + +Upstream-Status: Submitted [https://lists.freedesktop.org/archives/igt-dev/2021-February/029446.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/igt_edid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/igt_edid.c b/lib/igt_edid.c +index 1c85486d..ce09cc47 100644 +--- a/lib/igt_edid.c ++++ b/lib/igt_edid.c +@@ -351,7 +351,7 @@ void cea_sad_init_pcm(struct cea_sad *sad, int channels, + const struct cea_vsdb *cea_vsdb_get_hdmi_default(size_t *size) + { + /* We'll generate a VSDB with 2 extension fields. */ +- static char raw[CEA_VSDB_HDMI_MIN_SIZE + 2] = {0}; ++ static char raw[CEA_VSDB_HDMI_MIN_SIZE + 3] = {0}; + struct cea_vsdb *vsdb; + struct hdmi_vsdb *hdmi; + +-- +2.30.1 + diff --git a/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/reproducibility.patch b/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/reproducibility.patch new file mode 100644 index 000000000..39e36d873 --- /dev/null +++ b/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/reproducibility.patch @@ -0,0 +1,38 @@ +meson: Allow source location to be configurable + +Hardcoding a build source path into a binary when cross compiling isn't +appropriate and breaks build reproducibility. Allow the srcdir to be +specified by an optional configuration option to meson. + +Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org> +Upstream-Status: Submitted [https://lists.freedesktop.org/archives/igt-dev/2021-February/029443.html] + +Index: git/lib/meson.build +=================================================================== +--- git.orig/lib/meson.build ++++ git/lib/meson.build +@@ -122,7 +122,11 @@ if chamelium.found() + lib_sources += 'igt_chamelium_stream.c' + endif + +-srcdir = join_paths(meson.source_root(), 'tests') ++if get_option('srcdir') != '' ++ srcdir = join_paths(get_option('srcdir'), 'tests') ++else ++ srcdir = join_paths(meson.source_root(), 'tests') ++endif + + lib_version = vcs_tag(input : 'version.h.in', output : 'version.h', + fallback : 'NO-GIT', +Index: git/meson_options.txt +=================================================================== +--- git.orig/meson_options.txt ++++ git/meson_options.txt +@@ -50,3 +50,7 @@ option('use_rpath', + type : 'boolean', + value : false, + description : 'Set runpath on installed executables for libigt.so') ++ ++option('srcdir', ++ type : 'string', ++ description : 'Path to source code to be compiled into binaries (optional)') diff --git a/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb b/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb index 89480d79d..1cc94cf99 100644 --- a/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb +++ b/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb @@ -1,5 +1,7 @@ SUMMARY = "IGT GPU Tools" DESCRIPTION = "IGT GPU Tools is a collection of tools for development and testing of the DRM drivers" +HOMEPAGE = "https://gitlab.freedesktop.org/drm/igt-gpu-tools" +BUGTRACKER = "https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues" LIC_FILES_CHKSUM = "file://COPYING;md5=67bfee4df38fa6ecbe3a675c552d4c08" @@ -10,7 +12,9 @@ inherit meson SRCREV = "d16ad07e7f2a028e14d61f570931c87fa5ce404c" PV = "1.25+git${SRCPV}" -SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https" +SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https \ + file://0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch \ + file://reproducibility.patch" S = "${WORKDIR}/git" @@ -22,7 +26,7 @@ PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests" PACKAGECONFIG[chamelium] = "-Dchamelium=enabled,-Dchamelium=disabled,gsl xmlrpc-c" -EXTRA_OEMESON = "-Ddocs=disabled -Drunner=enabled" +EXTRA_OEMESON = "-Ddocs=disabled -Drunner=enabled -Dsrcdir=/usr/src/debug/${PN}/${PV}-${PR}/git/" COMPATIBLE_HOST = "(x86_64.*|i.86.*|arm.*|aarch64).*-linux" COMPATIBLE_HOST_libc-musl_class-target = "null" SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" diff --git a/poky/meta/recipes-graphics/kmscube/kmscube_git.bb b/poky/meta/recipes-graphics/kmscube/kmscube_git.bb index 478d5c4de..f4e6cd41e 100644 --- a/poky/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/poky/meta/recipes-graphics/kmscube/kmscube_git.bb @@ -1,4 +1,8 @@ -DESCRIPTION = "Demo application to showcase 3D graphics using kms and gbm" +SUMMARY = "Demo application to showcase 3D graphics using kms and gbm" +DESCRIPTION = "kmscube is a little demonstration program for how to drive bare metal graphics \ +without a compositor like X11, wayland or similar, using DRM/KMS (kernel mode \ +setting), GBM (graphics buffer manager) and EGL for rendering content using \ +OpenGL or OpenGL ES." HOMEPAGE = "https://cgit.freedesktop.org/mesa/kmscube/" LICENSE = "MIT" SECTION = "graphics" @@ -6,7 +10,7 @@ DEPENDS = "virtual/libgles2 virtual/egl libdrm" LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" -SRCREV = "e6386d1b99366ea7559438c0d3abd2ae2d6d61ac" +SRCREV = "9f63f359fab1b5d8e862508e4e51c9dfe339ccb0" SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https" UPSTREAM_CHECK_COMMITS = "1" diff --git a/poky/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch b/poky/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch index 726294518..971a3f54e 100644 --- a/poky/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch +++ b/poky/meta/recipes-graphics/libepoxy/files/0001-dispatch_common.h-define-also-EGL_NO_X11.patch @@ -1,4 +1,4 @@ -From 6f15cc28d17cfdd86f5974f06ad97b8afedd5627 Mon Sep 17 00:00:00 2001 +From 7211120d1e2f059d900f3379b9790484dbcf7761 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Fri, 25 Oct 2019 11:09:34 +0000 Subject: [PATCH] dispatch_common.h: define also EGL_NO_X11 @@ -8,16 +8,17 @@ https://github.com/mesa3d/mesa/commit/6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Upstream-Status: Pending + --- src/dispatch_common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dispatch_common.h b/src/dispatch_common.h -index dcb3a35..c206253 100644 +index a136943..448c9b1 100644 --- a/src/dispatch_common.h +++ b/src/dispatch_common.h -@@ -52,6 +52,7 @@ - * should do the same +@@ -55,6 +55,7 @@ + * as EGL_NO_X11 */ # define MESA_EGL_NO_X11_HEADERS 1 +# define EGL_NO_X11 1 diff --git a/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb b/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.5.bb index 6646ef79f..a404fe285 100644 --- a/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb +++ b/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.5.bb @@ -12,8 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ file://0001-dispatch_common.h-define-also-EGL_NO_X11.patch \ " -SRC_URI[md5sum] = "00f47ad447321f9dc59f85bc1c9d0467" -SRC_URI[sha256sum] = "0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2" +SRC_URI[sha256sum] = "261663db21bcc1cc232b07ea683252ee6992982276536924271535875f5b0556" UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" inherit meson pkgconfig features_check diff --git a/poky/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch b/poky/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch deleted file mode 100644 index 83d4f4b1e..000000000 --- a/poky/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -# HG changeset patch -# User Sam Lantinga <slouken@libsdl.org> -# Date 1590793369 25200 -# Node ID a90089f75990e8b07a1dcf931c5f8a580ae343bf -# Parent a9b4bd264f3cbedc4f3287b3ec6b32311370ba85 -Fixed bug 5146 - SDL_RenderFillRect doesn't work in DirectFB - -Lacky - -It looks like refactoring of SDL2 internal API has broken SDL_RenderFillRect for DirectFB. In new version function SDL_RenderFillRect returns 0, but rectangle is not visible. - -Replacing "count" with "len" in the argument list for SDL_memcpy in DirectFB_QueueFillRects fixes problem. - --- - -The patch was imported from the libsdl Mercurial repository -(https://hg.libsdl.org/SDL) as of changeset id a90089f75990. - -Upstream-Status: Backport - -Signed-off-by: Mark Jonas <toertel@gmail.com> - -diff -r a9b4bd264f3c -r a90089f75990 src/video/directfb/SDL_DirectFB_render.c ---- a/src/video/directfb/SDL_DirectFB_render.c Thu May 21 00:06:09 2020 -0400 -+++ b/src/video/directfb/SDL_DirectFB_render.c Fri May 29 16:02:49 2020 -0700 -@@ -626,7 +626,7 @@ - } - - cmd->data.draw.count = count; -- SDL_memcpy(verts, rects, count); -+ SDL_memcpy(verts, rects, len); - return 0; - } diff --git a/poky/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch b/poky/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch deleted file mode 100644 index aa351a89b..000000000 --- a/poky/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch +++ /dev/null @@ -1,49 +0,0 @@ -# HG changeset patch -# User Fabrice Fontaine <fontaine.fabrice@gmail.com> -# Date 1585069551 25200 -# Node ID 769f800952179633ec6c3e6bc1bc1d40e401750a -# Parent 63387e8920f58f608288f247824ec5f4c286691f -src/video/directfb/SDL_DirectFB_render.c: fix build -Build with directfb is broken due to a spurious '}' and a missing 'E' -since version 2.0.12 and https://hg.libsdl.org/SDL/rev/2d5b5a5ccbfb: - -/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c: In function 'SetBlendMode': -/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c:202:9: error: case label not within a switch statement - 202 | case SDL_BLENDMODE_MUL: - | ^~~~ - -/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c:205:67: error: 'DSBF_DSTCOLOR' undeclared (first use in this function); did you mean 'DSBF_DESTCOLOR'? - 205 | SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DSTCOLOR)); - | ^~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/83ccefee68c2800c0544e6f40fa8bc8ee6b67b77 - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> - --- - -The patch was imported from the libsdl Mercurial repository -(https://hg.libsdl.org/SDL) as of changeset id 769f80095217. - -Upstream-Status: Backport - -Signed-off-by: Mark Jonas <toertel@gmail.com> - - -diff -r 63387e8920f5 -r 769f80095217 src/video/directfb/SDL_DirectFB_render.c ---- a/src/video/directfb/SDL_DirectFB_render.c Mon Mar 23 14:10:25 2020 -0700 -+++ b/src/video/directfb/SDL_DirectFB_render.c Tue Mar 24 10:05:51 2020 -0700 -@@ -198,11 +198,10 @@ - SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_SRCCOLOR)); - - break; -- } - case SDL_BLENDMODE_MUL: - data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL; - data->drawFlags = DSDRAW_BLEND; -- SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DSTCOLOR)); -+ SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DESTCOLOR)); - SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_INVSRCALPHA)); - - break; diff --git a/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb index 5fa99821c..872592fda 100644 --- a/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb +++ b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb @@ -18,14 +18,11 @@ PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://more-gen-depends.patch \ - file://directfb-spurious-curly-brace-missing-e.patch \ - file://directfb-renderfillrect-fix.patch \ " S = "${WORKDIR}/SDL2-${PV}" -SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff" -SRC_URI[sha256sum] = "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863" +SRC_URI[sha256sum] = "d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc" inherit autotools lib_package binconfig-disabled pkgconfig @@ -64,7 +61,6 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[kmsdrm] = "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm" PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" -PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib" PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland-native wayland wayland-protocols libxkbcommon" PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender" diff --git a/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.1.bb b/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.4.bb index e50782be1..e50782be1 100644 --- a/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.1.bb +++ b/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.4.bb diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index 883c24447..9f8ec112c 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/meta/recipes-graphics/mesa/mesa.inc @@ -22,7 +22,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \ " -SRC_URI[sha256sum] = "af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f" +SRC_URI[sha256sum] = "dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" @@ -218,6 +218,9 @@ do_install_append () { # RPROVIDEs/RCONFLICTs on the generic libgl name. python __anonymous() { pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() + suffix = "" + if "-native" in d.getVar("PN"): + suffix = "-native" for p in (("egl", "libegl", "libegl1"), ("dri", "libgl", "libgl1"), ("gles", "libgles1", "libglesv1-cm1"), @@ -226,19 +229,19 @@ python __anonymous() { if not p[0] in pkgconfig: continue mlprefix = d.getVar("MLPREFIX") - fullp = mlprefix + p[1] + "-mesa" + fullp = mlprefix + p[1] + "-mesa" + suffix mlprefix = d.getVar("MLPREFIX") - pkgs = " ".join(mlprefix + x for x in p[1:]) + pkgs = " ".join(mlprefix + x + suffix for x in p[1:]) d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") d.appendVar("RREPLACES_" + fullp, pkgs) d.appendVar("RPROVIDES_" + fullp, pkgs) d.appendVar("RCONFLICTS_" + fullp, pkgs) - d.appendVar("RRECOMMENDS_" + fullp, " ${MLPREFIX}mesa-megadriver") + d.appendVar("RRECOMMENDS_" + fullp, " ${MLPREFIX}mesa-megadriver" + suffix) # For -dev, the first element is both the Debian and original name - fullp += "-dev" - pkgs = mlprefix + p[1] + "-dev" + fullp = mlprefix + p[1] + "-mesa-dev" + suffix + pkgs = mlprefix + p[1] + "-dev" + suffix d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") d.appendVar("RREPLACES_" + fullp, pkgs) d.appendVar("RPROVIDES_" + fullp, pkgs) @@ -272,6 +275,7 @@ python mesa_populate_packages() { PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " PACKAGES_DYNAMIC += "^mesa-driver-.*" +PACKAGES_DYNAMIC_class-native = "^mesa-driver-.*-native" FILES_mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d/00-mesa-defaults.conf" FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" diff --git a/poky/meta/recipes-graphics/mesa/mesa_20.3.1.bb b/poky/meta/recipes-graphics/mesa/mesa_20.3.4.bb index 96e8aa38d..96e8aa38d 100644 --- a/poky/meta/recipes-graphics/mesa/mesa_20.3.1.bb +++ b/poky/meta/recipes-graphics/mesa/mesa_20.3.4.bb diff --git a/poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb index 4e89d631c..549b0cbdf 100644 --- a/poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb +++ b/poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb @@ -1,4 +1,5 @@ SUMMARY = "Very simple session manager for X" +DESCRIPTION = "Simple session manager for X, that provides just the right boilerplate to create a session and launch the browser " HOMEPAGE = "http://www.yoctoproject.org" BUGTRACKER = "http://bugzilla.pokylinux.org" diff --git a/poky/meta/recipes-graphics/mx/mx.inc b/poky/meta/recipes-graphics/mx/mx.inc index 714a06f0a..c977849c9 100644 --- a/poky/meta/recipes-graphics/mx/mx.inc +++ b/poky/meta/recipes-graphics/mx/mx.inc @@ -1,4 +1,10 @@ SUMMARY = "Clutter based UI widget library" +DESCRIPTION = "Mx is a widget toolkit using Clutter that provides a set of standard interface \ +elements, including buttons, progress bars, scroll bars and others. It also \ +implements some standard managers. One other interesting feature is the \ +possibility setting style properties from a CSS format file." +HOMEPAGE = "https://github.com/clutter-project/mx" +BUGTRACKER = "https://github.com/clutter-project/mx/issues" LICENSE = "LGPLv2.1" inherit clutter autotools features_check gobject-introspection gtk-doc diff --git a/poky/meta/recipes-graphics/pango/pango/0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch b/poky/meta/recipes-graphics/pango/pango/0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch deleted file mode 100644 index d8f971d91..000000000 --- a/poky/meta/recipes-graphics/pango/pango/0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch +++ /dev/null @@ -1,27 +0,0 @@ -From eea900ec107920bc99c9df5ab258b7bc446c0b87 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 4 Dec 2020 14:03:01 +0000 -Subject: [PATCH] tests/test-font.c: drop assert that fails with Cantarell - family - -Upstream bug: https://gitlab.gnome.org/GNOME/pango/-/issues/494 - -Upstream-Status: Inappropriate [needs a proper fix by upstream that handles font faces with identical names] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - tests/test-font.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test-font.c b/tests/test-font.c -index 486504f..7e45ba1 100644 ---- a/tests/test-font.c -+++ b/tests/test-font.c -@@ -217,7 +217,7 @@ test_enumerate (void) - for (i = 0; i < n_faces; i++) - { - face = pango_font_family_get_face (families[0], pango_font_face_get_face_name (faces[i])); -- g_assert_true (face == faces[i]); -+ //g_assert_true (face == faces[i]); - } - - desc = pango_font_description_new (); diff --git a/poky/meta/recipes-graphics/pango/pango_1.48.0.bb b/poky/meta/recipes-graphics/pango/pango_1.48.2.bb index 552a44583..1dcb43b5e 100644 --- a/poky/meta/recipes-graphics/pango/pango_1.48.0.bb +++ b/poky/meta/recipes-graphics/pango/pango_1.48.2.bb @@ -18,8 +18,7 @@ inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspec GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" -SRC_URI += " file://0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch" -SRC_URI[archive.sha256sum] = "391f26f3341c2d7053e0fb26a956bd42360dadd825efe7088b1e9340a65e74e6" +SRC_URI[archive.sha256sum] = "d21f8b30dc8abdfc55de25656ecb88dc1105eeeb315e5e2a980dcef8010c2c80" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" 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 deleted file mode 100644 index 261d98d8f..000000000 --- a/poky/meta/recipes-graphics/piglit/piglit/0001-render-ops.c-add-missing-format-string.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e21e68f6aa0f5249fce613e8fd4ac0edbd5cb7b0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -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 <alex.kanavin@gmail.com> ---- - 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 442c1a3c6..14f4c75a2 100644 --- a/poky/meta/recipes-graphics/piglit/piglit_git.bb +++ b/poky/meta/recipes-graphics/piglit/piglit_git.bb @@ -1,6 +1,8 @@ SUMMARY = "OpenGL driver testing framework" DESCRIPTION = "Piglit is an open-source test suite for OpenGL and OpenCL \ implementations." +HOMEPAGE = "https://gitlab.freedesktop.org/mesa/piglit" +BUGTRACKER = "https://gitlab.freedesktop.org/mesa/piglit/-/issues" LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" @@ -13,11 +15,10 @@ 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 = "603deba4ab66e2a8948693a14d715e536caddcc5" +SRCREV = "d4d9353b7290ed22cb7349226a8e4017402d3f02" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" diff --git a/poky/meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch b/poky/meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch deleted file mode 100644 index 7102e25bc..000000000 --- a/poky/meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0b9468d4face34879214f500b15e810cdd1a81a1 Mon Sep 17 00:00:00 2001 -From: Niklas Haas <git@haasn.xyz> -Date: Tue, 29 May 2018 07:34:00 +0200 -Subject: [PATCH] Fix the link order of libglslang and libHLSL - -libglslang depends on libHLSL, so the latter needs to be specified last. -This fixes an issue when trying to build shaderc against system-wide -versions of libglslang/libHLSL, rather than the in-tree versions from -third_party. - -Additionally, libshaderc_util also depends on SPIRV-Tools - -Upstream-Status: Backport [21c8be385b3fab5edcb934a6d99f69fd389c4e67] - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> - ---- - glslc/CMakeLists.txt | 2 +- - libshaderc_util/CMakeLists.txt | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index 31664d1..35b3f19 100644 ---- a/glslc/CMakeLists.txt -+++ b/glslc/CMakeLists.txt -@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT) - endif(SHADERC_ENABLE_WGSL_OUTPUT) - - target_link_libraries(glslc PRIVATE -- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries -+ glslang OSDependent OGLCompiler glslang SPIRV HLSL # Glslang libraries - $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional - shaderc_util shaderc # internal Shaderc libraries - ${CMAKE_THREAD_LIBS_INIT}) -diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt -index 48f9991..984cc06 100644 ---- a/libshaderc_util/CMakeLists.txt -+++ b/libshaderc_util/CMakeLists.txt -@@ -46,8 +46,8 @@ add_definitions(-DENABLE_HLSL) - - find_package(Threads) - target_link_libraries(shaderc_util PRIVATE -- glslang OSDependent OGLCompiler HLSL glslang SPIRV -- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) -+ glslang OSDependent OGLCompiler glslang HLSL SPIRV -+ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT}) - - shaderc_add_tests( - TEST_PREFIX shaderc_util diff --git a/poky/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch b/poky/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch new file mode 100644 index 000000000..cc9a40002 --- /dev/null +++ b/poky/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch @@ -0,0 +1,109 @@ +From 071a9d71bea91bbefcf15e061fc87e53568f3188 Mon Sep 17 00:00:00 2001 +From: Jose Quaresma <quaresma.jose@gmail.com> +Date: Sat, 13 Feb 2021 00:45:56 +0000 +Subject: [PATCH 1/3] cmake: disable building external dependencies + +- add cmake option to disable the build of the third_party dependencies +- change the update_build_version.py to use pkg-config when third_party dependencies not found + +Upstream-Status: Inappropriate [OE-core specific] + +Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> +--- + CMakeLists.txt | 13 ++++++++++--- + utils/update_build_version.py | 22 +++++++++++++++------- + 2 files changed, 25 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c74cd8..b358f6b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,7 @@ else() + endif() + + option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) ++option(BUILD_EXTERNAL "Build external dependencies in /third_party" ON) + + set (CMAKE_CXX_STANDARD 11) + +@@ -101,8 +102,14 @@ endif(MSVC) + + + # Configure subdirectories. +-# We depend on these for later projects, so they should come first. +-add_subdirectory(third_party) ++if(BUILD_EXTERNAL) ++ # We depend on these for later projects, so they should come first. ++ add_subdirectory(third_party) ++else() ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules (PKG_CHECK REQUIRED SPIRV-Tools) ++ pkg_check_modules (PKG_CHECK REQUIRED glslang) ++endif() + + add_subdirectory(libshaderc_util) + add_subdirectory(libshaderc) +@@ -112,7 +119,7 @@ add_subdirectory(examples) + add_custom_target(build-version + ${PYTHON_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py +- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc ++ ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} + COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") + + function(define_pkg_config_file NAME LIBS) +diff --git a/utils/update_build_version.py b/utils/update_build_version.py +index 5785390..f72b762 100755 +--- a/utils/update_build_version.py ++++ b/utils/update_build_version.py +@@ -30,6 +30,7 @@ import re + import subprocess + import sys + import time ++import itertools + + def mkdir_p(directory): + """Make the directory, and all its ancestors as required. Any of the +@@ -121,25 +122,32 @@ def get_version_string(project, directory): + directory, which consists of software version string and git description + string.""" + detailed_version_string_lst = [project] +- if project != 'glslang': +- detailed_version_string_lst.append(deduce_software_version(directory)) +- detailed_version_string_lst.append(describe(directory).replace('"', '\\"')) ++ if isinstance(directory, str) and os.path.isdir(directory): ++ if project != 'glslang': ++ detailed_version_string_lst.append(deduce_software_version(directory)) ++ detailed_version_string_lst.append(describe(directory).replace('"', '\\"')) ++ else: ++ if project == 'spirv-tools': ++ project = 'SPIRV-Tools' ++ pkgconfig = ['pkg-config', '--modversion', project] ++ version = subprocess.run(pkgconfig, capture_output=True, text=True).stdout.rstrip() ++ detailed_version_string_lst.append(version) + return ' '.join(detailed_version_string_lst) + + + def main(): +- if len(sys.argv) != 5: +- print(('usage: {} <shaderc-dir> <spirv-tools-dir> <glslang-dir> <output-file>'.format( ++ if len(sys.argv) < 3: ++ print(('usage: {} <output-file> <shaderc-dir> [spirv-tools-dir] [glslang-dir]'.format( + sys.argv[0]))) + sys.exit(1) + + projects = ['shaderc', 'spirv-tools', 'glslang'] + new_content = ''.join([ + '"{}\\n"\n'.format(get_version_string(p, d)) +- for (p, d) in zip(projects, sys.argv[1:]) ++ for (p, d) in itertools.zip_longest(projects, sys.argv[2:]) + ]) + +- output_file = sys.argv[4] ++ output_file = sys.argv[1] + mkdir_p(os.path.dirname(output_file)) + + if os.path.isfile(output_file): +-- +2.30.1 + diff --git a/poky/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch b/poky/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch new file mode 100644 index 000000000..df670cdde --- /dev/null +++ b/poky/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch @@ -0,0 +1,28 @@ +From 046c3c2da9c4ff66f14db5bd68e9557504a49241 Mon Sep 17 00:00:00 2001 +From: Jose Quaresma <quaresma.jose@gmail.com> +Date: Sat, 13 Feb 2021 00:45:56 +0000 +Subject: [PATCH 2/3] libshaderc_util: fix glslang header file location + +Upstream-Status: Pending + +Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> +--- + libshaderc_util/src/compiler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc +index c5ce37e..4703634 100644 +--- a/libshaderc_util/src/compiler.cc ++++ b/libshaderc_util/src/compiler.cc +@@ -20,7 +20,7 @@ + #include <thread> + #include <tuple> + +-#include "SPIRV/GlslangToSpv.h" ++#include "glslang/SPIRV/GlslangToSpv.h" + #include "libshaderc_util/format.h" + #include "libshaderc_util/io.h" + #include "libshaderc_util/message.h" +-- +2.30.1 + diff --git a/poky/meta/recipes-graphics/shaderc/files/0003-cmake-add-option-to-skip-build-the-examples.patch b/poky/meta/recipes-graphics/shaderc/files/0003-cmake-add-option-to-skip-build-the-examples.patch new file mode 100644 index 000000000..43f9edc03 --- /dev/null +++ b/poky/meta/recipes-graphics/shaderc/files/0003-cmake-add-option-to-skip-build-the-examples.patch @@ -0,0 +1,47 @@ +From f1064e4b6cfc5955bc7e2b036f2d05540da9f09b Mon Sep 17 00:00:00 2001 +From: Jose Quaresma <quaresma.jose@gmail.com> +Date: Sat, 13 Feb 2021 00:45:56 +0000 +Subject: [PATCH 3/3] cmake: add option to skip build the examples + +Upstream-Status: Backport [https://github.com/google/shaderc/commit/8d081127ee28ff5df8123c994c00bc66a57e9e9c] + +Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> +--- + CMakeLists.txt | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b358f6b..d8a5405 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,6 +40,16 @@ else() + message(STATUS "Configuring Shaderc to avoid building tests.") + endif() + ++option(SHADERC_SKIP_EXAMPLES "Skip building examples" ${SHADERC_SKIP_EXAMPLES}) ++if(NOT ${SHADERC_SKIP_EXAMPLES}) ++ set(SHADERC_ENABLE_EXAMPLES ON) ++endif() ++if(${SHADERC_ENABLE_EXAMPLES}) ++ message(STATUS "Configuring Shaderc to build examples.") ++else() ++ message(STATUS "Configuring Shaderc to avoid building examples.") ++endif() ++ + option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) + option(BUILD_EXTERNAL "Build external dependencies in /third_party" ON) + +@@ -114,7 +124,9 @@ endif() + add_subdirectory(libshaderc_util) + add_subdirectory(libshaderc) + add_subdirectory(glslc) +-add_subdirectory(examples) ++if(${SHADERC_ENABLE_EXAMPLES}) ++ add_subdirectory(examples) ++endif() + + add_custom_target(build-version + ${PYTHON_EXECUTABLE} +-- +2.30.1 + 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 deleted file mode 100644 index e4e3f0be1..000000000 --- a/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 180250f098e0ab899eff0db3708d9693f3486ff4 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Sat, 17 Oct 2020 12:51:50 +0100 -Subject: [PATCH] cmake: de-vendor libs and disable git versioning - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> - ---- - CMakeLists.txt | 2 -- - glslc/CMakeLists.txt | 1 - - glslc/src/build-version.inc | 0 - 3 files changed, 3 deletions(-) - create mode 100644 glslc/src/build-version.inc - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c74cd8..9451fbc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -102,12 +102,10 @@ endif(MSVC) - - # Configure subdirectories. - # We depend on these for later projects, so they should come first. --add_subdirectory(third_party) - - add_subdirectory(libshaderc_util) - add_subdirectory(libshaderc) - add_subdirectory(glslc) --add_subdirectory(examples) - - add_custom_target(build-version - ${PYTHON_EXECUTABLE} -diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index 35b3f19..52006b8 100644 ---- a/glslc/CMakeLists.txt -+++ b/glslc/CMakeLists.txt -@@ -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) --add_dependencies(glslc_exe build-version) - - shaderc_add_tests( - TEST_PREFIX glslc -diff --git a/glslc/src/build-version.inc b/glslc/src/build-version.inc -new file mode 100644 -index 0000000..e69de29 diff --git a/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb b/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb index ee9b11837..73aa0ee96 100644 --- a/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb +++ b/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb @@ -8,26 +8,22 @@ 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 \ + file://0001-cmake-disable-building-external-dependencies.patch \ + file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ + file://0003-cmake-add-option-to-skip-build-the-examples.patch \ " +UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" S = "${WORKDIR}/git" inherit cmake python3native -DEPENDS = "spirv-tools glslang" +DEPENDS = "spirv-headers 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 -} +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_EXTERNAL=OFF \ + -DSHADERC_SKIP_TESTS=ON \ + -DSHADERC_SKIP_EXAMPLES=ON \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb b/poky/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb new file mode 100644 index 000000000..14723f951 --- /dev/null +++ b/poky/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb @@ -0,0 +1,17 @@ +SUMMARY = "Machine-readable files for the SPIR-V Registry" +DESCRIPTION = "Headers are provided in the include directory, with up-to-date \ +headers in the unified1 subdirectory. Older headers are provided according to \ +their version." +SECTION = "graphics" +HOMEPAGE = "https://www.khronos.org/registry/spir-v" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" + +SRCREV = "f027d53ded7e230e008d37c8b47ede7cd308e19d" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https" +UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$" +S = "${WORKDIR}/git" + +inherit cmake + +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 index eb07833f2..f1fe40096 100644 --- a/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb +++ b/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb @@ -2,37 +2,39 @@ 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." +HOMEPAGE = "https://github.com/KhronosGroup/SPIRV-Tools" +SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SECTION = "graphics" +SRCREV = "b27b1afd12d05bf238ac7368bb49de73cd620a8e" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git" +UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" 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 +inherit cmake -EXTRA_OECMAKE += "-DSPIRV_WERROR=OFF" +DEPENDS = "spirv-headers" -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 +EXTRA_OECMAKE += "\ + -DSPIRV-Headers_SOURCE_DIR=${STAGING_EXECPREFIXDIR} \ + -DSPIRV_TOOLS_BUILD_STATIC=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DSPIRV_SKIP_TESTS=ON \ +" + +do_install_append_class-target() { + # reproducibility: remove build host path + sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \ + -e 's:${STAGING_DIR_HOST}::g' } +# all the libraries are unversioned, so don't pack it on PN-dev +SOLIBS = ".so" FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/*.so" + +PACKAGES =+ "${PN}-lesspipe" +FILES_${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh" +RDEPENDS_${PN}-lesspipe += "${PN} bash" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb b/poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb index d10bddb52..f69e4838f 100644 --- a/poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb +++ b/poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb @@ -1,6 +1,9 @@ SUMMARY = "Enables monitoring and display of application startup" +DESCRIPTION = "Contains a reference implementation of the startup notification protocol. \ +The reference implementation is mostly under an X Window System style license, and has \ +no special dependencies. " HOMEPAGE = "http://www.freedesktop.org/wiki/Software/startup-notification/" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=Specifications" +BUGTRACKER = "https://gitlab.freedesktop.org/xdg/startup-notification/-/issues" # most files are under MIT, but libsn/sn-util.c is under LGPL, the # effective license is LGPL diff --git a/poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb b/poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb index f5df9efa3..abc216f43 100644 --- a/poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb +++ b/poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb @@ -10,6 +10,10 @@ LICENSE = "OFL-1.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=f96db970a9a46c5369142b99f530366b" PE = "1" +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".2" + inherit allarch fontcache FONT_PACKAGES = "${PN}" diff --git a/poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb index 3e1ba196b..50c79b3bf 100644 --- a/poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb +++ b/poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb @@ -7,10 +7,13 @@ but is visibly different than normal and bold, and reasonably pleasing." SECTION = "x11/fonts" LICENSE = "BitstreamVera" LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" -PR = "r7" +PR = "r8" inherit allarch fontcache +# remove at next version upgrade or when output changes +HASHEQUIV_HASH_VERSION .= ".1" + FONT_PACKAGES = "${PN}" SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" 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 index a28954ad7..19ae67cdd 100644 --- 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 @@ -1,4 +1,8 @@ SUMMARY = "Vulkan Header files and API registry" +DESCRIPTION = "Vulkan is a 3D graphics and compute API providing cross-platform access \ +to modern GPUs with low overhead and targeting realtime graphics applications such as \ +games and interactive media. This package contains the development headers \ +for packages wanting to make use of Vulkan." HOMEPAGE = "https://www.khronos.org/vulkan/" BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers" SECTION = "libs" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-samples/0001-support-link-against-libatomic-if-no-built-in-atomic.patch b/poky/meta/recipes-graphics/vulkan/vulkan-samples/0001-support-link-against-libatomic-if-no-built-in-atomic.patch deleted file mode 100644 index 6c0fb6086..000000000 --- a/poky/meta/recipes-graphics/vulkan/vulkan-samples/0001-support-link-against-libatomic-if-no-built-in-atomic.patch +++ /dev/null @@ -1,117 +0,0 @@ -From e20a5d13935a41a856e8f71c49f2cc9d81b1d92c Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Fri, 13 Nov 2020 17:07:00 +0800 -Subject: [PATCH] support link against libatomic if no built-in atomic exist - -fix error: -| framework/lib/ppc/libframework.a(device.cpp.o): in function `std::__atomic_base<unsigned long long>::load(std::memory_order) const': -| /usr/include/c++/10.2.0/bits/atomic_base.h:426: undefined reference to `__atomic_load_8' - -Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/212] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - CMakeLists.txt | 1 + - bldsys/cmake/check_atomic.cmake | 62 +++++++++++++++++++++++++++++++++ - framework/CMakeLists.txt | 4 +++ - 3 files changed, 67 insertions(+) - create mode 100644 bldsys/cmake/check_atomic.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e72e829..466f51d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,6 +42,7 @@ endmacro(vulkan_samples_pch) - include(utils) - include(global_options) - include(sample_helper) -+include(check_atomic) - - # Add third party libraries - add_subdirectory(third_party) -diff --git a/bldsys/cmake/check_atomic.cmake b/bldsys/cmake/check_atomic.cmake -new file mode 100644 -index 0000000..6b47a7a ---- /dev/null -+++ b/bldsys/cmake/check_atomic.cmake -@@ -0,0 +1,62 @@ -+# check weither need to link atomic library explicitly -+INCLUDE(CheckCXXSourceCompiles) -+INCLUDE(CheckLibraryExists) -+ -+if(NOT DEFINED VULKAN_COMPILER_IS_GCC_COMPATIBLE) -+ if(CMAKE_COMPILER_IS_GNUCXX) -+ set(VULKAN_COMPILER_IS_GCC_COMPATIBLE ON) -+ elseif( MSVC ) -+ set(VULKAN_COMPILER_IS_GCC_COMPATIBLE OFF) -+ elseif( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) -+ set(VULKAN_COMPILER_IS_GCC_COMPATIBLE ON) -+ elseif( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" ) -+ set(VULKAN_COMPILER_IS_GCC_COMPATIBLE ON) -+ endif() -+endif() -+ -+# Sometimes linking against libatomic is required for atomic ops, if -+# the platform doesn't support lock-free atomics. -+ -+function(check_working_cxx_atomics varname) -+ set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) -+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11") -+ CHECK_CXX_SOURCE_COMPILES(" -+#include <atomic> -+std::atomic<int> x; -+std::atomic<short> y; -+std::atomic<char> z; -+int main() { -+ ++z; -+ ++y; -+ return ++x; -+} -+" ${varname}) -+ set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) -+endfunction(check_working_cxx_atomics) -+ -+function(check_working_cxx_atomics64 varname) -+ set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) -+ set(CMAKE_REQUIRED_FLAGS "-std=c++11 ${CMAKE_REQUIRED_FLAGS}") -+ CHECK_CXX_SOURCE_COMPILES(" -+#include <atomic> -+#include <cstdint> -+std::atomic<uint64_t> x (0); -+int main() { -+ uint64_t i = x.load(std::memory_order_relaxed); -+ (void)i; -+ return 0; -+} -+" ${varname}) -+ set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) -+endfunction(check_working_cxx_atomics64) -+ -+set(NEED_LINK_ATOMIC OFF CACHE BOOL "weither need to link against atomic library") -+if(VULKAN_COMPILER_IS_GCC_COMPATIBLE) -+ # check if non-64-bit atomics work without the library. -+ check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB) -+ # check 64-bit atomics work without the library. -+ check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB) -+ if (NOT HAVE_CXX_ATOMICS_WITHOUT_LIB OR NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB) -+ set(NEED_LINK_ATOMIC ON CACHE BOOL "weither need to link to atomic library" FORCE) -+ endif() -+endif() -diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt -index bf26786..322526e 100644 ---- a/framework/CMakeLists.txt -+++ b/framework/CMakeLists.txt -@@ -412,6 +412,10 @@ target_link_libraries(${PROJECT_NAME} - ctpl - docopt) - -+if(${NEED_LINK_ATOMIC}) -+ target_link_libraries(${PROJECT_NAME} atomic) -+endif() -+ - # Link platform specific libraries - if(ANDROID) - target_link_libraries(${PROJECT_NAME} log android native_app_glue) --- -2.17.1 - diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-samples/debugfix.patch b/poky/meta/recipes-graphics/vulkan/vulkan-samples/debugfix.patch new file mode 100644 index 000000000..d723fcc19 --- /dev/null +++ b/poky/meta/recipes-graphics/vulkan/vulkan-samples/debugfix.patch @@ -0,0 +1,31 @@ +There is code to remove the prefix CMAKE_SOURCE_DIR from __FILENAME__ paths +used for logging with LOGE() in the code. We need to make this match the value we use +in the debug source remapping from CFLAGS + +We export the right path to use in the recipe with: + +EXTRA_OECMAKE = "-DCMAKE_DEBUG_SRCDIR=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/" + +and we then patch this into the code instead of the broken use +of CMAKE_SOURCE_DIR since __FILENAME__ will match our path prefix +changes. + +This also breaks reproducibility since the path length of the build directory +will currently change the output! + +Upstream-Status: Pending [needs to be discussed upstream] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: git/bldsys/cmake/global_options.cmake +=================================================================== +--- git.orig/bldsys/cmake/global_options.cmake ++++ git/bldsys/cmake/global_options.cmake +@@ -47,7 +47,7 @@ set(CMAKE_CXX_STANDARD 14) + set(CMAKE_DISABLE_SOURCE_CHANGES ON) + set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) + +-string(LENGTH "${CMAKE_SOURCE_DIR}/" ROOT_PATH_SIZE) ++string(LENGTH "${CMAKE_DEBUG_SRCDIR}/" ROOT_PATH_SIZE) + add_definitions(-DROOT_PATH_SIZE=${ROOT_PATH_SIZE}) + + set(CMAKE_C_FLAGS_DEBUG "-DDEBUG=0 ${CMAKE_C_FLAGS_DEBUG}") diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 896b24832..b7c38f654 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -1,15 +1,17 @@ DESCRIPTION = "The Vulkan Samples is collection of resources to help develop optimized Vulkan applications." +HOMEPAGE = "https://www.khronos.org/vulkan/" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Samples/issues" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a" SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \ file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \ - file://0001-support-link-against-libatomic-if-no-built-in-atomic.patch \ + file://debugfix.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "fdc8fab1a520df5566de3eda7b526b24f04e6379" +SRCREV = "55cebd9e7cc4153a3a7b3a45d42274c0e2a17815" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" @@ -19,3 +21,14 @@ REQUIRED_DISTRO_FEATURES = 'vulkan' inherit cmake features_check FILES_${PN} += "${datadir}" + +# +# There is code to remove the prefix CMAKE_SOURCE_DIR from __FILENAME__ paths +# used for logging with LOGE in the code. We need to make this match the value we use +# in the debug source remapping from CFLAGS +# +EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/" +# Binaries built with PCH enabled don't appear reproducible, differing results were seen +# from some builds depending on the point the PCH was compiled. Disable it to be +# deterministic +EXTRA_OECMAKE += "-DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON" 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.1.bb index 972859c93..a5c3bbcb1 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.162.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.162.1.bb @@ -1,4 +1,5 @@ SUMMARY = "Vulkan Utilities and Tools" +DESCRIPTION = "Assist development by enabling developers to verify their applications correct use of the Vulkan API." HOMEPAGE = "https://www.khronos.org/vulkan/" BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Tools" SECTION = "libs" @@ -6,7 +7,7 @@ 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" +SRCREV = "8f0c2e40d4134f53f82ce48de72c7be92baa6b3d" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/waffle/waffle_1.6.1.bb b/poky/meta/recipes-graphics/waffle/waffle_1.6.1.bb index 3f3c0e902..07d7279c2 100644 --- a/poky/meta/recipes-graphics/waffle/waffle_1.6.1.bb +++ b/poky/meta/recipes-graphics/waffle/waffle_1.6.1.bb @@ -1,4 +1,10 @@ -SUMMARY = "cross-platform C library to defer selection of GL API and of window system" +SUMMARY = "A C library for selecting an OpenGL API and window system at runtime" +DESCRIPTION = "A cross-platform C library that allows one to defer selection \ +of an OpenGL API and window system until runtime. For example, on Linux, Waffle \ +enables an application to select X11/EGL with an OpenGL 3.3 core profile, \ +Wayland with OpenGL ES2, and other window system / API combinations." +HOMEPAGE = "http://www.waffle-gl.org/" +BUGTRACKER = "https://gitlab.freedesktop.org/mesa/waffle" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" diff --git a/poky/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/poky/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch index c2ceae4a4..ad1063b2c 100644 --- a/poky/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch +++ b/poky/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch @@ -1,4 +1,4 @@ -From e6783c99f051c6d8252db5f388d805cef0e16357 Mon Sep 17 00:00:00 2001 +From 6a6223a8e217664a348835e92d5a602f50e18b2c Mon Sep 17 00:00:00 2001 From: Joshua Watt <JPEWhacker@gmail.com> Date: Thu, 20 Feb 2020 15:20:45 -0600 Subject: [PATCH] build: Fix strndup detection on MinGW @@ -13,10 +13,13 @@ See: https://github.com/mesonbuild/meson/issues/3672 Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63] + --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/meson.build b/meson.build +index 11c35fa..80729d0 100644 --- a/meson.build +++ b/meson.build @@ -36,11 +36,11 @@ have_funcs = [ diff --git a/poky/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch b/poky/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch deleted file mode 100644 index 61de0e04e..000000000 --- a/poky/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch +++ /dev/null @@ -1,115 +0,0 @@ -From b2c74f6a3dbe0aee2413800837314136947a4985 Mon Sep 17 00:00:00 2001 -From: Jan Beich <jbeich@FreeBSD.org> -Date: Sat, 15 Feb 2020 02:03:45 +0000 -Subject: [PATCH] meson/tests: add missing dependencies on protocol headers - -In file included from ../tests/connection-test.c:43: -In file included from ../tests/test-compositor.h:30: -../src/wayland-client.h:40:10: fatal error: 'wayland-client-protocol.h' file not found - #include "wayland-client-protocol.h" - ^~~~~~~~~~~~~~~~~~~~~~~~~~~ -In file included from ../tests/display-test.c:45: -In file included from ../src/wayland-server.h:104: -src/wayland-server-protocol.h:4454:2: error: unterminated /* comment - /** - ^ -In file included from ../tests/cpp-compile-test.cpp:2: -In file included from src/wayland-server-protocol.h:8: -In file included from ../src/wayland-server.h:104: -src/wayland-server-protocol.h:3:2: error: unterminated conditional directive - #ifndef WAYLAND_SERVER_PROTOCOL_H - ^ -../tests/headers-protocol-test.c:33:2: error: including wayland-server-protocol.h did not include wayland-server.h! - #error including wayland-server-protocol.h did not include wayland-server.h! - ^ -In file included from ../tests/headers-protocol-test.c:26: -In file included from src/wayland-client-protocol.h:8: -In file included from ../src/wayland-client.h:40: -src/wayland-client-protocol.h:1358:2: error: unterminated conditional directive - #ifndef WL_SHM_FORMAT_ENUM - ^ -In file included from ../tests/protocol-logger-test.c:34: -In file included from ../src/wayland-client.h:40: -src/wayland-client-protocol.h:2613:1: error: unterminated /* comment -/** -^ -../tests/resources-test.c:49:36: error: use of undeclared identifier 'wl_seat_interface' - res = wl_resource_create(client, &wl_seat_interface, 4, 0); - ^ -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - tests/meson.build | 26 ++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index c28a2a3..f1af7b4 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -69,7 +69,7 @@ test( - executable( - 'cpp-compile-test', - 'cpp-compile-test.cpp', -- wayland_server_protocol_core_h, -+ wayland_server_protocol_h, - include_directories: src_inc - ) - ) -@@ -91,17 +91,25 @@ tests = { - 'array-test': [], - 'client-test': [ wayland_server_protocol_h ], - 'display-test': [ -+ wayland_client_protocol_h, -+ wayland_server_protocol_h, - tests_server_protocol_h, - tests_client_protocol_c, - tests_protocol_c, - ], -- 'connection-test': [ wayland_server_protocol_h ], -+ 'connection-test': [ -+ wayland_client_protocol_h, -+ wayland_server_protocol_h, -+ ], - 'event-loop-test': [ wayland_server_protocol_h ], - 'fixed-test': [], - 'interface-test': [ wayland_client_protocol_h ], - 'list-test': [], - 'map-test': [], -- 'sanity-test' : [ wayland_server_protocol_h ], -+ 'sanity-test' : [ -+ wayland_client_protocol_h, -+ wayland_server_protocol_h, -+ ], - 'socket-test': [ - wayland_client_protocol_h, - wayland_server_protocol_h, -@@ -116,7 +124,7 @@ tests = { - files('../src/wayland-server.c'), - wayland_server_protocol_h, - ], -- 'resources-test': [ wayland_server_protocol_core_h ], -+ 'resources-test': [ wayland_server_protocol_h ], - 'message-test': [ - wayland_client_protocol_h, - wayland_server_protocol_h, -@@ -126,14 +134,16 @@ tests = { - wayland_server_protocol_h, - ], - 'protocol-logger-test': [ -- wayland_server_protocol_core_h, -- wayland_client_protocol_core_h, -+ wayland_client_protocol_h, -+ wayland_server_protocol_h, - ], - 'headers-test': [ -+ wayland_client_protocol_h, -+ wayland_server_protocol_h, - 'headers-protocol-test.c', -- 'headers-protocol-core-test.c', -- wayland_server_protocol_core_h, - wayland_client_protocol_core_h, -+ wayland_server_protocol_core_h, -+ 'headers-protocol-core-test.c', - ], - 'os-wrappers-test': [], - } diff --git a/poky/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/poky/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch index 2199548bd..e3e71925b 100644 --- a/poky/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch +++ b/poky/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch @@ -1,4 +1,4 @@ -From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001 +From 3e7cd56611aeec274e48a4816bc7c21f74f15be0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 17 Feb 2020 21:46:18 +0100 Subject: [PATCH] Do not hardcode the path to wayland-scanner @@ -7,20 +7,21 @@ This results in host contamination during builds. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- src/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meson.build b/src/meson.build -index 294aee0..7e410fa 100644 +index 15730a3..61edbc8 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -49,7 +49,7 @@ pkgconfig.generate( - 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), - 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), - 'bindir=' + join_paths('${prefix}', get_option('bindir')), -- 'wayland_scanner=${bindir}/wayland-scanner' -+ 'wayland_scanner=wayland-scanner' - ], - filebase: 'wayland-scanner' - ) +@@ -52,7 +52,7 @@ if get_option('scanner') + 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), + 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), + 'bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'wayland_scanner=${bindir}/wayland-scanner' ++ 'wayland_scanner=wayland-scanner' + ], + filebase: 'wayland-scanner' + ) diff --git a/poky/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/poky/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch index f98037a85..11dc06914 100644 --- a/poky/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch +++ b/poky/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch @@ -1,4 +1,4 @@ -From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001 +From 98e7902a4ddcd80b61cce6f35f97907e841a5eda Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Sun, 16 Feb 2020 16:29:53 +0100 Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH @@ -7,19 +7,20 @@ Otherwise, meson attempts to use the target pkg-config and fails. Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- src/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/meson.build b/src/meson.build -index 3e8c9bf..294aee0 100644 +index d91c503..15730a3 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -55,8 +55,7 @@ pkgconfig.generate( - ) +@@ -59,8 +59,7 @@ if get_option('scanner') + endif - if meson.is_cross_build() -- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') + if meson.is_cross_build() or not get_option('scanner') +- scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version()) - wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) + wayland_scanner_for_build = find_program('wayland-scanner') else diff --git a/poky/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/poky/meta/recipes-graphics/wayland/wayland_1.19.0.bb index 00be3aac2..8f121601c 100644 --- a/poky/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/poky/meta/recipes-graphics/wayland/wayland_1.19.0.bb @@ -17,10 +17,8 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ file://0001-build-Fix-strndup-detection-on-MinGW.patch \ - file://0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch \ " -SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" -SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" +SRC_URI[sha256sum] = "baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" diff --git a/poky/meta/recipes-graphics/wayland/weston-init/weston.ini b/poky/meta/recipes-graphics/wayland/weston-init/weston.ini index b48726d59..6bd5aef55 100644 --- a/poky/meta/recipes-graphics/wayland/weston-init/weston.ini +++ b/poky/meta/recipes-graphics/wayland/weston-init/weston.ini @@ -42,7 +42,7 @@ require-input=false #path=/build/weston-0lEgCh/weston-1.11.0/weston-flower #[input-method] -#path=/usr/lib/weston/weston-keyboard +#path=/usr/libexec/weston-keyboard #[output] #name=LVDS1 diff --git a/poky/meta/recipes-graphics/wayland/weston_9.0.0.bb b/poky/meta/recipes-graphics/wayland/weston_9.0.0.bb index 8cb105c78..50fbfa613 100644 --- a/poky/meta/recipes-graphics/wayland/weston_9.0.0.bb +++ b/poky/meta/recipes-graphics/wayland/weston_9.0.0.bb @@ -76,7 +76,7 @@ PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-color # Clients support PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" # Virtual remote output with GStreamer on DRM backend -PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0" +PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base" # Weston with PAM support PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam" # Weston with screen-share support diff --git a/poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb index 65348c376..baaf8fa9a 100644 --- a/poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb +++ b/poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb @@ -1,4 +1,7 @@ SUMMARY = "Touchscreen calibration data from xinput-calibrator" +DESCRIPTION = "A generic touchscreen calibration program for X.Org" +HOMEPAGE = "https://www.freedesktop.org/wiki/Software/xinput_calibrator/" +BUGTRACKER = "https://github.com/tias/xinput_calibrator/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" diff --git a/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb index 1ea08a6c9..f0c77f33b 100644 --- a/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb @@ -10,8 +10,12 @@ LIC_FILES_CHKSUM = "file://../misc/fonts.dir;md5=82a143d94d6a974aafe97132d2d519a SRC_URI = "file://misc" +SOURCE_DATE_EPOCH = "1613559011" + PE = "1" -PR = "r2" +PR = "r4" +# remove at next version upgrade or when output changes +HASHEQUIV_HASH_VERSION .= ".1" inherit allarch features_check @@ -27,6 +31,8 @@ RDEPENDS_${PN} += "font-alias" do_install() { install -d ${D}/${datadir}/fonts/X11/misc install -m 0644 ${S}/* ${D}/${datadir}/fonts/X11/misc/ + # Pick a date/time as otherwise it would be the git checkout/modify time + touch -d @1613559011 ${D}/${datadir}/fonts/X11/misc/* install -d ${D}/${libdir}/X11 ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s } diff --git a/poky/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb b/poky/meta/recipes-graphics/xorg-lib/libxt_1.2.1.bb index 54384521c..8f2cded1d 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxt_1.2.1.bb @@ -24,8 +24,7 @@ XORG_PN = "libXt" SRC_URI += "file://libxt_fix_for_x32.patch" -SRC_URI[md5sum] = "a9019421d3ee8b4937b6afd9025f018a" -SRC_URI[sha256sum] = "b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831" +SRC_URI[sha256sum] = "679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.31.bb b/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.32.bb index ad150544e..daa07a4d0 100644 --- a/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.31.bb +++ b/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.32.bb @@ -13,7 +13,7 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[sha256sum] = "da44181f2c8828789c720decf7d13acb3c3950e2a040af5132f50f04bb6aada3" +SRC_URI[sha256sum] = "1feee317ba39b91902b0cbd2987c0c73e6afbfc8f4c096367a5c86c216c036a8" SECTION = "x11/libs" DEPENDS = "util-macros libxslt-native" diff --git a/poky/meta/recipes-graphics/xorg-util/util-macros_1.19.2.bb b/poky/meta/recipes-graphics/xorg-util/util-macros_1.19.3.bb index 268059935..27898709f 100644 --- a/poky/meta/recipes-graphics/xorg-util/util-macros_1.19.2.bb +++ b/poky/meta/recipes-graphics/xorg-util/util-macros_1.19.3.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1970511fddd439b07a6ba789d28ff662" PE = "1" -SRC_URI[md5sum] = "5059b328fac086b733ffac6607164c41" -SRC_URI[sha256sum] = "9225c45c3de60faf971979a55a5536f3562baa4b6f02246c23e98ac0c09a75b7" +SRC_URI[md5sum] = "66cb74d4a0120a06e32c3b01c29417d8" +SRC_URI[sha256sum] = "624bb6c3a4613d18114a7e3849a3d70f2d7af9dc6eabeaba98060d87e3aef35b" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" diff --git a/poky/meta/recipes-kernel/blktrace/blktrace_git.bb b/poky/meta/recipes-kernel/blktrace/blktrace_git.bb index 6903053b5..7ccc022b9 100644 --- a/poky/meta/recipes-kernel/blktrace/blktrace_git.bb +++ b/poky/meta/recipes-kernel/blktrace/blktrace_git.bb @@ -1,4 +1,9 @@ SUMMARY = "Generates traces of I/O traffic on block devices" +DESCRIPTION = "blktrace is a block layer IO tracing mechanism which provides \ +detailed information about request queue operations up to user space. There \ +are three major components: a kernel component, a utility to record the i/o \ +trace information for the kernel to user space, and utilities to analyse and \ +view the trace information." HOMEPAGE = "http://brick.kernel.dk/snaps/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" diff --git a/poky/meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb b/poky/meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.bb index c55577c66..c55577c66 100644 --- a/poky/meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb +++ b/poky/meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.bb diff --git a/poky/meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb b/poky/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb index b3b554c7d..b3b554c7d 100644 --- a/poky/meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb +++ b/poky/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb diff --git a/poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.bb b/poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb index 9cb5dcb94..9cb5dcb94 100644 --- a/poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.bb +++ b/poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb diff --git a/poky/meta/recipes-kernel/cryptodev/cryptodev.inc b/poky/meta/recipes-kernel/cryptodev/cryptodev.inc index c050eda49..ae2c30891 100644 --- a/poky/meta/recipes-kernel/cryptodev/cryptodev.inc +++ b/poky/meta/recipes-kernel/cryptodev/cryptodev.inc @@ -1,11 +1,16 @@ HOMEPAGE = "http://cryptodev-linux.org/" +DESCRIPTION = "Cryptodev-linux is a device that allows access to Linux kernel \ +cryptographic drivers; thus allowing of userspace applications to take advantage \ +of hardware accelerators. Cryptodev-linux is implemented as a standalone \ +module that requires no dependencies other than a stock linux kernel. Its \ +API is compatible with OpenBSD's cryptodev userspace API (/dev/crypto)." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \ " -SRCREV = "fabe5989a3dc9fba0cd0a40b612247cdde351c01" +SRCREV = "e0c25e289d6baf1d83c2b9cb523d3bc237d0c0c9" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-kernel/dtc/dtc.inc b/poky/meta/recipes-kernel/dtc/dtc.inc index 0650e3c82..5da6c24fb 100644 --- a/poky/meta/recipes-kernel/dtc/dtc.inc +++ b/poky/meta/recipes-kernel/dtc/dtc.inc @@ -7,7 +7,9 @@ DEPENDS = "flex-native bison-native" SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \ file://make_install.patch \ + file://0001-dtc-Fix-Makefile-to-add-CFLAGS-not-override.patch \ " + UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" EXTRA_OEMAKE='NO_PYTHON=1 PREFIX="${prefix}" LIBDIR="${libdir}" DESTDIR="${D}"' diff --git a/poky/meta/recipes-kernel/dtc/dtc/0001-dtc-Fix-Makefile-to-add-CFLAGS-not-override.patch b/poky/meta/recipes-kernel/dtc/dtc/0001-dtc-Fix-Makefile-to-add-CFLAGS-not-override.patch new file mode 100644 index 000000000..a2deb12d4 --- /dev/null +++ b/poky/meta/recipes-kernel/dtc/dtc/0001-dtc-Fix-Makefile-to-add-CFLAGS-not-override.patch @@ -0,0 +1,36 @@ +From f0119060ef1b9bd80e2cae487df1e4aedffb0e9b Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Fri, 22 Jan 2021 09:12:48 +0200 +Subject: [PATCH] dtc: Fix Makefile to add CFLAGS not override + +Makefile override CFLAGS not extend them, so some of them +missing. Sources builds out of kernel tree and probably not all +options could be used (?). We need at least -fmacro-prefix-map/ +debug-prefix-map to eliminate absolute path in binaries. + +Upstream-Status: Pending +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 35d936f..b5b13cf 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,10 +20,10 @@ CONFIG_LOCALVERSION = + # See libfdt_internal.h for details + ASSUME_MASK ?= 0 + +-CPPFLAGS = -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK) ++CPPFLAGS += -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK) + WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ + -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow +-CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS) ++CFLAGS += -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS) + + BISON = bison + LEX = flex +-- +2.25.1 + diff --git a/poky/meta/recipes-kernel/dtc/dtc/0001-fdtdump-Fix-gcc11-warning.patch b/poky/meta/recipes-kernel/dtc/dtc/0001-fdtdump-Fix-gcc11-warning.patch new file mode 100644 index 000000000..ec825cbf7 --- /dev/null +++ b/poky/meta/recipes-kernel/dtc/dtc/0001-fdtdump-Fix-gcc11-warning.patch @@ -0,0 +1,35 @@ +From 4827e0db6c4f7dea7f4094f49d3bb48ef6dfdc2d Mon Sep 17 00:00:00 2001 +From: David Gibson <david@gibson.dropbear.id.au> +Date: Wed, 6 Jan 2021 14:52:26 +1100 +Subject: [PATCH] fdtdump: Fix gcc11 warning + +In one place, fdtdump abuses fdt_set_magic(), passing it just a small char +array instead of the full fdt header it expects. That's relying on the +fact that in fact fdt_set_magic() will only actually access the first 4 +bytes of the buffer. + +This trips a new warning in GCC 11 - and it's entirely possible it was +always UB. So, don't do that. + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=ca16a723fa9dde9c5da80dba567f48715000e77c] +Signed-off-by: David Gibson <david@gibson.dropbear.id.au> +--- + fdtdump.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fdtdump.c b/fdtdump.c +index 9613bef..d9fb374 100644 +--- a/fdtdump.c ++++ b/fdtdump.c +@@ -217,7 +217,7 @@ int main(int argc, char *argv[]) + char *p = buf; + char *endp = buf + len; + +- fdt_set_magic(smagic, FDT_MAGIC); ++ fdt32_st(smagic, FDT_MAGIC); + + /* poor man's memmem */ + while ((endp - p) >= FDT_MAGIC_SIZE) { +-- +2.30.1 + diff --git a/poky/meta/recipes-kernel/dtc/dtc_1.6.0.bb b/poky/meta/recipes-kernel/dtc/dtc_1.6.0.bb index 92df70d9f..a40713785 100644 --- a/poky/meta/recipes-kernel/dtc/dtc_1.6.0.bb +++ b/poky/meta/recipes-kernel/dtc/dtc_1.6.0.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRCREV = "2525da3dba9beceb96651dc2986581871dbeca30" +SRC_URI += "file://0001-fdtdump-Fix-gcc11-warning.patch" + S = "${WORKDIR}/git" BBCLASSEXTEND = "native nativesdk" 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 27eef7fb6..70b2908fd 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 @@ -1,4 +1,8 @@ SUMMARY = "Tools for managing Yocto Project style branched kernels" +DESCRIPTION = "Powerful set of tools or managing Yocto Linux kernel sources \ +and configuration data. You can use these tools to make a single configuration \ +change, apply multiple patches, or work with your own kernel sources." +HOMEPAGE = "https://www.yoctoproject.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" diff --git a/poky/meta/recipes-kernel/kmod/kmod.inc b/poky/meta/recipes-kernel/kmod/kmod.inc index dabda2d57..ccda9f2b7 100644 --- a/poky/meta/recipes-kernel/kmod/kmod.inc +++ b/poky/meta/recipes-kernel/kmod/kmod.inc @@ -15,9 +15,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " inherit autotools gtk-doc pkgconfig manpages -SRCREV = "819a125ca756003dce2d11624035b7fb605a8e99" +SRCREV = "1ccfe994287119cc6cef37a7ca4c529d89de4b95" # Lookout for PV bump too when SRCREV is changed -PV = "27" +PV = "28" SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ file://depmod-search.conf \ diff --git a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201218.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20210208.bb index 700a79b11..0013e2458 100644 --- a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201218.bb +++ b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20210208.bb @@ -1,4 +1,7 @@ SUMMARY = "Firmware files for use with Linux kernel" +DESCRIPTION = "Linux firmware is a package distributed alongside the Linux kernel \ +that contains firmware binary blobs necessary for partial or full functionality \ +of certain hardware devices." SECTION = "kernel" LICENSE = "\ @@ -128,7 +131,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=03f0fad70b8b557b56084e3090198021 \ + file://WHENCE;md5=ef0565762eac313c409567b59dff00b2 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -201,7 +204,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "a1cc1ff72c739f312b095df589e9fd639fc81c3f8f7966377ea35222dc94c04b" +SRC_URI[sha256sum] = "1bcb1a3944c361507754a7d26ccff40ffc28d1fb93bce711d67da26b33e785b7" inherit allarch diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc index 3bceac40c..7ec94024c 100644 --- a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +++ b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc @@ -1,4 +1,5 @@ SUMMARY = "Sanitized set of kernel headers for the C library's use" +DESCRIPTION = "Designed to maintain an Application Programming Interface (API) stable version of the Linux headers" SECTION = "devel" LICENSE = "GPLv2" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index 95ac6e0a4..2ccc0ee87 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.11-rc+" +LINUX_VERSION ?= "5.11+" 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 index 1c54ec171..54996a8ae 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "dca023723e0dbfba1c7e8933ca6d70b17af0eab6" -SRCREV_meta ?= "6b12385f7d89ccac211c3981420a84394530ce83" +SRCREV_machine ?= "142456428adbf16db56572889232220afb201974" +SRCREV_meta ?= "8f72218572b1d4a5f053ced2bbf0558d0557072d" 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" +LINUX_VERSION ?= "5.10.16" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" @@ -42,3 +42,4 @@ 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)}" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.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 d505949eb..2508b9ba0 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 ?= "baf3ccf7c7cfaf9515d8c8b3b639d7bbb0564594" -SRCREV_meta ?= "1c358e19696827b594de26a221f110fc2647dfa8" +SRCREV_machine ?= "0406e600800a40015d02b16ee6a4a46c6673c66f" +SRCREV_meta ?= "4f6d6c23cc8ca5d9c39b1efc2619b1dfec1ef2bc" 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.85" +LINUX_VERSION ?= "5.4.98" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" @@ -42,3 +42,4 @@ 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)}" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" 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 deleted file mode 100644 index d20b8b10a..000000000 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +++ /dev/null @@ -1,44 +0,0 @@ -KBRANCH ?= "v5.8/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 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -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}" - -LINUX_VERSION ?= "5.8.18" - -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 = "2" - -LINUX_KERNEL_TYPE = "preempt-rt" - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 1a1845f47..8ecd10716 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.2" +LINUX_VERSION ?= "5.10.16" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 ?= "d02c60a7622d7f06805925ae1742dad2b36eaab9" -SRCREV_machine ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" -SRCREV_meta ?= "6b12385f7d89ccac211c3981420a84394530ce83" +SRCREV_machine_qemuarm ?= "be720c1ce6d1cba2bb3815ad04773355339380ab" +SRCREV_machine ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" +SRCREV_meta ?= "8f72218572b1d4a5f053ced2bbf0558d0557072d" PV = "${LINUX_VERSION}+git${SRCPV}" 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 fea9ae26c..ff03fd419 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.85" +LINUX_VERSION ?= "5.4.98" 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 ?= "f7f4bcebdd599197cde6f1d1985cb1ef1f3e8a54" -SRCREV_machine ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" -SRCREV_meta ?= "1c358e19696827b594de26a221f110fc2647dfa8" +SRCREV_machine_qemuarm ?= "fc95a485415d22eb772359b8d350c03b85c0cd1b" +SRCREV_machine ?= "2d0a4ea86fe97f13a4bc2a92a097e4edb51d737d" +SRCREV_meta ?= "4f6d6c23cc8ca5d9c39b1efc2619b1dfec1ef2bc" 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 deleted file mode 100644 index a5135155d..000000000 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb +++ /dev/null @@ -1,32 +0,0 @@ -KBRANCH ?= "v5.8/standard/tiny/base" -KBRANCH_qemuarm ?= "v5.8/standard/tiny/arm-versatile-926ejs" - -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "5.8.18" -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 ?= "9509db6e3ed6a23b1f7495b53248d1cbfe22710b" -SRCREV_machine ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_meta ?= "b976de4f41df1a50dc84839b64fb0ce2c6f9fb21" - -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.8;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.inc b/poky/meta/recipes-kernel/linux/linux-yocto.inc index bd37006f8..a85280990 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto.inc +++ b/poky/meta/recipes-kernel/linux/linux-yocto.inc @@ -1,6 +1,7 @@ SUMMARY = "Linux kernel" SECTION = "kernel" LICENSE = "GPLv2" +HOMEPAGE = "https://www.yoctoproject.org/" LIC_FILES_CHKSUM ?= "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb index fdfc32123..38b56c17b 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -12,16 +12,16 @@ 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" +SRCREV_machine_qemuarm ?= "57a6fbd33df5c7f057f301387b03a70cdc582282" +SRCREV_machine_qemuarm64 ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" +SRCREV_machine_qemumips ?= "79bd439bff3c9f95cac6fb81c76b559a404a32dc" +SRCREV_machine_qemuppc ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" +SRCREV_machine_qemuriscv64 ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" +SRCREV_machine_qemux86 ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" +SRCREV_machine_qemux86-64 ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" +SRCREV_machine_qemumips64 ?= "07bda345fe202b1d2ce233ffc20b7570f78c9c7f" +SRCREV_machine ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" +SRCREV_meta ?= "8f72218572b1d4a5f053ced2bbf0558d0557072d" # remap qemuarm to qemuarma15 for the 5.8 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.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.2" +LINUX_VERSION ?= "5.10.16" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" @@ -53,3 +53,4 @@ 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)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.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 a3feeae96..8d0f4b82c 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 ?= "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" +SRCREV_machine_qemuarm ?= "28bc6b294bb1e49da671b2848234f9011efcad88" +SRCREV_machine_qemuarm64 ?= "2d0a4ea86fe97f13a4bc2a92a097e4edb51d737d" +SRCREV_machine_qemumips ?= "105568d1696f86625cf7bc30d8c5c921732de2f4" +SRCREV_machine_qemuppc ?= "2d0a4ea86fe97f13a4bc2a92a097e4edb51d737d" +SRCREV_machine_qemuriscv64 ?= "2d0a4ea86fe97f13a4bc2a92a097e4edb51d737d" +SRCREV_machine_qemux86 ?= "2d0a4ea86fe97f13a4bc2a92a097e4edb51d737d" +SRCREV_machine_qemux86-64 ?= "2d0a4ea86fe97f13a4bc2a92a097e4edb51d737d" +SRCREV_machine_qemumips64 ?= "c76ba20ee1b1de859736f85f0210459c2104b8df" +SRCREV_machine ?= "2d0a4ea86fe97f13a4bc2a92a097e4edb51d737d" +SRCREV_meta ?= "4f6d6c23cc8ca5d9c39b1efc2619b1dfec1ef2bc" # 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.85" +LINUX_VERSION ?= "5.4.98" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" @@ -52,3 +52,4 @@ 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)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb deleted file mode 100644 index f6ebefbf1..000000000 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb +++ /dev/null @@ -1,55 +0,0 @@ -KBRANCH ?= "v5.8/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "v5.8/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v5.8/standard/qemuarm64" -KBRANCH_qemumips ?= "v5.8/standard/mti-malta32" -KBRANCH_qemuppc ?= "v5.8/standard/qemuppc" -KBRANCH_qemuriscv64 ?= "v5.8/standard/base" -KBRANCH_qemux86 ?= "v5.8/standard/base" -KBRANCH_qemux86-64 ?= "v5.8/standard/base" -KBRANCH_qemumips64 ?= "v5.8/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "14b463d0e5c1e2ff354244420f9bbc7f0ab80533" -SRCREV_machine_qemuarm64 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_machine_qemumips ?= "8d8d9afb396f154f366f32948fdff3cf4e269841" -SRCREV_machine_qemuppc ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_machine_qemuriscv64 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_machine_qemux86 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_machine_qemux86-64 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_machine_qemumips64 ?= "01a02b058f9a8941032b298b8d25c673526152f4" -SRCREV_machine ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_meta ?= "b976de4f41df1a50dc84839b64fb0ce2c6f9fb21" - -# 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.8;destsuffix=${KMETA}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.8.18" - -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/lttng/babeltrace2_2.0.3.bb b/poky/meta/recipes-kernel/lttng/babeltrace2_2.0.3.bb index c65882581..32ba75bf3 100644 --- a/poky/meta/recipes-kernel/lttng/babeltrace2_2.0.3.bb +++ b/poky/meta/recipes-kernel/lttng/babeltrace2_2.0.3.bb @@ -17,7 +17,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" S = "${WORKDIR}/git" -inherit autotools pkgconfig ptest +inherit autotools pkgconfig ptest python3targetconfig EXTRA_OECONF = "--disable-debug-info" diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-tracepoints-output-proper-root-owner-for-t.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-tracepoints-output-proper-root-owner-for-t.patch deleted file mode 100644 index 956f53d7b..000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-tracepoints-output-proper-root-owner-for-t.patch +++ /dev/null @@ -1,318 +0,0 @@ -From e13a7d262928984154fcf89feb14098e0cd1ad31 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -Date: Tue, 27 Oct 2020 11:42:23 -0400 -Subject: [PATCH 04/11] fix: btrfs: tracepoints: output proper root owner for - trace_find_free_extent() (v5.10) - -See upstream commit : - - commit 437490fed3b0c9ae21af8f70e0f338d34560842b - Author: Qu Wenruo <wqu@suse.com> - Date: Tue Jul 28 09:42:49 2020 +0800 - - btrfs: tracepoints: output proper root owner for trace_find_free_extent() - - The current trace event always output result like this: - - find_free_extent: root=2(EXTENT_TREE) len=16384 empty_size=0 flags=4(METADATA) - find_free_extent: root=2(EXTENT_TREE) len=16384 empty_size=0 flags=4(METADATA) - find_free_extent: root=2(EXTENT_TREE) len=8192 empty_size=0 flags=1(DATA) - find_free_extent: root=2(EXTENT_TREE) len=8192 empty_size=0 flags=1(DATA) - find_free_extent: root=2(EXTENT_TREE) len=4096 empty_size=0 flags=1(DATA) - find_free_extent: root=2(EXTENT_TREE) len=4096 empty_size=0 flags=1(DATA) - - T's saying we're allocating data extent for EXTENT tree, which is not - even possible. - - It's because we always use EXTENT tree as the owner for - trace_find_free_extent() without using the @root from - btrfs_reserve_extent(). - - This patch will change the parameter to use proper @root for - trace_find_free_extent(): - - Now it looks much better: - - find_free_extent: root=5(FS_TREE) len=16384 empty_size=0 flags=36(METADATA|DUP) - find_free_extent: root=5(FS_TREE) len=8192 empty_size=0 flags=1(DATA) - find_free_extent: root=5(FS_TREE) len=16384 empty_size=0 flags=1(DATA) - find_free_extent: root=5(FS_TREE) len=4096 empty_size=0 flags=1(DATA) - find_free_extent: root=5(FS_TREE) len=8192 empty_size=0 flags=1(DATA) - find_free_extent: root=5(FS_TREE) len=16384 empty_size=0 flags=36(METADATA|DUP) - find_free_extent: root=7(CSUM_TREE) len=16384 empty_size=0 flags=36(METADATA|DUP) - find_free_extent: root=2(EXTENT_TREE) len=16384 empty_size=0 flags=36(METADATA|DUP) - find_free_extent: root=1(ROOT_TREE) len=16384 empty_size=0 flags=36(METADATA|DUP) - -Signed-off-by: Michael Jeanson <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Change-Id: I1d674064d29b31417e2acffdeb735f5052a87032 - -Upstream-Status: Backport - -Signed-off-by: He Zhe <zhe.he@windriver.com> ---- - instrumentation/events/lttng-module/btrfs.h | 206 ++++++++++++-------- - 1 file changed, 122 insertions(+), 84 deletions(-) - -diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h -index 7b29008..52fcfd0 100644 ---- a/instrumentation/events/lttng-module/btrfs.h -+++ b/instrumentation/events/lttng-module/btrfs.h -@@ -1856,7 +1856,29 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent, btrfs_reserved_extent_f - - #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0) || \ -+ LTTNG_KERNEL_RANGE(5,9,6, 5,10,0) || \ -+ LTTNG_KERNEL_RANGE(5,4,78, 5,5,0)) -+LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, -+ -+ btrfs_find_free_extent, -+ -+ TP_PROTO(const struct btrfs_root *root, u64 num_bytes, u64 empty_size, -+ u64 data), -+ -+ TP_ARGS(root, num_bytes, empty_size, data), -+ -+ TP_FIELDS( -+ ctf_array(u8, fsid, root->lttng_fs_info_fsid, BTRFS_UUID_SIZE) -+ ctf_integer(u64, root_objectid, root->root_key.objectid) -+ ctf_integer(u64, num_bytes, num_bytes) -+ ctf_integer(u64, empty_size, empty_size) -+ ctf_integer(u64, data, data) -+ ) -+) -+ -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0)) -+ - LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, - - btrfs_find_free_extent, -@@ -1874,6 +1896,105 @@ LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, - ) - ) - -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,0)) -+ -+LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, -+ -+ btrfs_find_free_extent, -+ -+ TP_PROTO(const struct btrfs_fs_info *fs_info, u64 num_bytes, u64 empty_size, -+ u64 data), -+ -+ TP_ARGS(fs_info, num_bytes, empty_size, data), -+ -+ TP_FIELDS( -+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE) -+ ctf_integer(u64, num_bytes, num_bytes) -+ ctf_integer(u64, empty_size, empty_size) -+ ctf_integer(u64, data, data) -+ ) -+) -+ -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) -+ -+LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, -+ -+ btrfs_find_free_extent, -+ -+ TP_PROTO(const struct btrfs_fs_info *fs_info, u64 num_bytes, u64 empty_size, -+ u64 data), -+ -+ TP_ARGS(fs_info, num_bytes, empty_size, data), -+ -+ TP_FIELDS( -+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE) -+ ctf_integer(u64, num_bytes, num_bytes) -+ ctf_integer(u64, empty_size, empty_size) -+ ctf_integer(u64, data, data) -+ ) -+) -+ -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) -+ -+LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, -+ -+ btrfs_find_free_extent, -+ -+ TP_PROTO(struct btrfs_fs_info *fs_info, u64 num_bytes, u64 empty_size, -+ u64 data), -+ -+ TP_ARGS(fs_info, num_bytes, empty_size, data), -+ -+ TP_FIELDS( -+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE) -+ ctf_integer(u64, num_bytes, num_bytes) -+ ctf_integer(u64, empty_size, empty_size) -+ ctf_integer(u64, data, data) -+ ) -+) -+ -+#elif (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_MAP(find_free_extent, -+ -+ btrfs_find_free_extent, -+ -+ TP_PROTO(const struct btrfs_root *root, u64 num_bytes, u64 empty_size, -+ u64 data), -+ -+ TP_ARGS(root, num_bytes, empty_size, data), -+ -+ TP_FIELDS( -+ ctf_integer(u64, root_objectid, root->root_key.objectid) -+ ctf_integer(u64, num_bytes, num_bytes) -+ ctf_integer(u64, empty_size, empty_size) -+ ctf_integer(u64, data, data) -+ ) -+) -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) -+ -+LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, -+ -+ btrfs_find_free_extent, -+ -+ TP_PROTO(struct btrfs_root *root, u64 num_bytes, u64 empty_size, -+ u64 data), -+ -+ TP_ARGS(root, num_bytes, empty_size, data), -+ -+ TP_FIELDS( -+ ctf_integer(u64, root_objectid, root->root_key.objectid) -+ ctf_integer(u64, num_bytes, num_bytes) -+ ctf_integer(u64, empty_size, empty_size) -+ ctf_integer(u64, data, data) -+ ) -+) -+#endif -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0)) - LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent, - - TP_PROTO(const struct btrfs_block_group *block_group, u64 start, -@@ -1907,22 +2028,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_clus - ) - - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,0)) --LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, -- -- btrfs_find_free_extent, -- -- TP_PROTO(const struct btrfs_fs_info *fs_info, u64 num_bytes, u64 empty_size, -- u64 data), -- -- TP_ARGS(fs_info, num_bytes, empty_size, data), -- -- TP_FIELDS( -- ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE) -- ctf_integer(u64, num_bytes, num_bytes) -- ctf_integer(u64, empty_size, empty_size) -- ctf_integer(u64, data, data) -- ) --) - - LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent, - -@@ -1957,22 +2062,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_clus - ) - - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) --LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, -- -- btrfs_find_free_extent, -- -- TP_PROTO(const struct btrfs_fs_info *fs_info, u64 num_bytes, u64 empty_size, -- u64 data), -- -- TP_ARGS(fs_info, num_bytes, empty_size, data), -- -- TP_FIELDS( -- ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE) -- ctf_integer(u64, num_bytes, num_bytes) -- ctf_integer(u64, empty_size, empty_size) -- ctf_integer(u64, data, data) -- ) --) - - LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent, - -@@ -2011,23 +2100,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_clus - - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) - --LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, -- -- btrfs_find_free_extent, -- -- TP_PROTO(struct btrfs_fs_info *fs_info, u64 num_bytes, u64 empty_size, -- u64 data), -- -- TP_ARGS(fs_info, num_bytes, empty_size, data), -- -- TP_FIELDS( -- ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE) -- ctf_integer(u64, num_bytes, num_bytes) -- ctf_integer(u64, empty_size, empty_size) -- ctf_integer(u64, data, data) -- ) --) -- - LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent, - - TP_PROTO(struct btrfs_fs_info *fs_info, -@@ -2066,23 +2138,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_clus - 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_MAP(find_free_extent, -- -- btrfs_find_free_extent, -- -- TP_PROTO(const struct btrfs_root *root, u64 num_bytes, u64 empty_size, -- u64 data), -- -- TP_ARGS(root, num_bytes, empty_size, data), -- -- TP_FIELDS( -- ctf_integer(u64, root_objectid, root->root_key.objectid) -- ctf_integer(u64, num_bytes, num_bytes) -- ctf_integer(u64, empty_size, empty_size) -- ctf_integer(u64, data, data) -- ) --) -- - LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent, - - TP_PROTO(const struct btrfs_root *root, -@@ -2120,23 +2175,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_clus - - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) - --LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, -- -- btrfs_find_free_extent, -- -- TP_PROTO(struct btrfs_root *root, u64 num_bytes, u64 empty_size, -- u64 data), -- -- TP_ARGS(root, num_bytes, empty_size, data), -- -- TP_FIELDS( -- ctf_integer(u64, root_objectid, root->root_key.objectid) -- ctf_integer(u64, num_bytes, num_bytes) -- ctf_integer(u64, empty_size, empty_size) -- ctf_integer(u64, data, data) -- ) --) -- - LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent, - - TP_PROTO(struct btrfs_root *root, --- -2.17.1 - 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 deleted file mode 100644 index fde939839..000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-objtool-Rename-frame.h-objtool.h-v5.10.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 37b9cb0e6cb92181b7a25583849a9d161a558982 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -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 <jthierry@redhat.com> - 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 <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -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 <wrapper/uaccess.h> --#include <wrapper/frame.h> -+#include <wrapper/objtool.h> - #include <wrapper/types.h> - #include <linux/swab.h> - -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 <mathieu.desnoyers@efficios.com> - */ - --#ifndef _LTTNG_WRAPPER_FRAME_H --#define _LTTNG_WRAPPER_FRAME_H -+#ifndef _LTTNG_WRAPPER_OBJTOOL_H -+#define _LTTNG_WRAPPER_OBJTOOL_H - - #include <linux/version.h> - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) -- -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) -+#include <linux/objtool.h> -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) - #include <linux/frame.h> -+#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 deleted file mode 100644 index bc87c7174..000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0009-fix-btrfs-make-ordered-extent-tracepoint-take-btrfs_.patch +++ /dev/null @@ -1,179 +0,0 @@ -From ddad4e82bc2cc48c0eb56d2daf69409026e8b31a Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -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 <nborisov@suse.com> - 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 <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -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 deleted file mode 100644 index fb00a44b3..000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-ext4-fast-commit-recovery-path-v5.10.patch +++ /dev/null @@ -1,99 +0,0 @@ -From a28235f8ffa3c961640a835686dddb5ca600dfaf Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -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 <harshadshirwadkar@gmail.com> - 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 <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -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 deleted file mode 100644 index 8651bded9..000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0012-fix-kvm-x86-mmu-Add-TDP-MMU-PF-handler-v5.10.patch +++ /dev/null @@ -1,82 +0,0 @@ -From e30866f96b3ab02639f429e4bd34e59b3a336579 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -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 <bgardon@google.com> - 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 <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -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 deleted file mode 100644 index 5892a408b..000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0014-fix-tracepoint-Optimize-using-static_call-v5.10.patch +++ /dev/null @@ -1,196 +0,0 @@ -From bb346792c2cb6995ffc08d2084121935c6384865 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -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) <rostedt@goodmis.org> - 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 <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - 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 <instrumentation/events/lttng-module/lttng-statedump.h> - --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 <linux/module.h> --#include <linux/tracepoint.h> -+#include <wrapper/tracepoint.h> - #include <linux/uaccess.h> - #include <linux/gfp.h> - #include <linux/fs.h> -@@ -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 <instrumentation/events/lttng-module/lttng-test.h> - --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 <linux/tracepoint.h> - #include <linux/module.h> - -+#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 deleted file mode 100644 index e848e16f5..000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0016-fix-statedump-undefined-symbols-caused-by-incorrect-.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 31f8bf794172102e9758928b481856c4a8800a7f Mon Sep 17 00:00:00 2001 -From: He Zhe <zhe.he@windriver.com> -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 <zhe.he@windriver.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - 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/BUILD_RUNTIME_BUG_ON-vs-gcc7.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/BUILD_RUNTIME_BUG_ON-vs-gcc7.patch deleted file mode 100644 index 76063607a..000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/BUILD_RUNTIME_BUG_ON-vs-gcc7.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ab07574ef90fa510f293c37897d577066a88fe0d Mon Sep 17 00:00:00 2001 -From: Nathan Lynch <nathan_lynch@mentor.com> -Date: Tue, 25 Apr 2017 16:26:57 -0500 -Subject: [PATCH] BUILD_RUNTIME_BUG_ON vs gcc7 - -Avoid using LTTng's BUILD_RUNTIME_BUG_ON macro, as it appears to run -into a similar problem as Linux experienced with ilog2. - -See: -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=474c90156c8dcc2fa815e6716cc9394d7930cb9c -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=72785 - -Upstream-Status: Pending -Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com> ---- - lib/align.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/align.h b/lib/align.h -index 5b91ae87410b..5e134cd485fe 100644 ---- a/lib/align.h -+++ b/lib/align.h -@@ -48,7 +48,7 @@ - */ - #define offset_align(align_drift, alignment) \ - ({ \ -- BUILD_RUNTIME_BUG_ON((alignment) == 0 \ -+ BUG_ON((alignment) == 0 \ - || ((alignment) & ((alignment) - 1))); \ - (((alignment) - (align_drift)) & ((alignment) - 1)); \ - }) -@@ -63,7 +63,7 @@ - */ - #define offset_align_floor(align_drift, alignment) \ - ({ \ -- BUILD_RUNTIME_BUG_ON((alignment) == 0 \ -+ BUG_ON((alignment) == 0 \ - || ((alignment) & ((alignment) - 1))); \ - (((align_drift) - (alignment)) & ((alignment) - 1)); \ - }) --- -2.9.3 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules_2.12.3.bb b/poky/meta/recipes-kernel/lttng/lttng-modules_2.12.4.bb index 3515e4f51..3ca59f789 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-modules_2.12.3.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-modules_2.12.4.bb @@ -1,6 +1,7 @@ SECTION = "devel" SUMMARY = "Linux Trace Toolkit KERNEL MODULE" DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" +HOMEPAGE = "https://lttng.org/" LICENSE = "LGPLv2.1 & GPLv2 & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128" @@ -10,17 +11,9 @@ include lttng-platforms.inc 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" +SRC_URI[sha256sum] = "fe66400fa1b85bff1b9ae24419c74e3bb7d358d643eade0594d81b48bd190688" export INSTALL_MOD_DIR="kernel/lttng-modules" @@ -41,7 +34,6 @@ LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c07 DEFAULT_PREFERENCE_class-devupstream = "-1" SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.12 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ - file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " SRCREV_class-devupstream = "be71b60a327d7ad2588abc5cad2861177119972b" PV_class-devupstream = "2.12.3+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools/determinism.patch b/poky/meta/recipes-kernel/lttng/lttng-tools/determinism.patch new file mode 100644 index 000000000..b2ab880bd --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-tools/determinism.patch @@ -0,0 +1,64 @@ +This is a bit ugly. Specifing abs_builddir as an RPATH is plain wrong when +cross compiling. Sadly, removing the rpath makes libtool/automake do +weird things and breaks the build as shared libs are no longer generated. + +We already try and delete the RPATH at do_install with chrpath however +that does leave the path in the string table so it doesn't help us +with reproducibility. + +Instead, hack in a bogus but harmless path, then delete it later in +our do_install. Ultimately we may want to pass a specific path to use +to configure if we really do need to set an RPATH at all. It is unclear +to me whether the tests need that or not. + +Fixes reproducibility issues for lttng-tools. + +Upstream-Status: Pending [needs discussion with upstream about the correct solution] +RP 2021/3/1 + +Index: lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am +=================================================================== +--- lttng-tools-2.12.2.orig/tests/regression/ust/ust-dl/Makefile.am ++++ lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am +@@ -27,16 +27,16 @@ noinst_LTLIBRARIES = libzzz.la libbar.la + + libzzz_la_SOURCES = libzzz.c libzzz.h + libzzz_la_LDFLAGS = -module -shared -avoid-version \ +- -rpath $(abs_builddir) ++ -rpath /usr/lib + + libbar_la_SOURCES = libbar.c libbar.h + libbar_la_LDFLAGS = -module -shared -avoid-version \ +- -rpath $(abs_builddir) ++ -rpath /usr/lib + libbar_la_LIBADD = libzzz.la + + libfoo_la_SOURCES = libfoo.c libfoo.h + libfoo_la_LDFLAGS = -module -shared -avoid-version \ +- -rpath $(abs_builddir) ++ -rpath /usr/lib + libfoo_la_LIBADD = libbar.la + + CLEANFILES = libfoo.so libfoo.so.debug libbar.so libbar.so.debug \ +@@ -44,7 +44,7 @@ CLEANFILES = libfoo.so libfoo.so.debug l + + libtp_la_SOURCES = libbar-tp.h libbar-tp.c libfoo-tp.h libfoo-tp.c \ + libzzz-tp.h libzzz-tp.c +-libtp_la_LDFLAGS = -module -shared -rpath $(abs_builddir) ++libtp_la_LDFLAGS = -module -shared -rpath /usr/lib + + # Extract debug symbols + libfoo.so.debug: libfoo.la +Index: lttng-tools-2.12.2/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am +=================================================================== +--- lttng-tools-2.12.2.orig/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am ++++ lttng-tools-2.12.2/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am +@@ -5,7 +5,7 @@ AM_CFLAGS += -O0 + noinst_LTLIBRARIES = libfoo.la + + libfoo_la_SOURCES = foo.c foo.h +-libfoo_la_LDFLAGS = -shared -module -avoid-version -rpath $(abs_builddir)/.libs/ ++libfoo_la_LDFLAGS = -shared -module -avoid-version -rpath /usr/lib + + noinst_PROGRAMS = userspace-probe-elf-binary + userspace_probe_elf_binary_SOURCES = userspace-probe-elf-binary.c diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb b/poky/meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb index 0787e04d1..52bfd3637 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb @@ -3,6 +3,7 @@ SUMMARY = "Linux Trace Toolkit Control" DESCRIPTION = "The Linux trace toolkit is a suite of tools designed \ to extract program execution details from the Linux operating system \ and interpret them." +HOMEPAGE = "https://github.com/lttng/lttng-tools" LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=40ef17463fbd6f377db3c47b1cbaded8 \ @@ -35,6 +36,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://run-ptest \ file://lttng-sessiond.service \ file://0001-tests-regression-disable-the-tools-live-tests.patch \ + file://determinism.patch \ " SRC_URI[sha256sum] = "9ed9161795ff023b076f9f95afaa4f1f822ec42495c0fa04c586ab8fa74e84f1" @@ -113,6 +115,8 @@ do_install_ptest () { done chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary + chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libbar.so + chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libfoo.so # # Use the versioned libs of liblttng-ust-dl. @@ -150,6 +154,10 @@ do_install_ptest () { -e 's#\(^test.*LDADD.=\)#disable\1#g' \ -i ${D}${PTEST_PATH}/tests/unit/Makefile + # Fix hardcoded build path + sed -e 's#TESTAPP_PATH=.*/tests/regression/#TESTAPP_PATH=${PTEST_PATH}/tests/regression/#' \ + -i ${D}${PTEST_PATH}/tests/regression/ust/python-logging/test_python_logging + # Substitute links to installed binaries. for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd lttng-crash; do exedir="${D}${PTEST_PATH}/src/bin/${prog}" diff --git a/poky/meta/recipes-kernel/lttng/lttng-ust_2.12.0.bb b/poky/meta/recipes-kernel/lttng/lttng-ust_2.12.1.bb index 67a4307c7..67b53cbbb 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-ust_2.12.0.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-ust_2.12.1.bb @@ -33,8 +33,8 @@ SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch \ " -SRC_URI[md5sum] = "3bf4a04c305271d13cf6596c4e7b9b3c" -SRC_URI[sha256sum] = "1983edb525f3f27e3494088d8d5389b4c71af66bbfe63c6f1df2ad95aa44a528" +SRC_URI[md5sum] = "11787d1df69b04dd7431614ab43b2e12" +SRC_URI[sha256sum] = "48a3948b168195123a749d22818809bd25127bb5f1a66458c3c012b210d2a051" CVE_PRODUCT = "ust" diff --git a/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb index 1ab248fed..92ffa4720 100644 --- a/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +++ b/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb @@ -1,6 +1,7 @@ SUMMARY = "Build tools needed by external modules" +HOMEPAGE = "https://www.yoctoproject.org/" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" inherit kernel-arch inherit pkgconfig diff --git a/poky/meta/recipes-kernel/systemtap/systemtap_git.bb b/poky/meta/recipes-kernel/systemtap/systemtap_git.bb index 923d64b97..c4a6eef59 100644 --- a/poky/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/poky/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -1,4 +1,7 @@ SUMMARY = "Script-directed dynamic tracing and performance analysis tool for Linux" +DESCRIPTION = "It provides free software infrastructure to simplify the \ +gathering of information about the running Linux system. This assists \ +diagnosis of a performance or functional problem." HOMEPAGE = "https://sourceware.org/systemtap/" require systemtap_git.inc diff --git a/poky/meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb b/poky/meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb index f38e8b94f..c49cc2a9b 100644 --- a/poky/meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb +++ b/poky/meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb @@ -1,4 +1,6 @@ SUMMARY = "ALSA sound library" +DESCRIPTION = "(Occasionally a.k.a. libasound) is a userspace library that \ +provides a level of abstraction over the /dev interfaces provided by the kernel modules." HOMEPAGE = "http://www.alsa-project.org" BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" SECTION = "libs/multimedia" diff --git a/poky/meta/recipes-multimedia/alsa/alsa-plugins_1.2.2.bb b/poky/meta/recipes-multimedia/alsa/alsa-plugins_1.2.2.bb index e8402a6fc..1381896f3 100644 --- a/poky/meta/recipes-multimedia/alsa/alsa-plugins_1.2.2.bb +++ b/poky/meta/recipes-multimedia/alsa/alsa-plugins_1.2.2.bb @@ -1,4 +1,7 @@ SUMMARY = "ALSA Plugins" +DESCRIPTION = "Used to create virtual devices that can be used like normal \ +hardware devices but cause extra processing of the sound stream to take place. \ +They are used while configuring ALSA in the .asoundrc file." HOMEPAGE = "http://alsa-project.org" BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" SECTION = "multimedia" diff --git a/poky/meta/recipes-multimedia/alsa/alsa-tools_1.2.2.bb b/poky/meta/recipes-multimedia/alsa/alsa-tools_1.2.2.bb index 0838be879..0a25d809b 100644 --- a/poky/meta/recipes-multimedia/alsa/alsa-tools_1.2.2.bb +++ b/poky/meta/recipes-multimedia/alsa/alsa-tools_1.2.2.bb @@ -1,4 +1,7 @@ SUMMARY = "Advanced tools for certain ALSA sound card drivers" +DESCRIPTION = "Package containing a number of tools ranging from envy24control \ +which provides complete control over all devices with an envy24 chip, to \ +firmware loaders for pcmcia, USB and the hdsp devices." HOMEPAGE = "http://www.alsa-project.org" BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" SECTION = "console/utils" diff --git a/poky/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb b/poky/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb index aac4b4894..26542fbbb 100644 --- a/poky/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb +++ b/poky/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb @@ -1,4 +1,7 @@ SUMMARY = "ALSA topology configuration files" +DESCRIPTION = "Provides a method for audio drivers to load their mixers, \ +routing, PCMs and capabilities from user space at runtime without changing \ +any driver source code." HOMEPAGE = "https://alsa-project.org" BUGTRACKER = "https://alsa-project.org/wiki/Bug_Tracking" LICENSE = "BSD-3-Clause" diff --git a/poky/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb b/poky/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb index da41c3db7..32cf41c8f 100644 --- a/poky/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb +++ b/poky/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb @@ -1,4 +1,7 @@ SUMMARY = "ALSA Use Case Manager configuration" +DESCRIPTION = "This package contains ALSA Use Case Manager configuration \ +of audio input/output names and routing for specific audio hardware. \ +They can be used with the alsaucm tool. " HOMEPAGE = "https://alsa-project.org" BUGTRACKER = "https://alsa-project.org/wiki/Bug_Tracking" LICENSE = "BSD-3-Clause" diff --git a/poky/meta/recipes-multimedia/alsa/alsa-utils.inc b/poky/meta/recipes-multimedia/alsa/alsa-utils.inc index c001b29a0..f2e8133d2 100644 --- a/poky/meta/recipes-multimedia/alsa/alsa-utils.inc +++ b/poky/meta/recipes-multimedia/alsa/alsa-utils.inc @@ -1,4 +1,6 @@ SUMMARY = "ALSA sound utilities" +DESCRIPTION = "collection of small and often extremely powerful applications \ +designed to allow users to control the various parts of the ALSA system." HOMEPAGE = "http://www.alsa-project.org" BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" SECTION = "console/utils" diff --git a/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2020-35964.patch b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2020-35964.patch new file mode 100644 index 000000000..6b96bd674 --- /dev/null +++ b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2020-35964.patch @@ -0,0 +1,75 @@ +From 27a99e2c7d450fef15594671eef4465c8a166bd7 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer <michael@niedermayer.cc> +Date: Wed, 28 Oct 2020 20:11:54 +0100 +Subject: [PATCH] avformat/vividas: improve extradata packing checks in + track_header() + +Fixes: out of array accesses +Fixes: 26622/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVIDAS_fuzzer-6581200338288640 + +Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg +Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> + +Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/27a99e2c7d450fef15594671eef4465c8a166bd7] + +CVE: CVE-2020-35964 + +Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> +Signed-off-by: Khairul Rohaizzat Jamaluddin <khairul.rohaizzat.jamaluddin@intel.com> +--- + libavformat/vividas.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libavformat/vividas.c b/libavformat/vividas.c +index 83d0ed116787..46c66bf9a0ae 100644 +--- a/libavformat/vividas.c ++++ b/libavformat/vividas.c +@@ -28,6 +28,7 @@ + * @sa http://wiki.multimedia.cx/index.php?title=Vividas_VIV + */ + ++#include "libavutil/avassert.h" + #include "libavutil/intreadwrite.h" + #include "avio_internal.h" + #include "avformat.h" +@@ -379,7 +380,7 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t * + + if (avio_tell(pb) < off) { + int num_data; +- int xd_size = 0; ++ int xd_size = 1; + int data_len[256]; + int offset = 1; + uint8_t *p; +@@ -393,10 +394,10 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t * + return AVERROR_INVALIDDATA; + } + data_len[j] = len; +- xd_size += len; ++ xd_size += len + 1 + len/255; + } + +- ret = ff_alloc_extradata(st->codecpar, 64 + xd_size + xd_size / 255); ++ ret = ff_alloc_extradata(st->codecpar, xd_size); + if (ret < 0) + return ret; + +@@ -405,9 +406,7 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t * + + for (j = 0; j < num_data - 1; j++) { + unsigned delta = av_xiphlacing(&p[offset], data_len[j]); +- if (delta > data_len[j]) { +- return AVERROR_INVALIDDATA; +- } ++ av_assert0(delta <= xd_size - offset); + offset += delta; + } + +@@ -418,6 +417,7 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t * + av_freep(&st->codecpar->extradata); + break; + } ++ av_assert0(data_len[j] <= xd_size - offset); + offset += data_len[j]; + } + diff --git a/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2020-35965.patch b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2020-35965.patch new file mode 100644 index 000000000..ddab8e9ac --- /dev/null +++ b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2020-35965.patch @@ -0,0 +1,35 @@ +From 3e5959b3457f7f1856d997261e6ac672bba49e8b Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer <michael@niedermayer.cc> +Date: Sat, 24 Oct 2020 22:21:48 +0200 +Subject: [PATCH] avcodec/exr: Check ymin vs. h + +Fixes: out of array access +Fixes: 26532/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5613925708857344 +Fixes: 27443/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5631239813595136 + +Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg +Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> + +Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/3e5959b3457f7f1856d997261e6ac672bba49e8b] + +CVE: CVE-2020-35965 + +Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> +Signed-off-by: Khairul Rohaizzat Jamaluddin <khairul.rohaizzat.jamaluddin@intel.com> +--- + libavcodec/exr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavcodec/exr.c b/libavcodec/exr.c +index e907c5c46401..8b701d1cd298 100644 +--- a/libavcodec/exr.c ++++ b/libavcodec/exr.c +@@ -1830,7 +1830,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, + // Zero out the start if ymin is not 0 + for (i = 0; i < planes; i++) { + ptr = picture->data[i]; +- for (y = 0; y < s->ymin; y++) { ++ for (y = 0; y < FFMIN(s->ymin, s->h); y++) { + memset(ptr, 0, out_line_size); + ptr += picture->linesize[i]; + } diff --git a/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.1.bb b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.1.bb index 97b2d21d3..bd2155233 100644 --- a/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.1.bb +++ b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.1.bb @@ -27,6 +27,8 @@ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ file://mips64_cpu_detection.patch \ file://0001-lavf-srt-fix-build-fail-when-used-the-libsrt-1.4.1.patch \ file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \ + file://CVE-2020-35964.patch \ + file://CVE-2020-35965.patch \ " SRC_URI[sha256sum] = "ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb" @@ -44,7 +46,8 @@ DEPENDS = "nasm-native" inherit autotools pkgconfig PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \ - alsa bzlib gpl lzma theora x264 zlib \ + alsa bzlib gpl lzma pic pthreads shared theora x264 zlib \ + ${@bb.utils.contains('AVAILTUNES', 'mips32r2', 'mips32r2', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}" # libraries to build in addition to avutil @@ -83,6 +86,13 @@ PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" +# other configuration options +PACKAGECONFIG[mips32r2] = ",--disable-mipsdsp --disable-mipsdspr2" +PACKAGECONFIG[pic] = "--enable-pic" +PACKAGECONFIG[pthreads] = "--enable-pthreads,--disable-pthreads" +PACKAGECONFIG[shared] = "--enable-shared" +PACKAGECONFIG[strip] = ",--disable-stripping" + # Check codecs that require --enable-nonfree USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}" @@ -93,10 +103,6 @@ def cpu(d): return 'generic' EXTRA_OECONF = " \ - --disable-stripping \ - --enable-pic \ - --enable-shared \ - --enable-pthreads \ ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \ \ --cross-prefix=${TARGET_PREFIX} \ @@ -114,7 +120,6 @@ EXTRA_OECONF = " \ --libdir=${libdir} \ --shlibdir=${libdir} \ --datadir=${datadir}/ffmpeg \ - ${@bb.utils.contains('AVAILTUNES', 'mips32r2', '', '--disable-mipsdsp --disable-mipsdspr2', d)} \ --cpu=${@cpu(d)} \ --pkg-config=pkg-config \ " diff --git a/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.3.bb index 9fd9e0be9..bad992175 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.3.bb @@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV} file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[sha256sum] = "6ea73d718bf1f9692218540ff88479c51d67c0b477fa56d6812fc7b739d30a56" +SRC_URI[sha256sum] = "3025fee3607caf5069154c099533785675916e044ee92c936bbeacdda3750f26" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS_${PN} = "git" @@ -38,5 +38,12 @@ EXTRA_OEMESON += " \ ${@gettext_oemeson(d)} \ " +do_install_append () { + for fn in ${bindir}/gst-validate-launcher \ + ${libdir}/gst-validate-launcher/python/launcher/config.py; do + sed -i -e 's,${B},/usr/src/debug/${PN},g' -e 's,${S},/usr/src/debug/${PN},g' ${D}$fn + done +} + GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" diff --git a/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.3.bb index 54a4b5df1..b49201fb0 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.3.bb @@ -1,4 +1,7 @@ SUMMARY = "GStreamer examples (including gtk-play, gst-play)" +DESCRIPTION = "GStreamer example applications" +HOMEPAGE = "https://gitlab.freedesktop.org/gstreamer/gst-examples" +BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-examples/-/issues" LICENSE = "LGPL-2.0+" LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9" @@ -9,7 +12,7 @@ SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=http file://gst-player.desktop \ " -SRCREV = "45086d8ef2d75244d9d5c8f69c0f0e1dfd4200b3" +SRCREV = "06599904baa5d0e47b5cb9501372156567760f8e" S = "${WORKDIR}/git" 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.3.bb index b638814aa..baf87fd87 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.3.bb @@ -1,4 +1,6 @@ SUMMARY = "Libav-based GStreamer 1.x plugin" +DESCRIPTION = "Contains a GStreamer plugin for using the encoders, decoders, \ +muxers, and demuxers provided by FFmpeg." HOMEPAGE = "http://gstreamer.freedesktop.org/" SECTION = "multimedia" @@ -10,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ " SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" -SRC_URI[sha256sum] = "36969ad44c5f0756a8a90215410710d6c39713d58f6cee13d663be9774557f49" +SRC_URI[sha256sum] = "ad20546bcd78ac1e7cf194666d73c4f33efeb62647d2b6af22993b540699e91c" S = "${WORKDIR}/gst-libav-${PV}" 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.3.bb index 686fcc265..d55f45ac6 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.3.bb @@ -1,4 +1,5 @@ SUMMARY = "OpenMAX IL plugins for GStreamer" +DESCRIPTION = "Wraps available OpenMAX IL components and makes them available as standard GStreamer elements." HOMEPAGE = "http://gstreamer.freedesktop.org/" SECTION = "multimedia" @@ -9,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI[sha256sum] = "4c05d64544eecf4aaf5b337789916c67ed720317dfb2c8c8c335720fcc5c7cf4" +SRC_URI[sha256sum] = "ed0f26504e9a60e15055134410f156e40952336410f2a59bdbbda45e61e8b93f" S = "${WORKDIR}/gst-omx-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch new file mode 100644 index 000000000..cb3bb7d36 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch @@ -0,0 +1,31 @@ +From 1f00d5026118ebd48e4ccf83d32d67155c4e7f60 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Wed, 30 Dec 2020 16:37:47 +0800 +Subject: [PATCH] msdk: fix includedir path + +In cross compilation, need to prepend PKG_CONFIG_SYSROOT_DIR to the dir path. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + sys/msdk/meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build +index 6346c9451..068f38548 100644 +--- a/sys/msdk/meson.build ++++ b/sys/msdk/meson.build +@@ -40,7 +40,9 @@ endif + + mfx_dep = dependency('libmfx', required: false) + if mfx_dep.found() ++ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() + mfx_incdir = mfx_dep.get_pkgconfig_variable('includedir') ++ mfx_incdir = pkgconf_sysroot + mfx_incdir + mfx_inc = [] + else + # Old versions of MediaSDK don't provide a pkg-config file +-- +2.17.1 + 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.3.bb index d37a22325..b1e3664cb 100644 --- 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.3.bb @@ -1,12 +1,17 @@ require gstreamer1.0-plugins-common.inc +DESCRIPTION = "'Bad' GStreamer plugins and helper libraries " +HOMEPAGE = "https://gstreamer.freedesktop.org/" +BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues" + 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 \ + file://0005-msdk-fix-includedir-path.patch \ " -SRC_URI[sha256sum] = "8ad5822f1118fe46a19af54422b74e3a16d79a6800dcb173b49e199a496b341a" +SRC_URI[sha256sum] = "b7e34b6b86272588fbd8b314dadfa6ceff895198cfb59e2950378e9e31ff22e0" S = "${WORKDIR}/gst-plugins-bad-${PV}" 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.3.bb index 531d577b0..86b0f2790 100644 --- 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.3.bb @@ -1,5 +1,8 @@ require gstreamer1.0-plugins-common.inc +DESCRIPTION = "'Base' GStreamer plugins and helper libraries" +HOMEPAGE = "https://gstreamer.freedesktop.org/" +BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues" LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" @@ -9,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ file://0004-glimagesink-Downrank-to-marginal.patch \ " -SRC_URI[sha256sum] = "dd04fb1f7826e2f6d9b4d66fc22f19cc6a47c301e13041f0ee3d7f65c89b05ac" +SRC_URI[sha256sum] = "dbfa20283848f0347a223dd8523dfb62e09e5220b21b1d157a8b0c8b67ba9f52" S = "${WORKDIR}/gst-plugins-base-${PV}" 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.3.bb index 2e076bf88..93c6616c3 100644 --- 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.3.bb @@ -1,10 +1,14 @@ require gstreamer1.0-plugins-common.inc +DESCRIPTION = "'Good' GStreamer plugins" +HOMEPAGE = "https://gstreamer.freedesktop.org/" +BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues" + 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" +SRC_URI[sha256sum] = "9b3b8e05d4d6073bf929fb33e2d8f74dd81ff21fa5b50c3273c78dfa2ab9c5cb" S = "${WORKDIR}/gst-plugins-good-${PV}" 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.3.bb index e482aa10b..876a9268a 100644 --- 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.3.bb @@ -1,5 +1,9 @@ require gstreamer1.0-plugins-common.inc +DESCRIPTION = "'Ugly GStreamer plugins" +HOMEPAGE = "https://gstreamer.freedesktop.org/" +BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly/-/issues" + LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" @@ -9,7 +13,7 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "a337a022ed472209b38cab5918dc2f4e7a6adc1f4afacd226a6345e5cb668bdb" +SRC_URI[sha256sum] = "70f7429b25dd2f714eb18e80af61b1363b1f63019e16cd28e086e3a619eaa992" S = "${WORKDIR}/gst-plugins-ugly-${PV}" 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.3.bb index 5711744b4..90b6fc38d 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.3.bb @@ -1,4 +1,6 @@ SUMMARY = "Python bindings for GStreamer 1.0" +DESCRIPTION = "GStreamer Python binding overrides (complementing the bindings \ +provided by python-gi) " HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-python/" SECTION = "multimedia" @@ -6,7 +8,7 @@ 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" +SRC_URI[sha256sum] = "4e630735276e08ff4d70337aa5d91fd008e5f1ed3dc0993674cd5820e264259a" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" RDEPENDS_${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" @@ -15,6 +17,8 @@ PNREAL = "gst-python" S = "${WORKDIR}/${PNREAL}-${PV}" +EXTRA_OEMESON += "-Dlibpython-dir=${libdir}" + # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" 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.3.bb index b680aa38d..d6aaa5df7 100644 --- 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.3.bb @@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "973922aba65a1672a131527dee965fb09bab4bb996c351f0ee7f42f0d5b954e2" +SRC_URI[sha256sum] = "4f7757293b3d73dc49768b7392791668c4d0c21d41824624ffbd75c7f9ee0168" S = "${WORKDIR}/${PNREAL}-${PV}" 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.3.bb index f237191d5..23040ad73 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.3.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "8c7b2c74fda095d83dea67accde6a68ba9f608d97ed969fdcf278930f9b1c7c0" +SRC_URI[sha256sum] = "ae9877f15757a661d4dfe6a09755a2faa959ab60752f14ca26b7ff10765e1f12" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch new file mode 100644 index 000000000..e0e64e2c7 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch @@ -0,0 +1,32 @@ +From 1db36347d05d88835519368442e9aa89c64091ad Mon Sep 17 00:00:00 2001 +From: Seungha Yang <seungha@centricular.com> +Date: Tue, 15 Sep 2020 00:54:58 +0900 +Subject: [PATCH] tests: seek: Don't use too strict timeout for validation + +Expected segment-done message might not be seen within expected +time if system is not powerful enough. + +Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625> + +Upstream-Status: Backport [https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c] +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + tests/check/pipelines/seek.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/check/pipelines/seek.c b/tests/check/pipelines/seek.c +index 28bb8846d..5f7447bc5 100644 +--- a/tests/check/pipelines/seek.c ++++ b/tests/check/pipelines/seek.c +@@ -521,7 +521,7 @@ GST_START_TEST (test_loopback_2) + + GST_INFO ("wait for segment done message"); + +- msg = gst_bus_timed_pop_filtered (bus, (GstClockTime) 2 * GST_SECOND, ++ msg = gst_bus_timed_pop_filtered (bus, GST_CLOCK_TIME_NONE, + GST_MESSAGE_SEGMENT_DONE | GST_MESSAGE_ERROR); + fail_unless (msg, "no message within the timed window"); + fail_unless_equals_string (GST_MESSAGE_TYPE_NAME (msg), "segment-done"); +-- +2.29.2 + diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.3.bb index cce0f9922..9cb07726e 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.3.bb @@ -19,8 +19,9 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x 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-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \ " -SRC_URI[sha256sum] = "66cdeb4f970c2e55932a2f427177d438fe2c55c0b6d29e80fda80263f2ae5446" +SRC_URI[sha256sum] = "0c2e09e18f2df69a99b5cb3bd53c597b3cc2e35cf6c98043bb86a66f3d312100" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \ diff --git a/poky/meta/recipes-multimedia/lame/lame_3.100.bb b/poky/meta/recipes-multimedia/lame/lame_3.100.bb index 7f8996fb5..d007e0a49 100644 --- a/poky/meta/recipes-multimedia/lame/lame_3.100.bb +++ b/poky/meta/recipes-multimedia/lame/lame_3.100.bb @@ -1,5 +1,6 @@ SUMMARY = "High quality MP3 audio encoder" -HOMEPAGE = "http://lame.sourceforge.net/" +DESCRIPTION = "LAME is an educational tool to be used for learning about MP3 encoding." +HOMEPAGE = "https://lame.sourceforge.io/" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=290&atid=100290" SECTION = "console/utils" LICENSE = "LGPLv2+" diff --git a/poky/meta/recipes-multimedia/liba52/liba52_0.7.4.bb b/poky/meta/recipes-multimedia/liba52/liba52_0.7.4.bb index 8ff8889b6..0ef5d947c 100644 --- a/poky/meta/recipes-multimedia/liba52/liba52_0.7.4.bb +++ b/poky/meta/recipes-multimedia/liba52/liba52_0.7.4.bb @@ -1,4 +1,7 @@ SUMMARY = "ATSC A/52 surround sound stream decoder" +DESCRIPTION = "Library for decoding ATSC A/52 streams. The A/52 standard \ +is used in a variety of applications, including digital television \ +and DVD. It is also known as AC-3." HOMEPAGE = "http://liba52.sourceforge.net/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ diff --git a/poky/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch b/poky/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch new file mode 100644 index 000000000..0d1d0dc38 --- /dev/null +++ b/poky/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch @@ -0,0 +1,21 @@ +configure contains CFLAGS filtering code which was removing our prefix-map +flags. We need those to generate reproducible binaries. Allow them through. + +Upstream-Status: Pending +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: libid3tag-0.15.1b/configure.ac +=================================================================== +--- libid3tag-0.15.1b.orig/configure.ac ++++ libid3tag-0.15.1b/configure.ac +@@ -99,6 +99,10 @@ do + -mno-cygwin) + shift + ;; ++ -fmacro-prefix-map*|-fdebug-prefix-map*) ++ CFLAGS="$CFLAGS $1" ++ shift ++ ;; + -m*) + arch="$arch $1" + shift diff --git a/poky/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/poky/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb index 0312a610c..80581765a 100644 --- a/poky/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb +++ b/poky/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb @@ -15,6 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz \ file://0001-Fix-gperf-3.1-incompatibility.patch \ file://10_utf16.patch \ file://unknown-encoding.patch \ + file://cflags_filter.patch \ " UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mad/files/libid3tag/" UPSTREAM_CHECK_REGEX = "/projects/mad/files/libid3tag/(?P<pver>.*)/$" diff --git a/poky/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/poky/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb index 2061c280e..82cdaf54c 100644 --- a/poky/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb +++ b/poky/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Bellagio is an opensource implementation of the Khronos OpenMAX \ HOMEPAGE = "http://omxil.sourceforge.net/" LICENSE = "LGPLv2.1+" -LICENSE_FLAGS = "commercial" +LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'amr', 'commercial', '', d)}" LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \ file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90" @@ -28,6 +28,10 @@ PROVIDES += "virtual/libomxil" CFLAGS += "-fcommon" +PACKAGECONFIG ??= "" + +PACKAGECONFIG[amr] = "--enable-amr,," + # # The .so files under ${libdir}/bellagio are not intended to be versioned and symlinked. # Make sure they get packaged in the main package. diff --git a/poky/meta/recipes-multimedia/libpng/libpng_1.6.37.bb b/poky/meta/recipes-multimedia/libpng/libpng_1.6.37.bb index edb2ac614..0b0af756f 100644 --- a/poky/meta/recipes-multimedia/libpng/libpng_1.6.37.bb +++ b/poky/meta/recipes-multimedia/libpng/libpng_1.6.37.bb @@ -1,4 +1,7 @@ SUMMARY = "PNG image format decoding library" +DESCRIPTION = "An open source project to develop and maintain the reference \ +library for use in applications that read, create, and manipulate PNG \ +(Portable Network Graphics) raster image files. " HOMEPAGE = "http://www.libpng.org/" SECTION = "libs" LICENSE = "Libpng" diff --git a/poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb b/poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb index ae0818944..6dfc42b43 100644 --- a/poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb +++ b/poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb @@ -1,4 +1,5 @@ SUMMARY = "Audio Sample Rate Conversion library" +DESCRIPTION = "Also known as Secret Rabbit Code - a library for performing sample rate conversion of audio data." HOMEPAGE = "http://www.mega-nerd.com/SRC/" SECTION = "libs" LICENSE = "BSD-2-Clause" diff --git a/poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb b/poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb index b10010876..044881a85 100644 --- a/poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +++ b/poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb @@ -1,4 +1,7 @@ SUMMARY = "Audio format Conversion library" +DESCRIPTION = "Library for reading and writing files containing sampled \ +sound (such as MS Windows WAV and the Apple/SGI AIFF format) through \ +one standard library interface." HOMEPAGE = "http://www.mega-nerd.com/libsndfile" AUTHOR = "Erik de Castro Lopo" DEPENDS = "flac libogg libvorbis" diff --git a/poky/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb b/poky/meta/recipes-multimedia/libtiff/tiff_4.2.0.bb index 9b907fbc2..ea8580a25 100644 --- a/poky/meta/recipes-multimedia/libtiff/tiff_4.1.0.bb +++ b/poky/meta/recipes-multimedia/libtiff/tiff_4.2.0.bb @@ -1,4 +1,8 @@ SUMMARY = "Provides support for the Tag Image File Format (TIFF)" +DESCRIPTION = "Library provides support for the Tag Image File Format \ +(TIFF), a widely used format for storing image data. This library \ +provide means to easily access and create TIFF image files." +HOMEPAGE = "http://www.libtiff.org/" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=34da3db46fab7501992f9615d7e158cf" @@ -6,8 +10,7 @@ CVE_PRODUCT = "libtiff" SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ " -SRC_URI[md5sum] = "2165e7aba557463acc0664e71a3ed424" -SRC_URI[sha256sum] = "5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634" +SRC_URI[sha256sum] = "eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb" # exclude betas UPSTREAM_CHECK_REGEX = "tiff-(?P<pver>\d+(\.\d+)+).tar" diff --git a/poky/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb b/poky/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb index 00ca3675c..d60360258 100644 --- a/poky/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb +++ b/poky/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb @@ -1,5 +1,9 @@ SUMMARY = "Library and test program for decoding MPEG-2 and MPEG-1 video streams" -HOMEPAGE = "http://libmpeg2.sourceforge.net/" +DESCRIPTION = "mpeg2dec is a test program for libmpeg2. It decodes \ +mpeg-1 and mpeg-2 video streams, and also includes a demultiplexer \ +for mpeg-1 and mpeg-2 program streams. The main purpose of mpeg2dec \ +is to have a simple test bed for libmpeg2." +HOMEPAGE = "https://libmpeg2.sourceforge.io/" SECTION = "libs" LICENSE = "GPLv2+" LICENSE_FLAGS = "commercial" diff --git a/poky/meta/recipes-multimedia/mpg123/mpg123_1.26.3.bb b/poky/meta/recipes-multimedia/mpg123/mpg123_1.26.4.bb index 0746d8d47..35cad6ffc 100644 --- a/poky/meta/recipes-multimedia/mpg123/mpg123_1.26.3.bb +++ b/poky/meta/recipes-multimedia/mpg123/mpg123_1.26.4.bb @@ -7,10 +7,10 @@ BUGTRACKER = "http://sourceforge.net/p/mpg123/bugs/" SECTION = "multimedia" LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3" +LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169" SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" -SRC_URI[sha256sum] = "30c998785a898f2846deefc4d17d6e4683a5a550b7eacf6ea506e30a7a736c6e" +SRC_URI[sha256sum] = "081991540df7a666b29049ad870f293cfa28863b36488ab4d58ceaa7b5846454" UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar" @@ -40,6 +40,7 @@ EXTRA_OECONF = " \ --with-audio='${AUDIOMODS}' \ ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \ ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \ + ${@bb.utils.contains('TARGET_FPU', 'soft', '--with-cpu=generic_nofpu', '', d)} \ " # Fails to build with thumb-1 (qemuarm) #| {standard input}: Assembler messages: diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index e40b8c1c4..005cb36b8 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -1,4 +1,6 @@ SUMMARY = "Sound server for Linux and Unix-like operating systems" +DESCRIPTION = "A general purpose sound server intended to run as a middleware \ +between your applications and your hardware devices, either using ALSA or OSS." HOMEPAGE = "http://www.pulseaudio.org" AUTHOR = "Lennart Poettering" SECTION = "libs/multimedia" diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch index 43add75db..48f049217 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch @@ -13,18 +13,18 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/daemon/main.c b/src/daemon/main.c -index c80fa94..75496be 100644 +index 30ef499..5c3abf0 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c -@@ -908,7 +908,7 @@ int main(int argc, char *argv[]) { +@@ -916,7 +916,7 @@ int main(int argc, char *argv[]) { + pa_set_env_and_record("PULSE_SYSTEM", conf->system_instance ? "1" : "0"); pa_log_info("This is PulseAudio %s", PACKAGE_VERSION); - pa_log_debug("Compilation host: %s", CANONICAL_HOST); - pa_log_debug("Compilation CFLAGS: %s", PA_CFLAGS); + pa_log_debug("Compilation CFLAGS: ***"); #ifdef HAVE_LIBSAMPLERATE pa_log_warn("Compiled with DEPRECATED libsamplerate support!"); -- -2.7.4 +2.25.1 diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.0.bb b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb index fccca1ba4..03b99306b 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.0.bb +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb @@ -7,6 +7,6 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ file://0001-meson-Check-for-__get_cpuid.patch \ file://volatiles.04_pulse \ " -SRC_URI[md5sum] = "84a7776e63dd55c40db8fbd7c7e2e18e" -SRC_URI[sha256sum] = "a834775d9382b055504e5ee7625dc50768daac29329531deb6597bf05e06c261" +SRC_URI[md5sum] = "1efc916251910f1e9d4df7810e3e69f8" +SRC_URI[sha256sum] = "75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1" UPSTREAM_CHECK_REGEX = "pulseaudio-(?P<pver>\d+(\.(?!99)\d+)+)\.tar" diff --git a/poky/meta/recipes-multimedia/webp/libwebp_1.1.0.bb b/poky/meta/recipes-multimedia/webp/libwebp_1.2.0.bb index 68e5ae2b3..33bec2fe7 100644 --- a/poky/meta/recipes-multimedia/webp/libwebp_1.1.0.bb +++ b/poky/meta/recipes-multimedia/webp/libwebp_1.2.0.bb @@ -14,8 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \ file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7" SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz" -SRC_URI[md5sum] = "7e047f2cbaf584dff7a8a7e0f8572f18" -SRC_URI[sha256sum] = "98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f50ef043" +SRC_URI[sha256sum] = "2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c" UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html" diff --git a/poky/meta/recipes-multimedia/x264/x264_git.bb b/poky/meta/recipes-multimedia/x264/x264_git.bb index 25ab72c66..f95fb0c41 100644 --- a/poky/meta/recipes-multimedia/x264/x264_git.bb +++ b/poky/meta/recipes-multimedia/x264/x264_git.bb @@ -14,9 +14,9 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "d198931a63049db1f2c92d96c34904c69fde8117" +SRCREV = "544c61f082194728d0391fb280a6e138ba320a96" -PV = "r3011+git${SRCPV}" +PV = "r3039+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch index 8fd94b176..b177ff7c5 100644 --- a/poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch +++ b/poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch @@ -1,4 +1,4 @@ -From f89d6d6d23e0dacfd0008f686a457d536edc406a Mon Sep 17 00:00:00 2001 +From b608a817df2b652cd5fa1b5a7cf14b7d2d8afd5f Mon Sep 17 00:00:00 2001 From: Randy Witt <randy.e.witt@intel.com> Date: Fri, 16 Oct 2020 16:54:30 -0700 Subject: [PATCH] Makefile: Allow for CC and AR to be overridden @@ -9,17 +9,16 @@ commit 7763cf316d7896fa05b816a46998f0827ab6e6eb. Signed-off-by: Randy Witt <randy.e.witt@intel.com> Upstream-Status: Inappropriate [other] - --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index c3ebbd7..2176835 100644 +index 636f191..9f57d2c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ - VERSION = 1.9 + VERSION = 1.10 -CC = $(CROSS_COMPILE)gcc -AR = $(CROSS_COMPILE)ar +CC ?= $(CROSS_COMPILE)gcc @@ -27,3 +26,6 @@ index c3ebbd7..2176835 100644 OBJDIR = bld +-- +2.29.2 + diff --git a/poky/meta/recipes-rt/rt-tests/files/0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch b/poky/meta/recipes-rt/rt-tests/files/0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch deleted file mode 100644 index 1ee7539f7..000000000 --- a/poky/meta/recipes-rt/rt-tests/files/0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 165b597e3003c6870f5980e8902014d9344e6cf3 Mon Sep 17 00:00:00 2001 -From: Peter Xu <peterx@redhat.com> -Date: Thu, 1 Oct 2020 14:47:26 -0400 -Subject: [PATCH] rt-tests: oslat: Allow build for not supported archs - -Now rt-tests won't build for archs other than x86/i386/ppc64 after oslat is -merged. Instead of failing the build, let's make it pass. However, whenever -oslat is executed, instead of running the real program, dump an error message, -so that people can try to implement the frc() function for it when there's a -real need for the new arch. - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/commit/?id=165b597e3003c6870f5980e8902014d9344e6cf3] - -Signed-off-by: Peter Xu <peterx@redhat.com> -Signed-off-by: John Kacur <jkacur@redhat.com> -Signed-off-by: Peter Bergin <peter@berginkonsult.se> - ---- - src/oslat/oslat.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c -index f1a82f2..a8b6155 100644 ---- a/src/oslat/oslat.c -+++ b/src/oslat/oslat.c -@@ -69,7 +69,9 @@ static inline void frc(uint64_t *pval) - __asm__ __volatile__("mfspr %0, 268\n" : "=r" (*pval)); - } - # else --# error Need frc() for this platform. -+# define relax() do { } while (0) -+# define frc(x) -+# define FRC_MISSING - # endif - #else - # error Need to add support for this compiler. -@@ -810,6 +812,12 @@ int main(int argc, char *argv[]) - int i, n_cores; - cpu_set_t cpu_set; - -+#ifdef FRC_MISSING -+ printf("This architecture is not yet supported. " -+ "Please implement frc() function first for %s.\n", argv[0]); -+ return 0; -+#endif -+ - CPU_ZERO(&cpu_set); - - g.app_name = argv[0]; --- -2.25.1 - diff --git a/poky/meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb b/poky/meta/recipes-rt/rt-tests/hwlatdetect_1.10.bb index 5f61c4ecd..5f61c4ecd 100644 --- a/poky/meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb +++ b/poky/meta/recipes-rt/rt-tests/hwlatdetect_1.10.bb diff --git a/poky/meta/recipes-rt/rt-tests/rt-tests.inc b/poky/meta/recipes-rt/rt-tests/rt-tests.inc index 2dd890cf9..9358f13d0 100644 --- a/poky/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/poky/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,5 +1,5 @@ # Version 1.8 -SRCREV = "21c1df7d2ee199ac619cbb1806a38d15e7e95c09" +SRCREV = "32819581cc0509c9d58c33c3061f57abe0c40c88" PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=unstable/devel/latest" diff --git a/poky/meta/recipes-rt/rt-tests/rt-tests_1.9.bb b/poky/meta/recipes-rt/rt-tests/rt-tests_1.10.bb index b916a7fe6..2834cabcd 100644 --- a/poky/meta/recipes-rt/rt-tests/rt-tests_1.9.bb +++ b/poky/meta/recipes-rt/rt-tests/rt-tests_1.10.bb @@ -12,7 +12,6 @@ SRC_URI += " \ file://run-ptest \ file://rt_bmark.py \ file://0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch \ - file://0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch \ " # rt-tests needs PI mutex support in libc diff --git a/poky/meta/recipes-sato/images/core-image-sato-dev.bb b/poky/meta/recipes-sato/images/core-image-sato-dev.bb index 7fa69d099..f45a83273 100644 --- a/poky/meta/recipes-sato/images/core-image-sato-dev.bb +++ b/poky/meta/recipes-sato/images/core-image-sato-dev.bb @@ -3,5 +3,6 @@ require core-image-sato.bb DESCRIPTION = "Image with Sato for development work. It includes everything \ within core-image-sato plus a native toolchain, application development and \ testing libraries, profiling and debug symbols." +HOMEPAGE = "https://www.yoctoproject.org/" IMAGE_FEATURES += "dev-pkgs" diff --git a/poky/meta/recipes-sato/images/core-image-sato-ptest-fast.bb b/poky/meta/recipes-sato/images/core-image-sato-ptest-fast.bb index 364121730..d37ad00cf 100644 --- a/poky/meta/recipes-sato/images/core-image-sato-ptest-fast.bb +++ b/poky/meta/recipes-sato/images/core-image-sato-ptest-fast.bb @@ -1,9 +1,13 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + require core-image-sato-sdk.bb require conf/distro/include/ptest-packagelists.inc IMAGE_INSTALL += "${PTESTS_FAST}" DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA." +HOMEPAGE = "https://www.yoctoproject.org/" # This image is sufficiently large (~1.8GB) that it can't actually fit in a live # image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the diff --git a/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index bf749acd7..eea89a5d6 100644 --- a/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -1,7 +1,11 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + require core-image-sato-sdk.bb require conf/distro/include/ptest-packagelists.inc DESCRIPTION += "Also includes ptest packages." +HOMEPAGE = "https://www.yoctoproject.org/" PROVIDES += "core-image-sato-ptest" diff --git a/poky/meta/recipes-sato/images/core-image-sato-sdk.bb b/poky/meta/recipes-sato/images/core-image-sato-sdk.bb index d7cc52b52..b52de0def 100644 --- a/poky/meta/recipes-sato/images/core-image-sato-sdk.bb +++ b/poky/meta/recipes-sato/images/core-image-sato-sdk.bb @@ -3,6 +3,7 @@ require core-image-sato.bb DESCRIPTION = "Image with Sato support that includes everything within \ core-image-sato plus meta-toolchain, development headers and libraries to \ form a standalone SDK." +HOMEPAGE = "https://www.yoctoproject.org/" IMAGE_FEATURES += "dev-pkgs tools-sdk \ tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" diff --git a/poky/meta/recipes-sato/images/core-image-sato.bb b/poky/meta/recipes-sato/images/core-image-sato.bb index 673106eb6..e50b24a47 100644 --- a/poky/meta/recipes-sato/images/core-image-sato.bb +++ b/poky/meta/recipes-sato/images/core-image-sato.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Image with Sato, a mobile environment and visual style for \ mobile devices. The image supports X11 with a Sato theme, Pimlico \ applications, and contains terminal, editor, and file manager." +HOMEPAGE = "https://www.yoctoproject.org/" IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear hwcodecs" diff --git a/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb b/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb index 6fdcc3e39..85c2c500e 100644 --- a/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb +++ b/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb @@ -1,4 +1,8 @@ SUMMARY = "Simple GTK+ Text Editor" +DESCRIPTION = "L3afpad is a simple GTK+ text editor that emphasizes simplicity. As development \ +focuses on keeping weight down to a minimum, only the most essential features \ +are implemented in the editor. L3afpad is simple to use, is easily compiled, \ +requires few libraries, and starts up quickly." HOMEPAGE = "https://github.com/stevenhoneyman/l3afpad" # Note that COPYING seems to mistakenly contain LGPLv2.1. diff --git a/poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb index e7d8a284b..d775b5c65 100644 --- a/poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb +++ b/poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb @@ -1,4 +1,5 @@ SUMMARY = "Matchbox Window Manager Desktop" +DESCRIPTION = "A lightweight windows manager for embedded systems. It uses the desktop background to provide an application launcher and allows modules to be loaded for additional functionality." HOMEPAGE = "http://matchbox-project.org/" BUGTRACKER = "http://bugzilla.yoctoproject.org/" diff --git a/poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb b/poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb index dfc7fbad5..49e37bd77 100644 --- a/poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb +++ b/poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb @@ -1,4 +1,5 @@ SUMMARY = "Matchbox virtual keyboard for X11" +DESCRIPTION = "An on screen 'virtual' or 'software' keyboard." HOMEPAGE = "http://matchbox-project.org" BUGTRACKER = "http://bugzilla.yoctoproject.org/" SECTION = "x11" diff --git a/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb b/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb index 2e6f5b708..c659964a2 100644 --- a/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb +++ b/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb @@ -1,4 +1,6 @@ SUMMARY = "Simple GTK+ based panel for handheld devices" +DESCRIPTION = "A flexible always present 'window bar' for holding application \ +launchers and small 'applet' style applications" HOMEPAGE = "http://matchbox-project.org" BUGTRACKER = "http://bugzilla.yoctoproject.org/" diff --git a/poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb index ed3f1a69a..25725e078 100644 --- a/poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb @@ -3,6 +3,8 @@ # SUMMARY = "Sato desktop" +DESCRIPTION = "Packagegroups provide a convenient mechanism of bundling a collection of packages." +HOMEPAGE = "https://www.yoctoproject.org/" PR = "r33" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/poky/meta/recipes-sato/pcmanfm/pcmanfm_1.3.1.bb b/poky/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb index 7885e0aba..d3a9b8422 100644 --- a/poky/meta/recipes-sato/pcmanfm/pcmanfm_1.3.1.bb +++ b/poky/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb @@ -1,4 +1,5 @@ SUMMARY = "Fast lightweight tabbed filemanager" +DESCRIPTION = "A free file manager application and the standard file manager of LXDE." HOMEPAGE = "http://pcmanfm.sourceforge.net/" LICENSE = "GPLv2 & GPLv2+ & LGPLv2.1+" @@ -16,8 +17,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.xz \ file://emblem-symbolic-link.png \ file://no-desktop.patch" -SRC_URI[md5sum] = "d32ad2c9c7c52bff2004bbc120b53420" -SRC_URI[sha256sum] = "6804043b3ee3a703edde41c724946174b505fe958703eadbd7e0876ece836855" +SRC_URI[sha256sum] = "14cb7b247493c4cce65fbb5902611e3ad00a7a870fbc1e50adc50428c5140cf7" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/" diff --git a/poky/meta/recipes-sato/puzzles/files/0001-map-Fix-stringop-overflow-warning.patch b/poky/meta/recipes-sato/puzzles/files/0001-map-Fix-stringop-overflow-warning.patch new file mode 100644 index 000000000..a02d8732a --- /dev/null +++ b/poky/meta/recipes-sato/puzzles/files/0001-map-Fix-stringop-overflow-warning.patch @@ -0,0 +1,42 @@ +From 3d78d4cffcdc1242892b6c21c26d1c96938c48d1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 Feb 2021 10:02:43 -0800 +Subject: [PATCH] map: Fix stringop-overflow warning + +Fixes + +../git/map.c: In function 'new_game_desc': +../git/map.c:1663:23: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] + 1663 | ret[retlen++] = ','; + | ~~~~~~~~~~~~~~^~~~~ +../git/./map.c: In function 'new_game_desc': +../git/./map.c:1663:23: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] + 1663 | ret[retlen++] = ','; + | ~~~~~~~~~~~~~~^~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + map.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/map.c b/map.c +index 412305c..fa0c493 100644 +--- a/map.c ++++ b/map.c +@@ -1659,8 +1659,10 @@ static char *new_game_desc(const game_params *params, random_state *rs, + } + } + +- ret[retlen++] = 'a'-1 + run; +- ret[retlen++] = ','; ++ if(ret != NULL) { ++ ret[retlen++] = 'a'-1 + run; ++ ret[retlen++] = ','; ++ } + + run = 0; + for (i = 0; i < n; i++) { +-- +2.30.1 + diff --git a/poky/meta/recipes-sato/puzzles/puzzles_git.bb b/poky/meta/recipes-sato/puzzles/puzzles_git.bb index 5b65cf865..16a08585c 100644 --- a/poky/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -1,4 +1,5 @@ SUMMARY = "Simon Tatham's Portable Puzzle Collection" +DESCRIPTION = "Collection of small computer programs which implement one-player puzzle games." HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=6099f4981f9461d7f411091e69a7f07a" @@ -15,6 +16,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ file://0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch \ file://fix-ki-uninitialized.patch \ file://0001-malloc-Check-for-excessive-values-to-malloc.patch \ + file://0001-map-Fix-stringop-overflow-warning.patch \ " UPSTREAM_CHECK_COMMITS = "1" diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index 185523297..ff2c8f009 100644 --- a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -5,6 +5,7 @@ terminal emulator rxvt, modified to store text in Unicode \ (either UCS-2 or UCS-4) and to use locale-correct input and \ output. It also supports mixing multiple fonts at the \ same time, including Xft fonts." +HOMEPAGE = "https://rxvt.org/" DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu" SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-libev-remove-deprecated-throw-specification.patch b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-libev-remove-deprecated-throw-specification.patch new file mode 100644 index 000000000..f10dca09d --- /dev/null +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-libev-remove-deprecated-throw-specification.patch @@ -0,0 +1,30 @@ +From 9a8f1d73e7b7e183768a8379ef32429a84f0e5c2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 Feb 2021 18:11:56 -0800 +Subject: [PATCH] libev: remove deprecated throw specification + +removes the throw specifications that are deprecated since C++11: +warning: dynamic exception specifications are deprecated in C++11 [-Wdeprecated] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libev/ev++.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libev/ev++.h b/libev/ev++.h +index 4f0a36a..85ddf44 100644 +--- a/libev/ev++.h ++++ b/libev/ev++.h +@@ -376,7 +376,7 @@ namespace ev { + + struct default_loop : loop_ref + { +- default_loop (unsigned int flags = AUTO) throw (bad_loop) ++ default_loop (unsigned int flags = AUTO) + #if EV_MULTIPLICITY + : loop_ref (ev_default_loop (flags)) + #endif +-- +2.30.1 + diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb index bfa8a614d..283e8d775 100644 --- a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb @@ -4,5 +4,7 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://src/main.C;beginline=1;endline=31;md5=d3600d7ee1062667fcd1193fbe6485f6" -SRC_URI[md5sum] = "93782dec27494eb079467dacf6e48185" +SRC_URI += "file://0001-libev-remove-deprecated-throw-specification.patch" + SRC_URI[sha256sum] = "e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd" + diff --git a/poky/meta/recipes-sato/webkit/libwpe_1.8.0.bb b/poky/meta/recipes-sato/webkit/libwpe_1.8.0.bb index a81e6960b..164831be3 100644 --- a/poky/meta/recipes-sato/webkit/libwpe_1.8.0.bb +++ b/poky/meta/recipes-sato/webkit/libwpe_1.8.0.bb @@ -15,3 +15,7 @@ REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "a6f00a7d091cbd4db57fe7ee3b4c12c6350921d654ed79812800a26c888481d2" + +# This is a tweak of upstream-version-is-even needed because +# ipstream directory contains tarballs for other components as well. +UPSTREAM_CHECK_REGEX = "libwpe-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch index aa9a06701..0c31c5fa2 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch @@ -1,4 +1,4 @@ -From 0afc194c6446e6c3242f1d706b4564e3a9cb2cee Mon Sep 17 00:00:00 2001 +From 4718888071e29deb8b245b88c81577fd5bac4e5e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 29 Aug 2016 16:38:11 +0300 Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir @@ -11,12 +11,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index a074a80..8c6ebb5 100644 +index a069c5f6..ea2f542b 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -728,8 +728,9 @@ if (ENABLE_INTROSPECTION) - string(REGEX MATCHALL "-L[^ ]*" - INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") +@@ -650,8 +650,9 @@ if (ENABLE_INTROSPECTION) + set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}") + endif () - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir @@ -26,7 +26,7 @@ index a074a80..8c6ebb5 100644 DEPENDS WebKit DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= -@@ -773,7 +774,7 @@ if (ENABLE_INTROSPECTION) +@@ -699,7 +700,7 @@ if (ENABLE_INTROSPECTION) add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir @@ -35,7 +35,7 @@ index a074a80..8c6ebb5 100644 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" -@@ -828,7 +829,7 @@ if (ENABLE_INTROSPECTION) +@@ -761,7 +762,7 @@ if (ENABLE_INTROSPECTION) add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb index a16a676d7..2928b8e55 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb @@ -19,7 +19,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://include_array.patch \ file://include_xutil.patch \ " -SRC_URI[sha256sum] = "d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24" +SRC_URI[sha256sum] = "7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc diff --git a/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.8.0.bb b/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.8.0.bb index 69d6098d3..344aa9717 100644 --- a/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.8.0.bb +++ b/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.8.0.bb @@ -15,3 +15,6 @@ REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "9652a99c75fe1c6eab0585b6395f4e104b2427e4d1f42969f1f77df29920d253" +# This is a tweak of upstream-version-is-even needed because +# ipstream directory contains tarballs for other components as well. +UPSTREAM_CHECK_REGEX = "wpebackend-fdo-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar" 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 f7d827a1d..4e183ca37 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 @@ -35,6 +35,7 @@ OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" do_configure_append() { if [ "${CLASSOVERRIDE}" = "class-target" ]; then cp ${STAGING_DATADIR}/apr/apr_rules.mk ${B}/build/rules.mk + sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${B}/build/rules.mk fi } do_configure_prepend_class-native() { @@ -49,6 +50,7 @@ do_configure_append_class-native() { do_configure_prepend_class-nativesdk() { cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk + sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${S}/build/rules.mk } do_configure_append_class-nativesdk() { diff --git a/poky/meta/recipes-support/apr/apr/autoconf270.patch b/poky/meta/recipes-support/apr/apr/autoconf270.patch new file mode 100644 index 000000000..9f7b5c624 --- /dev/null +++ b/poky/meta/recipes-support/apr/apr/autoconf270.patch @@ -0,0 +1,22 @@ +With autoconf 2.70 confdefs.h is already included. Including it twice generates +compiler warnings and since this macros is to error on warnings, it breaks. + +Fix by not including the file. + +Upstream-Status: Pending +RP - 2021/1/28 + +Index: apr-1.7.0/build/apr_common.m4 +=================================================================== +--- apr-1.7.0.orig/build/apr_common.m4 ++++ apr-1.7.0/build/apr_common.m4 +@@ -505,8 +505,7 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], + fi + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( +- [#include "confdefs.h" +- ] ++ [] + [[$1]] + [int main(int argc, const char *const *argv) {] + [[$2]] 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 c9b9bf0f5..82317396c 100644 --- a/poky/meta/recipes-support/apr/apr_1.7.0.bb +++ b/poky/meta/recipes-support/apr/apr_1.7.0.bb @@ -1,8 +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." + +DESCRIPTION = "Create and maintain software libraries that provide a predictable \ +and consistent interface to underlying platform-specific implementations." + HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" DEPENDS = "util-linux" @@ -23,6 +23,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ file://libtoolize_check.patch \ file://0001-Add-option-to-disable-timed-dependant-tests.patch \ + file://autoconf270.patch \ " SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7" diff --git a/poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb b/poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb index 21bbcab3d..d1db562bb 100644 --- a/poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb +++ b/poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb @@ -2,6 +2,7 @@ # Released under the MIT license (see COPYING.MIT for the terms) SUMMARY = "Glibc hierarchical argument parsing standalone library" +DESCRIPTION = "Standalone version of arguments parsing functions from GLIBC" HOMEPAGE = "http://www.lysator.liu.se/~nisse/misc/" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://argp.h;beginline=1;endline=20;md5=008b7e53dea6f9e1d9fdef0d9cf3184a" 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 f1d931b39..6548c54b6 100644 --- a/poky/meta/recipes-support/aspell/aspell_0.60.8.bb +++ b/poky/meta/recipes-support/aspell/aspell_0.60.8.bb @@ -1,10 +1,15 @@ 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" + +DESCRIPTION = "Spell checker designed to eventually replace Ispell. \ +It can either be used as a library or as an independent spell checker. \ +Its main feature is that it does a superior job of suggesting possible \ +replacements for a misspelled word than just about any other spell \ +checker out there for the English language." + SECTION = "console/utils" +HOMEPAGE = "http://aspell.net/" + LICENSE = "LGPLv2 | LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" diff --git a/poky/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb b/poky/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb index fce14eecf..c7aee3462 100644 --- a/poky/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb +++ b/poky/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb @@ -1,5 +1,7 @@ SUMMARY = "AT-SPI 2 Toolkit Bridge" +DESCRIPTION = "Contains a library that bridges ATK to At-Spi2 D-Bus service. Toolkit widgets use it to provide their content to screen readers such as Orca." HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +BUGTRACKER = "http://bugzilla.gnome.org/" LICENSE = "LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 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 a0657950b..a74e4cd5c 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,7 +1,9 @@ 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." + +DESCRIPTION = "It provides a Service Provider Interface for the Assistive Technologies available on the GNOME platform and a library against which applications can be linked." + HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +BUGTRACKER = "http://bugzilla.gnome.org/" LICENSE = "LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" diff --git a/poky/meta/recipes-support/atk/atk_2.36.0.bb b/poky/meta/recipes-support/atk/atk_2.36.0.bb index c45da3088..ec289e7ac 100644 --- a/poky/meta/recipes-support/atk/atk_2.36.0.bb +++ b/poky/meta/recipes-support/atk/atk_2.36.0.bb @@ -1,4 +1,5 @@ SUMMARY = "Accessibility toolkit for GNOME" +DESCRIPTION = "Provides application programming interfaces (APIs) for implementing accessibility support in software." HOMEPAGE = "https://wiki.gnome.org/Accessibility" BUGTRACKER = "https://gitlab.gnome.org/GNOME/atk/-/issues" SECTION = "x11/libs" 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 b120c1f16..7cee45948 100644 --- a/poky/meta/recipes-support/attr/acl_2.2.53.bb +++ b/poky/meta/recipes-support/attr/acl_2.2.53.bb @@ -1,7 +1,10 @@ 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." + +HOMEPAGE = "http://savannah.nongnu.org/projects/acl/" +BUGTRACKER = "http://savannah.nongnu.org/bugs/?group=acl" + 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 97bca4698..e427ba990 100644 --- a/poky/meta/recipes-support/attr/attr.inc +++ b/poky/meta/recipes-support/attr/attr.inc @@ -1,8 +1,6 @@ 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." +DESCRIPTION = "Implement the ability for a user to attach name:value pairs to objects within the XFS filesystem." + 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 f00e0fc5b..407653590 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,6 +1,9 @@ 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." +DESCRIPTION = "Collection of command line command completions for the Bash shell, \ +collection of helper functions to assist in creating new completions, \ +and set of facilities for loading completions automatically on demand, as well \ +as installing them." + HOMEPAGE = "https://github.com/scop/bash-completion" BUGTRACKER = "https://github.com/scop/bash-completion/issues" diff --git a/poky/meta/recipes-support/boost/boost.inc b/poky/meta/recipes-support/boost/boost.inc index cbf9cad70..291a052ec 100644 --- a/poky/meta/recipes-support/boost/boost.inc +++ b/poky/meta/recipes-support/boost/boost.inc @@ -1,4 +1,8 @@ SUMMARY = "Free peer-reviewed portable C++ source libraries" +DESCRIPTION = "Provides free peer-reviewed portable C++ source libraries. The emphasis is on libraries which work well with the C++ \ +Standard Library. One goal is to establish 'existing practice' and \ +provide reference implementations so that the Boost libraries are suitable for eventual standardization. Some of the libraries have already been proposed for inclusion in the C++ Standards Committee's \ +upcoming C++ Standard Library Technical Report." SECTION = "libs" DEPENDS = "boost-build-native zlib bzip2" @@ -59,10 +63,13 @@ PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" python __anonymous () { packages = [] extras = [] + pn = d.getVar("PN") mlprefix = d.getVar("MLPREFIX") for lib in d.getVar('BOOST_LIBS').split(): extras.append("--with-%s" % lib) pkg = "boost-%s" % (lib.replace("_", "-")) + if "-native" in pn: + pkg = pkg + "-native" packages.append(mlprefix + pkg) if not d.getVar("FILES_%s" % pkg): d.setVar("FILES_%s%s" % (mlprefix, pkg), "${libdir}/libboost_%s*.so.*" % lib) diff --git a/poky/meta/recipes-support/boost/boost/arm-intrinsics.patch b/poky/meta/recipes-support/boost/boost/arm-intrinsics.patch deleted file mode 100644 index fe85c69a8..000000000 --- a/poky/meta/recipes-support/boost/boost/arm-intrinsics.patch +++ /dev/null @@ -1,55 +0,0 @@ -Upstream-Status: Backport - -8/17/2010 - rebased to 1.44 by Qing He <qing.he@intel.com> - -diff --git a/boost/smart_ptr/detail/atomic_count_sync.hpp b/boost/smart_ptr/detail/atomic_count_sync.hpp -index b6359b5..78b1cc2 100644 ---- a/boost/smart_ptr/detail/atomic_count_sync.hpp -+++ b/boost/smart_ptr/detail/atomic_count_sync.hpp -@@ -33,17 +33,46 @@ public: - - long operator++() - { -+#ifdef __ARM_ARCH_7A__ -+ int v1, tmp; -+ asm volatile ("1: \n\t" -+ "ldrex %0, %1 \n\t" -+ "add %0 ,%0, #1 \n\t" -+ "strex %2, %0, %1 \n\t" -+ "cmp %2, #0 \n\t" -+ "bne 1b \n\t" -+ : "=&r" (v1), "+Q"(value_), "=&r"(tmp) -+ ); -+#else - return __sync_add_and_fetch( &value_, 1 ); -+#endif - } - - long operator--() - { -+#ifdef __ARM_ARCH_7A__ -+ int v1, tmp; -+ asm volatile ("1: \n\t" -+ "ldrex %0, %1 \n\t" -+ "sub %0 ,%0, #1 \n\t" -+ "strex %2, %0, %1 \n\t" -+ "cmp %2, #0 \n\t" -+ "bne 1b \n\t" -+ : "=&r" (v1), "+Q"(value_), "=&r"(tmp) -+ ); -+ return value_; -+#else - return __sync_add_and_fetch( &value_, -1 ); -+#endif - } - - operator long() const - { -+#if __ARM_ARCH_7A__ -+ return value_; -+#else - return __sync_fetch_and_add( &value_, 0 ); -+#endif - } - - private: diff --git a/poky/meta/recipes-support/boost/boost_1.75.0.bb b/poky/meta/recipes-support/boost/boost_1.75.0.bb index 33137e236..23b0ffc67 100644 --- a/poky/meta/recipes-support/boost/boost_1.75.0.bb +++ b/poky/meta/recipes-support/boost/boost_1.75.0.bb @@ -1,7 +1,7 @@ require boost-${PV}.inc require boost.inc -SRC_URI += "file://arm-intrinsics.patch \ +SRC_URI += " \ 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 \ diff --git a/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch b/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch deleted file mode 100644 index aa2c85ff4..000000000 --- a/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b6d18ca77f131cdcaa10d0eaa9d303399767edf6 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 28 Aug 2019 19:18:14 +0200 -Subject: [PATCH] certdata2pem.py: use python3 - -Comments in that file imply it is already py3 compatible. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - mozilla/Makefile | 2 +- - mozilla/certdata2pem.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mozilla/Makefile b/mozilla/Makefile -index 6f46118..f98877c 100644 ---- a/mozilla/Makefile -+++ b/mozilla/Makefile -@@ -3,7 +3,7 @@ - # - - all: -- python certdata2pem.py -+ python3 certdata2pem.py - - clean: - -rm -f *.crt -diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py -index 0b02b2a..7d796f1 100644 ---- a/mozilla/certdata2pem.py -+++ b/mozilla/certdata2pem.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # vim:set et sw=4: - # - # certdata2pem.py - splits certdata.txt into multiple files diff --git a/poky/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch b/poky/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch index a113fa8b1..f343ebf16 100644 --- a/poky/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch +++ b/poky/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch @@ -1,6 +1,12 @@ -Upstream-Status: Pending +sbin/Makefile: Allow the sbin path to be configurable -Let us alter the install destination of the script via SBINDIR +Some project sharing ca-certificates from Debian allow configuration +of the installation location. Make the sbin location configurable. + +Also ensure the target directory exists + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5] --- ca-certificates-20130119.orig/sbin/Makefile +++ ca-certificates-20130119/sbin/Makefile diff --git a/poky/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch b/poky/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch index 6e2171f75..f78790923 100644 --- a/poky/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch +++ b/poky/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch @@ -1,14 +1,13 @@ -From 30378026d136efa779732e3f6664e2ecf461e458 Mon Sep 17 00:00:00 2001 -From: Patrick Ohly <patrick.ohly@intel.com> -Date: Thu, 17 Mar 2016 12:38:09 +0100 -Subject: [PATCH] update-ca-certificates: support Toybox +update-ca-certificates: Replace deprecated mktemp -t with mktemp --tmpdir -"mktemp -t" is deprecated and does not work when using Toybox. Replace -with something that works also with Toybox. +According to coreutils docs, mktemp -t is deprecated, switch to the +--tmpdir option instead. -Upstream-Status: Pending +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5] -Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> +[This was originally for compatibility with toybox but toybox now +supports -t] --- sbin/update-ca-certificates | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) @@ -24,9 +23,9 @@ index 79c41bb..ae9e3f1 100755 -TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")" -ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" -REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" -+TEMPBUNDLE="$(mktemp -p${TMPDIR:-/tmp} "${CERTBUNDLE}.tmp.XXXXXX")" -+ADDED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")" -+REMOVED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")" ++TEMPBUNDLE="$(mktemp --tmpdir "${CERTBUNDLE}.tmp.XXXXXX")" ++ADDED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")" ++REMOVED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")" # Adds a certificate to the list of trusted ones. This includes a symlink # in /etc/ssl/certs to the certificate file and its inclusion into the diff --git a/poky/meta/recipes-support/ca-certificates/ca-certificates_20200601.bb b/poky/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb index 6f39df798..888a235c1 100644 --- a/poky/meta/recipes-support/ca-certificates/ca-certificates_20200601.bb +++ b/poky/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb @@ -14,7 +14,7 @@ DEPENDS_class-nativesdk = "openssl-native" # Need rehash from openssl and run-parts from debianutils PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" -SRCREV = "b3a8980b781bc9a370e42714a605cd4191bb6c0b" +SRCREV = "181be7ebd169b4a6fb5d90c3e6dc791e90534144" SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ file://0002-update-ca-certificates-use-SYSROOT.patch \ @@ -23,7 +23,6 @@ SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ file://default-sysroot.patch \ file://sbindir.patch \ file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \ - file://0001-certdata2pem.py-use-python3.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+)" diff --git a/poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb index 89f2d77b6..22e755747 100644 --- a/poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb @@ -1,4 +1,6 @@ SUMMARY = "Framework for defining and tracking users, login sessions, and seats" +DESCRIPTION = "It provides a mechanism for software to react to changes \ +of any of these items or of any of the metadata associated with them." HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ConsoleKit" BUGTRACKER = "https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit" diff --git a/poky/meta/recipes-support/curl/curl_7.74.0.bb b/poky/meta/recipes-support/curl/curl_7.75.0.bb index 873bbe814..7666c7b60 100644 --- a/poky/meta/recipes-support/curl/curl_7.74.0.bb +++ b/poky/meta/recipes-support/curl/curl_7.75.0.bb @@ -1,15 +1,19 @@ SUMMARY = "Command line tool and library for client-side URL transfers" +DESCRIPTION = "It uses URL syntax to transfer data to and from servers. \ +curl is a widely used because of its ability to be flexible and complete \ +complex tasks. For example, you can use curl for things like user authentication, \ +HTTP post, SSL connections, proxy support, FTP uploads, and more!" 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" +LIC_FILES_CHKSUM = "file://COPYING;md5=425f6fdc767cc067518eef9bbdf4ab7b" SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ " -SRC_URI[sha256sum] = "0f4d63e6681636539dc88fa8e929f934cd3a840c46e0bf28c73be11e521b77a5" +SRC_URI[sha256sum] = "50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026" # Curl has used many names over the years... CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" diff --git a/poky/meta/recipes-support/db/db_5.3.28.bb b/poky/meta/recipes-support/db/db_5.3.28.bb index 318efcb61..9cb57e6a5 100644 --- a/poky/meta/recipes-support/db/db_5.3.28.bb +++ b/poky/meta/recipes-support/db/db_5.3.28.bb @@ -10,6 +10,7 @@ # same system at the same time if really necessary. SECTION = "libs" SUMMARY = "Berkeley Database v5" +DESCRIPTION = "Provides the foundational storage services for your application, no matter how demanding and unique your requirements may seem to be" HOMEPAGE = "https://www.oracle.com/database/technologies/related/berkeleydb.html" LICENSE = "Sleepycat" RCONFLICTS_${PN} = "db3" diff --git a/poky/meta/recipes-support/debianutils/debianutils_4.11.2.bb b/poky/meta/recipes-support/debianutils/debianutils_4.11.2.bb index 0eeb2954f..1aedd8e6f 100644 --- a/poky/meta/recipes-support/debianutils/debianutils_4.11.2.bb +++ b/poky/meta/recipes-support/debianutils/debianutils_4.11.2.bb @@ -1,4 +1,9 @@ SUMMARY = "Miscellaneous utilities specific to Debian" +DESCRIPTION = "Provides a number of small utilities which are used \ +primarily by the installation scripts of Debian packages, although \ +you may use them directly. " +HOMEPAGE = "https://packages.debian.org/sid/debianutils" +BUGTRACKER = "https://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=debianutils;dist=unstable" SECTION = "base" LICENSE = "GPLv2 & SMAIL_GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=9b912cd0cc654134c0ef3424a0705b94" diff --git a/poky/meta/recipes-support/diffoscope/diffoscope_163.bb b/poky/meta/recipes-support/diffoscope/diffoscope_163.bb deleted file mode 100644 index 2b66d628f..000000000 --- a/poky/meta/recipes-support/diffoscope/diffoscope_163.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] = "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/diffoscope/diffoscope_168.bb b/poky/meta/recipes-support/diffoscope/diffoscope_168.bb new file mode 100644 index 000000000..a7cfdf9ff --- /dev/null +++ b/poky/meta/recipes-support/diffoscope/diffoscope_168.bb @@ -0,0 +1,29 @@ +SUMMARY = "in-depth comparison of files, archives, and directories" +DESCRIPTION = "Tries to get to the bottom of what makes files or directories \ +different. It will recursively unpack archives of many kinds and transform \ +various binary formats into more human-readable form to compare them. \ +It can compare two tarballs, ISO images, or PDF just as easily." +HOMEPAGE = "https://diffoscope.org/" +BUGTRACKER = "https://salsa.debian.org/reproducible-builds/diffoscope/-/issues" +LICENSE = "GPL-3.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PYPI_PACKAGE = "diffoscope" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "c6f1dc3e75b7e2e5ceac4f857fbd2ee0ddb3f0169c2b39ea9187af34208e98de" + +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm" + +# Dependencies don't build for musl +COMPATIBLE_HOST_libc-musl = 'null' + +do_install_append_class-native() { + create_wrapper ${D}${bindir}/diffoscope \ + MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ + RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ + RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} +} + +BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-support/enchant/enchant2_2.2.14.bb b/poky/meta/recipes-support/enchant/enchant2_2.2.15.bb index a5080d9c7..ed87f11a8 100644 --- a/poky/meta/recipes-support/enchant/enchant2_2.2.14.bb +++ b/poky/meta/recipes-support/enchant/enchant2_2.2.15.bb @@ -1,6 +1,9 @@ SUMMARY = "Enchant Spell checker API Library" +DESCRIPTION = "A library (and command-line program) that wraps a number of \ +different spelling libraries and programs with a consistent interface." SECTION = "libs" HOMEPAGE = "https://abiword.github.io/enchant/" +BUGTRACKER = "https://github.com/AbiWord/enchant/issues/" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" @@ -9,7 +12,7 @@ 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" +SRC_URI[sha256sum] = "3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03" UPSTREAM_CHECK_URI = "https://github.com/AbiWord/enchant/releases" diff --git a/poky/meta/recipes-support/fribidi/fribidi_1.0.10.bb b/poky/meta/recipes-support/fribidi/fribidi_1.0.10.bb index 53d78b427..b2ef77349 100644 --- a/poky/meta/recipes-support/fribidi/fribidi_1.0.10.bb +++ b/poky/meta/recipes-support/fribidi/fribidi_1.0.10.bb @@ -1,5 +1,11 @@ SUMMARY = "Free Implementation of the Unicode Bidirectional Algorithm" +DESCRIPTION = "It provides utility functions to aid in the development \ +of interactive editors and widgets that implement BiDi functionality. \ +The BiDi algorithm is a prerequisite for supporting right-to-left scripts such \ +as Hebrew, Arabic, Syriac, and Thaana. " SECTION = "libs" +HOMEPAGE = "http://fribidi.org/" +BUGTRACKER = "https://github.com/fribidi/fribidi/issues" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" diff --git a/poky/meta/recipes-support/gdbm/gdbm_1.19.bb b/poky/meta/recipes-support/gdbm/gdbm_1.19.bb index 1f390a4aa..cd2617b13 100644 --- a/poky/meta/recipes-support/gdbm/gdbm_1.19.bb +++ b/poky/meta/recipes-support/gdbm/gdbm_1.19.bb @@ -1,4 +1,7 @@ SUMMARY = "Key/value database library with extensible hashing" +DESCRIPTION = "Library of database functions that use extensible hashing \ +and work similar to the standard UNIX dbm. These routines are provided \ +to a programmer needing to create and manipulate a hashed database." HOMEPAGE = "http://www.gnu.org/software/gdbm/" SECTION = "libs" LICENSE = "GPLv3" diff --git a/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb b/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb index 0defebeb1..e5c69c0c4 100644 --- a/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb +++ b/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb @@ -1,4 +1,8 @@ SUMMARY = "Test runner for GNOME-style installed tests" +DESCRIPTION = "Runner provides an execution harness for GNOME installed tests. \ +These tests are useful for verifying the functionality of software as \ +installed and packaged, and complement rather than replace build-time \ +('make check') tests." HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests" LICENSE = "LGPLv2+" diff --git a/poky/meta/recipes-support/gnupg/gnupg_2.2.26.bb b/poky/meta/recipes-support/gnupg/gnupg_2.2.27.bb index 1c6e68b4b..1181c8341 100644 --- a/poky/meta/recipes-support/gnupg/gnupg_2.2.26.bb +++ b/poky/meta/recipes-support/gnupg/gnupg_2.2.27.bb @@ -1,4 +1,9 @@ SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)" +DESCRIPTION = "A complete and free implementation of the OpenPGP standard \ +as defined by RFC4880 (also known as PGP). GnuPG allows you to encrypt \ +and sign your data and communications; it features a versatile key \ +management system, along with access modules for all kinds of public \ +key directories." HOMEPAGE = "http://www.gnupg.org/" LICENSE = "GPLv3 & LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \ @@ -20,7 +25,7 @@ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" SRC_URI_append_class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "517569e6c9fad22175df16be5900f94c991c41e53612db63c14493e814cfff6d" +SRC_URI[sha256sum] = "34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb b/poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb index e3ca86b93..1aa94ece3 100644 --- a/poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb +++ b/poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb @@ -1,5 +1,7 @@ SUMMARY = "GNU Transport Layer Security Library" -HOMEPAGE = "http://www.gnu.org/software/gnutls/" +DESCRIPTION = "a secure communications library implementing the SSL, \ +TLS and DTLS protocols and technologies around them." +HOMEPAGE = "https://gnutls.org/" BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" LICENSE = "GPLv3+ & LGPLv2.1+" diff --git a/poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb b/poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb index 18dae6d0c..21ef5c3de 100644 --- a/poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb +++ b/poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb @@ -1,4 +1,6 @@ SUMMARY = "Library for ASN.1 and DER manipulation" +DESCRIPTION = "A highly portable C library that encodes and decodes \ +DER/BER data following an ASN.1 schema. " HOMEPAGE = "http://www.gnu.org/software/libtasn1/" LICENSE = "GPLv3+ & LGPLv2.1+" diff --git a/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch b/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch index 0ed4eb681..0c15cc7c3 100644 --- a/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch +++ b/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch @@ -11,11 +11,11 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - src/gpgme.m4 | 58 ++++++++++------------------------------------------------ + src/gpgme.m4 | 58 +++++++++------------------------------------------- 1 file changed, 10 insertions(+), 48 deletions(-) diff --git a/src/gpgme.m4 b/src/gpgme.m4 -index 2a72f18..6c2be44 100644 +index c749a5d..8579146 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 @@ -1,5 +1,5 @@ @@ -29,7 +29,7 @@ index 2a72f18..6c2be44 100644 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # --# Last-changed: 2018-11-12 +-# Last-changed: 2020-11-20 +# Last-changed: 2014-10-02 @@ -130,5 +130,5 @@ index 2a72f18..6c2be44 100644 ifelse([$2], , :, [$2]) _AM_PATH_GPGME_CONFIG_HOST_CHECK -- -2.7.4 +2.25.1 diff --git a/poky/meta/recipes-support/gpgme/gpgme_1.15.0.bb b/poky/meta/recipes-support/gpgme/gpgme_1.15.1.bb index 9264af8c5..dc38aa8e3 100644 --- a/poky/meta/recipes-support/gpgme/gpgme_1.15.0.bb +++ b/poky/meta/recipes-support/gpgme/gpgme_1.15.1.bb @@ -22,7 +22,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://0008-do-not-auto-check-var-PYTHON.patch \ " -SRC_URI[sha256sum] = "0b472bc12c7d455906c8a539ec56da0a6480ef1c3a87aa5b74d7125df68d0e5b" +SRC_URI[sha256sum] = "eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad" DEPENDS = "libgpg-error libassuan" RDEPENDS_${PN}-cpp += "libstdc++" diff --git a/poky/meta/recipes-support/iso-codes/iso-codes_4.5.0.bb b/poky/meta/recipes-support/iso-codes/iso-codes_4.5.0.bb index 9d02f5c79..9e02a0fa1 100644 --- a/poky/meta/recipes-support/iso-codes/iso-codes_4.5.0.bb +++ b/poky/meta/recipes-support/iso-codes/iso-codes_4.5.0.bb @@ -1,4 +1,7 @@ SUMMARY = "ISO language, territory, currency, script codes and their translations" +DESCRIPTION = "Provides lists of various ISO standards (e.g. country, \ +language, language scripts, and currency names) in one place, rather \ +than repeated in many programs throughout the system." HOMEPAGE = "https://salsa.debian.org/iso-codes-team/iso-codes" BUGTRACKER = "https://salsa.debian.org/iso-codes-team/iso-codes/issues" diff --git a/poky/meta/recipes-support/itstool/itstool_2.0.6.bb b/poky/meta/recipes-support/itstool/itstool_2.0.6.bb index 5f358f463..e28e2a200 100644 --- a/poky/meta/recipes-support/itstool/itstool_2.0.6.bb +++ b/poky/meta/recipes-support/itstool/itstool_2.0.6.bb @@ -1,4 +1,8 @@ SUMMARY = "ITS Tool allows you to translate your XML documents with PO files" +DESCRIPTION = "It extracts messages from XML files and outputs PO template \ +files, then merges translations from MO files to create translated \ +XML files. It determines what to translate and how to chunk it into \ +messages using the W3C Internationalization Tag Set (ITS). " HOMEPAGE = "http://itstool.org/" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5" @@ -18,4 +22,3 @@ SRC_URI[sha256sum] = "6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa91 BBCLASSEXTEND = "native nativesdk" RDEPENDS_${PN} += "libxml2-python" -RDEPENDS_${PN}_class-native = "" diff --git a/poky/meta/recipes-support/libassuan/libassuan_2.5.4.bb b/poky/meta/recipes-support/libassuan/libassuan_2.5.4.bb index e83f57118..d44b95aa0 100644 --- a/poky/meta/recipes-support/libassuan/libassuan_2.5.4.bb +++ b/poky/meta/recipes-support/libassuan/libassuan_2.5.4.bb @@ -1,4 +1,7 @@ SUMMARY = "IPC library used by GnuPG and GPGME" +DESCRIPTION = "A small library implementing the so-called Assuan protocol. \ +This protocol is used for IPC between most newer GnuPG components. \ +Both, server and client side functions are provided. " HOMEPAGE = "http://www.gnupg.org/related_software/libassuan/" BUGTRACKER = "https://bugs.g10code.com/gnupg/index" diff --git a/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.10.bb b/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.10.bb index 7628eedb1..3089d1f7f 100644 --- a/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.10.bb +++ b/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.10.bb @@ -1,4 +1,5 @@ SUMMARY = "A library for atomic integer operations" +DESCRIPTION = "Package provides semi-portable access to hardware-provided atomic memory update operations on a number of architectures." HOMEPAGE = "https://github.com/ivmai/libatomic_ops/" SECTION = "optional" PROVIDES += "libatomics-ops" diff --git a/poky/meta/recipes-support/libbsd/libbsd_0.10.0.bb b/poky/meta/recipes-support/libbsd/libbsd_0.11.3.bb index 5b32b9af4..55ecae2ea 100644 --- a/poky/meta/recipes-support/libbsd/libbsd_0.10.0.bb +++ b/poky/meta/recipes-support/libbsd/libbsd_0.11.3.bb @@ -29,14 +29,15 @@ HOMEPAGE = "https://libbsd.freedesktop.org/wiki/" # License: public-domain-Colin-Plumb LICENSE = "BSD-3-Clause & BSD-4-Clause & ISC & PD" LICENSE_${PN} = "BSD-3-Clause & ISC & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=2120be0173469a06ed185b688e0e1ae0" +LIC_FILES_CHKSUM = "file://COPYING;md5=adf6172075bcc5837e33a8a688eb7e22" SECTION = "libs" SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "ead96d240d02faa5b921c0aa50c812b5" -SRC_URI[sha256sum] = "34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887" +SRC_URI[sha256sum] = "ff95cf8184151dacae4247832f8d4ea8800fa127dbd15033ecfe839f285b42a1" inherit autotools pkgconfig +DEPENDS += "libmd" + BBCLASSEXTEND = "native nativesdk" 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 index 43f76dc56..6cea422d1 100644 --- 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 @@ -4,14 +4,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/libcap-ng:" SUMMARY .= " - python" -inherit lib_package autotools python3native +inherit lib_package autotools python3targetconfig 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} diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng.inc b/poky/meta/recipes-support/libcap-ng/libcap-ng.inc index 8c52b5d0b..64bc62de2 100644 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -8,9 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ - file://python.patch \ + file://determinism.patch \ " SRC_URI[sha256sum] = "52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9" +EXTRA_OECONF_append_class-target = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h" +EXTRA_OECONF_append_class-nativesdk = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h" + BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng/determinism.patch b/poky/meta/recipes-support/libcap-ng/libcap-ng/determinism.patch new file mode 100644 index 000000000..fbb7380f5 --- /dev/null +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng/determinism.patch @@ -0,0 +1,59 @@ +[PATCH] bindings/python: Allow hardcoded path to capability.h to be overridden + +Currently the path to capability.h is hardcoded. When cross compiling +the host capabiity.h may be different to the target copy, leading +to different options being encoded in the python bindings than +expected. This causes a reproducibility issue amongst other potential +problems. + +Add a configure option to optionally specify the right path to the +correct header as its probably safer/more reliable than trying to +query the compiler to get the header path. + +Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org +Upstream-Status: Submitted [https://github.com/stevegrubb/libcap-ng/pull/30] + +Index: libcap-ng-0.8.2/configure.ac +=================================================================== +--- libcap-ng-0.8.2.orig/configure.ac ++++ libcap-ng-0.8.2/configure.ac +@@ -63,6 +63,13 @@ AC_CHECK_HEADERS(sys/vfs.h, [ + AC_CHECK_HEADERS(linux/magic.h, [] [AC_MSG_WARN(linux/magic.h is required in order to verify procfs.)]) + ], [AC_MSG_WARN(sys/vfs.h is required in order to verify procfs.)]) + ++ ++AC_ARG_WITH([capability_header], ++ [AS_HELP_STRING([--with-capability_header=path : path to cpapbility.h])], ++ [CAPABILITY_HEADER=$withval], ++ [CAPABILITY_HEADER=/usr/include/linux/capability.h]) ++AC_SUBST(CAPABILITY_HEADER) ++ + AC_C_CONST + AC_C_INLINE + AM_PROG_CC_C_O +Index: libcap-ng-0.8.2/bindings/python3/Makefile.am +=================================================================== +--- libcap-ng-0.8.2.orig/bindings/python3/Makefile.am ++++ libcap-ng-0.8.2/bindings/python3/Makefile.am +@@ -41,7 +41,7 @@ nodist__capng_la_SOURCES = capng_wrap.c + capng.py capng_wrap.c: ${srcdir}/../src/capng_swig.i caps.h capng.h + swig -o capng_wrap.c ${SWIG_FLAGS} ${SWIG_INCLUDES} ${srcdir}/../src/capng_swig.i + caps.h: +- cat /usr/include/linux/capability.h | grep '^#define CAP' | grep -v '[()]' > caps.h ++ cat $(CAPABILITY_HEADER) | grep '^#define CAP' | grep -v '[()]' > caps.h + capng.h: + cat ${top_srcdir}/src/cap-ng.h | grep -v '_state' > capng.h + +Index: libcap-ng-0.8.2/bindings/python/Makefile.am +=================================================================== +--- libcap-ng-0.8.2.orig/bindings/python/Makefile.am ++++ libcap-ng-0.8.2/bindings/python/Makefile.am +@@ -38,7 +38,7 @@ nodist__capng_la_SOURCES = capng_wrap.c + capng.py capng_wrap.c: ${srcdir}/../src/capng_swig.i caps.h capng.h + swig -o capng_wrap.c ${SWIG_FLAGS} ${SWIG_INCLUDES} ${srcdir}/../src/capng_swig.i + caps.h: +- cat /usr/include/linux/capability.h | grep '^#define CAP' | grep -v '[()]' > caps.h ++ cat $(CAPABILITY_HEADER) | grep '^#define CAP' | grep -v '[()]' > caps.h + capng.h: + cat ${top_srcdir}/src/cap-ng.h | grep -v '_state' > capng.h + diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch b/poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch deleted file mode 100644 index fcd6f9cd3..000000000 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch +++ /dev/null @@ -1,60 +0,0 @@ -Subject: [PATCH] configure.ac - Avoid an incorrect check for python. - Makefile.am - avoid hard coded host include paths. - -Upstream-Status: pending - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> -Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> - ---- - bindings/python/Makefile.am | 4 +++- - configure.ac | 17 ++--------------- - 2 files changed, 5 insertions(+), 16 deletions(-) - -diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am -index 999b184..c8e49db 100644 ---- a/bindings/python/Makefile.am -+++ b/bindings/python/Makefile.am -@@ -23,7 +23,9 @@ - SUBDIRS = test - CONFIG_CLEAN_FILES = *.loT *.rej *.orig - AM_CFLAGS = -fPIC -DPIC --AM_CPPFLAGS = -I. -I$(top_builddir) -I@PYINCLUDEDIR@ -+PYLIBVER ?= python$(PYTHON_VERSION) -+PYINC ?= /usr/include/$(PYLIBVER) -+AM_CPPFLAGS = -I. -I$(top_builddir) -I$(PYINC) - SWIG_FLAGS = -python - SWIG_INCLUDES = ${AM_CPPFLAGS} - pyexec_PYTHON = capng.py -diff --git a/configure.ac b/configure.ac -index 8b46f51..2d7e00c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -141,21 +141,8 @@ fi - - # Setup Python2 with the interpreter found previously. - AM_PATH_PYTHON --PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"` --if test -f ${PYINCLUDEDIR}/Python.h ; then -- python_found="yes" -- AC_SUBST(PYINCLUDEDIR) -- pybind_dir="python" -- AC_SUBST(pybind_dir) -- AC_MSG_NOTICE(Python bindings will be built) --else -- python_found="no" -- if test "x$use_python" = xyes ; then -- AC_MSG_ERROR([Python explicitly requested and python headers were not found]) -- else -- AC_MSG_WARN("Python headers not found - python bindings will not be made") -- fi --fi -+python_found="yes" -+AC_MSG_NOTICE(Python bindings will be built) - fi - AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") - --- -2.25.1 diff --git a/poky/meta/recipes-support/libcap/libcap_2.46.bb b/poky/meta/recipes-support/libcap/libcap_2.48.bb index 605a73812..a12738d63 100644 --- a/poky/meta/recipes-support/libcap/libcap_2.46.bb +++ b/poky/meta/recipes-support/libcap/libcap_2.48.bb @@ -1,6 +1,8 @@ SUMMARY = "Library for getting/setting POSIX.1e capabilities" +DESCRIPTION = "A library providing the API to access POSIX capabilities. \ +These allow giving various kinds of specific privileges to individual \ +users, without giving them full root permissions." HOMEPAGE = "http://sites.google.com/site/fullycapable/" - # no specific GPL version required LICENSE = "BSD | GPLv2" LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" @@ -12,7 +14,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ file://0002-tests-do-not-run-target-executables.patch \ file://0001-tests-do-not-statically-link-a-test.patch \ " -SRC_URI[sha256sum] = "4ed3d11413fa6c9667e49f819808fbb581cd8864b839f87d7c2a02c70f21d8b4" +SRC_URI[sha256sum] = "4de9590ee09a87c282d558737ffb5b6175ccbfd26d580add10df44d0f047f6c2" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" diff --git a/poky/meta/recipes-support/libcheck/libcheck_0.15.2.bb b/poky/meta/recipes-support/libcheck/libcheck_0.15.2.bb index 33e07db93..62823023c 100644 --- a/poky/meta/recipes-support/libcheck/libcheck_0.15.2.bb +++ b/poky/meta/recipes-support/libcheck/libcheck_0.15.2.bb @@ -1,4 +1,9 @@ SUMMARY = "Check - unit testing framework for C code" +DESCRIPTION = "It features a simple interface for defining unit tests, \ +putting little in the way of the developer. Tests are run in a separate \ +address space, so both assertion failures and code errors that cause \ +segmentation faults or other signals can be caught. Test results are \ +reportable in the following: Subunit, TAP, XML, and a generic logging format." HOMEPAGE = "https://libcheck.github.io/check/" SECTION = "devel" diff --git a/poky/meta/recipes-support/libcroco/files/CVE-2020-12825.patch b/poky/meta/recipes-support/libcroco/files/CVE-2020-12825.patch new file mode 100644 index 000000000..42f92e360 --- /dev/null +++ b/poky/meta/recipes-support/libcroco/files/CVE-2020-12825.patch @@ -0,0 +1,192 @@ +From fdf78a4877afa987ba646a8779b513f258e6d04c Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@gnome.org> +Date: Fri, 31 Jul 2020 15:21:53 -0500 +Subject: [PATCH] libcroco: Limit recursion in block and any productions + + (CVE-2020-12825) + +If we don't have any limits, we can recurse forever and overflow the +stack. + +Fixes #8 +This is per https://gitlab.gnome.org/Archive/libcroco/-/issues/8 + +https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1404 + +CVE: CVE-2020-12825 +Upstream-Status: Backport [https://gitlab.gnome.org/Archive/libcroco/-/commit/6eb257e5c731c691eb137fca94e916ca73941a5a] +Comment: No refreshing changes done. +Signed-off-by: Saloni Jain <Saloni.Jain@kpit.com> + +--- + src/cr-parser.c | 44 +++++++++++++++++++++++++++++--------------- + 1 file changed, 29 insertions(+), 15 deletions(-) + +diff --git a/src/cr-parser.c b/src/cr-parser.c +index 18c9a01..f4a62e3 100644 +--- a/src/cr-parser.c ++++ b/src/cr-parser.c +@@ -136,6 +136,8 @@ struct _CRParserPriv { + + #define CHARS_TAB_SIZE 12 + ++#define RECURSIVE_CALLERS_LIMIT 100 ++ + /** + * IS_NUM: + *@a_char: the char to test. +@@ -344,9 +346,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this); + + static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this); + +-static enum CRStatus cr_parser_parse_any_core (CRParser * a_this); ++static enum CRStatus cr_parser_parse_any_core (CRParser * a_this, ++ guint n_calls); + +-static enum CRStatus cr_parser_parse_block_core (CRParser * a_this); ++static enum CRStatus cr_parser_parse_block_core (CRParser * a_this, ++ guint n_calls); + + static enum CRStatus cr_parser_parse_value_core (CRParser * a_this); + +@@ -784,7 +788,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) + cr_parser_try_to_skip_spaces_and_comments (a_this); + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + } while (status == CR_OK); + + status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, +@@ -795,7 +799,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) + cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, + token); + token = NULL; +- status = cr_parser_parse_block_core (a_this); ++ status = cr_parser_parse_block_core (a_this, 0); + CHECK_PARSING_STATUS (status, + FALSE); + goto done; +@@ -930,11 +934,11 @@ cr_parser_parse_selector_core (CRParser * a_this) + + RECORD_INITIAL_POS (a_this, &init_pos); + +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + CHECK_PARSING_STATUS (status, FALSE); + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + + } while (status == CR_OK); + +@@ -956,10 +960,12 @@ cr_parser_parse_selector_core (CRParser * a_this) + *in chapter 4.1 of the css2 spec. + *block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*; + *@param a_this the current instance of #CRParser. ++ *@param n_calls used to limit recursion depth + *FIXME: code this function. + */ + static enum CRStatus +-cr_parser_parse_block_core (CRParser * a_this) ++cr_parser_parse_block_core (CRParser * a_this, ++ guint n_calls) + { + CRToken *token = NULL; + CRInputPos init_pos; +@@ -967,6 +973,9 @@ cr_parser_parse_block_core (CRParser * a_this) + + g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR); + ++ if (n_calls > RECURSIVE_CALLERS_LIMIT) ++ return CR_ERROR; ++ + RECORD_INITIAL_POS (a_this, &init_pos); + + status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token); +@@ -996,13 +1005,13 @@ cr_parser_parse_block_core (CRParser * a_this) + } else if (token->type == CBO_TK) { + cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token); + token = NULL; +- status = cr_parser_parse_block_core (a_this); ++ status = cr_parser_parse_block_core (a_this, n_calls + 1); + CHECK_PARSING_STATUS (status, FALSE); + goto parse_block_content; + } else { + cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token); + token = NULL; +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + CHECK_PARSING_STATUS (status, FALSE); + goto parse_block_content; + } +@@ -1109,7 +1118,7 @@ cr_parser_parse_value_core (CRParser * a_this) + status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, + token); + token = NULL; +- status = cr_parser_parse_block_core (a_this); ++ status = cr_parser_parse_block_core (a_this, 0); + CHECK_PARSING_STATUS (status, FALSE); + ref++; + goto continue_parsing; +@@ -1123,7 +1132,7 @@ cr_parser_parse_value_core (CRParser * a_this) + status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, + token); + token = NULL; +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + if (status == CR_OK) { + ref++; + goto continue_parsing; +@@ -1162,10 +1171,12 @@ cr_parser_parse_value_core (CRParser * a_this) + * | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*; + * + *@param a_this the current instance of #CRParser. ++ *@param n_calls used to limit recursion depth + *@return CR_OK upon successfull completion, an error code otherwise. + */ + static enum CRStatus +-cr_parser_parse_any_core (CRParser * a_this) ++cr_parser_parse_any_core (CRParser * a_this, ++ guint n_calls) + { + CRToken *token1 = NULL, + *token2 = NULL; +@@ -1174,6 +1185,9 @@ cr_parser_parse_any_core (CRParser * a_this) + + g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR); + ++ if (n_calls > RECURSIVE_CALLERS_LIMIT) ++ return CR_ERROR; ++ + RECORD_INITIAL_POS (a_this, &init_pos); + + status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token1); +@@ -1212,7 +1226,7 @@ cr_parser_parse_any_core (CRParser * a_this) + *We consider parameter as being an "any*" production. + */ + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + } while (status == CR_OK); + + ENSURE_PARSING_COND (status == CR_PARSING_ERROR); +@@ -1237,7 +1251,7 @@ cr_parser_parse_any_core (CRParser * a_this) + } + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + } while (status == CR_OK); + + ENSURE_PARSING_COND (status == CR_PARSING_ERROR); +@@ -1265,7 +1279,7 @@ cr_parser_parse_any_core (CRParser * a_this) + } + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + } while (status == CR_OK); + + ENSURE_PARSING_COND (status == CR_PARSING_ERROR); diff --git a/poky/meta/recipes-support/libcroco/libcroco_0.6.13.bb b/poky/meta/recipes-support/libcroco/libcroco_0.6.13.bb index 9171a9de5..66ee647ff 100644 --- a/poky/meta/recipes-support/libcroco/libcroco_0.6.13.bb +++ b/poky/meta/recipes-support/libcroco/libcroco_0.6.13.bb @@ -1,4 +1,7 @@ SUMMARY = "Cascading Style Sheet (CSS) parsing and manipulation toolkit" +DESCRIPTION = "The Libcroco project is an effort to build a generic \ +Cascading Style Sheet (CSS) parsing and manipulation toolkit that can be \ +used by GNOME applications in need of CSS support." HOMEPAGE = "http://www.gnome.org/" BUGTRACKER = "https://bugzilla.gnome.org/" @@ -18,3 +21,6 @@ inherit gnomebase gtk-doc binconfig-disabled SRC_URI[archive.md5sum] = "c80c5a8385011a0260dce6bd0da93dce" SRC_URI[archive.sha256sum] = "767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4" + +SRC_URI +="file://CVE-2020-12825.patch \ +" diff --git a/poky/meta/recipes-support/libdaemon/libdaemon_0.14.bb b/poky/meta/recipes-support/libdaemon/libdaemon_0.14.bb index 070ee1890..85a30bcac 100644 --- a/poky/meta/recipes-support/libdaemon/libdaemon_0.14.bb +++ b/poky/meta/recipes-support/libdaemon/libdaemon_0.14.bb @@ -1,4 +1,8 @@ SUMMARY = "Lightweight C library which eases the writing of UNIX daemons" +DESCRIPTION = "Lightweight daemon framework for OpenBSD. It provides \ +facilities for logging and a signal handler to enable graceful shutdown, \ +as well as file locking to ensure that only a single copy of a given daemon \ +is running at a time." SECTION = "libs" AUTHOR = "Lennart Poettering <lennart@poettering.net>" HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/" diff --git a/poky/meta/recipes-support/libevdev/libevdev/determinism.patch b/poky/meta/recipes-support/libevdev/libevdev/determinism.patch index f6b7fc82d..71cbd876e 100644 --- a/poky/meta/recipes-support/libevdev/libevdev/determinism.patch +++ b/poky/meta/recipes-support/libevdev/libevdev/determinism.patch @@ -9,7 +9,8 @@ Sort to remove this inconsistency. RP 2020/2/7 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Upstream-Status: Pending +Submitted: https://lists.freedesktop.org/archives/input-tools/2021-February/001560.html +Upstream-Status: Backport [https://gitlab.freedesktop.org/libevdev/libevdev/-/commit/8d70f449892c6f7659e07bb0f06b8347677bb7d8] --- libevdev/make-event-names.py | 6 +++--- diff --git a/poky/meta/recipes-support/libevdev/libevdev_1.10.0.bb b/poky/meta/recipes-support/libevdev/libevdev_1.10.0.bb deleted file mode 100644 index 2620cbe9f..000000000 --- a/poky/meta/recipes-support/libevdev/libevdev_1.10.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Wrapper library for evdev devices" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libevdev/" -SECTION = "libs" - -LICENSE = "MIT-X" -LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ - file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" - -SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ - file://determinism.patch" -SRC_URI[sha256sum] = "3522c26e2c148be0ad68ce26fbced408a4185dea90bfe8079dc82b8ace962d4a" - -inherit autotools pkgconfig - -UPSTREAM_CHECK_REGEX = "libevdev-(?P<pver>(\d+\.)+(?!90\d+)\d+)" diff --git a/poky/meta/recipes-support/libevdev/libevdev_1.11.0.bb b/poky/meta/recipes-support/libevdev/libevdev_1.11.0.bb new file mode 100644 index 000000000..5aca76dbd --- /dev/null +++ b/poky/meta/recipes-support/libevdev/libevdev_1.11.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "Wrapper library for evdev devices" +DESCRIPTION = "A library for handling evdev kernel devices. It abstracts \ +the evdev ioctls through type-safe interfaces and provides functions \ +to change the appearance of the device." +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libevdev/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=80c550b3197bcb8da7d7557ebcc3fc46 \ + " + +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ + file://determinism.patch" +SRC_URI[sha256sum] = "63f4ea1489858a109080e0b40bd43e4e0903a1e12ea888d581db8c495747c2d0" + +inherit autotools pkgconfig + +UPSTREAM_CHECK_REGEX = "libevdev-(?P<pver>(\d+\.)+(?!90\d+)\d+)" diff --git a/poky/meta/recipes-support/libevent/libevent_2.1.12.bb b/poky/meta/recipes-support/libevent/libevent_2.1.12.bb index 29e87081d..dd4533cce 100644 --- a/poky/meta/recipes-support/libevent/libevent_2.1.12.bb +++ b/poky/meta/recipes-support/libevent/libevent_2.1.12.bb @@ -1,4 +1,9 @@ SUMMARY = "An asynchronous event notification library" +DESCRIPTION = "A software library that provides asynchronous event \ +notification. The libevent API provides a mechanism to execute a callback \ +function when a specific event occurs on a file descriptor or after a \ +timeout has been reached. libevent also supports callbacks triggered \ +by signals and regular timeouts" HOMEPAGE = "http://libevent.org/" BUGTRACKER = "https://github.com/libevent/libevent/issues" SECTION = "libs" 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 dc30926c5..9ca96d548 100644 --- a/poky/meta/recipes-support/libexif/libexif_0.6.22.bb +++ b/poky/meta/recipes-support/libexif/libexif_0.6.22.bb @@ -1,4 +1,7 @@ SUMMARY = "Library for reading extended image information (EXIF) from JPEG files" +DESCRIPTION = "libexif is a library for parsing, editing, and saving EXIF data. It is \ +intended to replace lots of redundant implementations in command-line \ +utilities and programs with GUIs." HOMEPAGE = "https://libexif.github.io/" SECTION = "libs" LICENSE = "LGPLv2.1" diff --git a/poky/meta/recipes-support/libfm/libfm-extra_1.3.1.bb b/poky/meta/recipes-support/libfm/libfm-extra_1.3.2.bb index 85102a1a3..0adb3b641 100644 --- a/poky/meta/recipes-support/libfm/libfm-extra_1.3.1.bb +++ b/poky/meta/recipes-support/libfm/libfm-extra_1.3.2.bb @@ -1,4 +1,5 @@ SUMMARY = "Library for file management" +DESCRIPTION = "Contains a library and other files required by menu-cache-gen libexec of menu-cache-1.1.0. " HOMEPAGE = "http://pcmanfm.sourceforge.net/" LICENSE = "LGPLv2+" @@ -11,8 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ " -SRC_URI[md5sum] = "c15ecd2c9317e2c385cd3f046d0b61ba" -SRC_URI[sha256sum] = "96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4" +SRC_URI[sha256sum] = "a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5" S = "${WORKDIR}/libfm-${PV}" diff --git a/poky/meta/recipes-support/libfm/libfm_1.3.1.bb b/poky/meta/recipes-support/libfm/libfm_1.3.1.bb index 63ae7874b..b6f9df0c5 100644 --- a/poky/meta/recipes-support/libfm/libfm_1.3.1.bb +++ b/poky/meta/recipes-support/libfm/libfm_1.3.1.bb @@ -1,4 +1,6 @@ SUMMARY = "Library for file management" +DESCRIPTION = "LibFM provides file management functions built on top of Glib/GIO \ +giving a convenient higher-level API." HOMEPAGE = "http://pcmanfm.sourceforge.net/" LICENSE = "GPLv2+ & LGPLv2+" diff --git a/poky/meta/recipes-support/libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch b/poky/meta/recipes-support/libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch new file mode 100644 index 000000000..8fbed9add --- /dev/null +++ b/poky/meta/recipes-support/libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch @@ -0,0 +1,41 @@ +From b8192ff67ed46ea2cc4282fa1856ce2868223737 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 24 Feb 2021 19:43:07 +0000 +Subject: [PATCH] Makefile.am: add a missing space + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + cipher/Makefile.am | 2 +- + doc/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cipher/Makefile.am b/cipher/Makefile.am +index 1cf5072..b3ca225 100644 +--- a/cipher/Makefile.am ++++ b/cipher/Makefile.am +@@ -143,7 +143,7 @@ gost-sb.h: gost-s-box + + gost-s-box: gost-s-box.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ +- $(CPPFLAGS_FOR_BUILD)-o $@ $(srcdir)/gost-s-box.c ++ $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c + + + if ENABLE_O_FLAG_MUNGING +diff --git a/doc/Makefile.am b/doc/Makefile.am +index fd7aac2..1703bd9 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -43,7 +43,7 @@ man_MANS = $(myman_pages) + + yat2m: yat2m.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ +- $(CPPFLAGS_FOR_BUILD)-o $@ $(srcdir)/yat2m.c ++ $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/yat2m.c + + .fig.png: + fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@ +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libgcrypt/files/0001-Prefetch-GCM-look-up-tables.patch b/poky/meta/recipes-support/libgcrypt/files/0001-Prefetch-GCM-look-up-tables.patch deleted file mode 100644 index 4df96f001..000000000 --- a/poky/meta/recipes-support/libgcrypt/files/0001-Prefetch-GCM-look-up-tables.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 1374254c2904ab5b18ba4a890856824a102d4705 Mon Sep 17 00:00:00 2001 -From: Jussi Kivilinna <jussi.kivilinna@iki.fi> -Date: Sat, 27 Apr 2019 19:33:28 +0300 -Subject: [PATCH 1/3] Prefetch GCM look-up tables - -* cipher/cipher-gcm.c (prefetch_table, do_prefetch_tables) -(prefetch_tables): New. -(ghash_internal): Call prefetch_tables. --- - -Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> - -Upstream-Status: Backport -[https://github.com/gpg/libgcrypt/commit/1374254c2904ab5b18ba4a890856824a102d4705] - -CVE: CVE-2019-12904 - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - cipher/cipher-gcm.c | 33 +++++++++++++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - -diff --git a/cipher/cipher-gcm.c b/cipher/cipher-gcm.c -index c19f09f..11f119a 100644 ---- a/cipher/cipher-gcm.c -+++ b/cipher/cipher-gcm.c -@@ -118,6 +118,34 @@ static const u16 gcmR[256] = { - 0xbbf0, 0xba32, 0xb874, 0xb9b6, 0xbcf8, 0xbd3a, 0xbf7c, 0xbebe, - }; - -+static inline -+void prefetch_table(const void *tab, size_t len) -+{ -+ const volatile byte *vtab = tab; -+ size_t i; -+ -+ for (i = 0; i < len; i += 8 * 32) -+ { -+ (void)vtab[i + 0 * 32]; -+ (void)vtab[i + 1 * 32]; -+ (void)vtab[i + 2 * 32]; -+ (void)vtab[i + 3 * 32]; -+ (void)vtab[i + 4 * 32]; -+ (void)vtab[i + 5 * 32]; -+ (void)vtab[i + 6 * 32]; -+ (void)vtab[i + 7 * 32]; -+ } -+ -+ (void)vtab[len - 1]; -+} -+ -+static inline void -+do_prefetch_tables (const void *gcmM, size_t gcmM_size) -+{ -+ prefetch_table(gcmM, gcmM_size); -+ prefetch_table(gcmR, sizeof(gcmR)); -+} -+ - #ifdef GCM_TABLES_USE_U64 - static void - bshift (u64 * b0, u64 * b1) -@@ -365,6 +393,8 @@ do_ghash (unsigned char *result, const unsigned char *buf, const u32 *gcmM) - #define fillM(c) \ - do_fillM (c->u_mode.gcm.u_ghash_key.key, c->u_mode.gcm.gcm_table) - #define GHASH(c, result, buf) do_ghash (result, buf, c->u_mode.gcm.gcm_table) -+#define prefetch_tables(c) \ -+ do_prefetch_tables(c->u_mode.gcm.gcm_table, sizeof(c->u_mode.gcm.gcm_table)) - - #else - -@@ -430,6 +460,7 @@ do_ghash (unsigned char *hsub, unsigned char *result, const unsigned char *buf) - - #define fillM(c) do { } while (0) - #define GHASH(c, result, buf) do_ghash (c->u_mode.gcm.u_ghash_key.key, result, buf) -+#define prefetch_tables(c) do {} while (0) - - #endif /* !GCM_USE_TABLES */ - -@@ -441,6 +472,8 @@ ghash_internal (gcry_cipher_hd_t c, byte *result, const byte *buf, - const unsigned int blocksize = GCRY_GCM_BLOCK_LEN; - unsigned int burn = 0; - -+ prefetch_tables (c); -+ - while (nblocks) - { - burn = GHASH (c, result, buf); --- -2.7.4 - diff --git a/poky/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch b/poky/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch index cd8a5993b..c873e24ed 100644 --- a/poky/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch +++ b/poky/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch @@ -1,4 +1,4 @@ -From bee26d7c4ea0b4a397c289b819b89e78bc325ba0 Mon Sep 17 00:00:00 2001 +From 839f38e5ecc22b7f1b837284bbbffac8cb32ab1e Mon Sep 17 00:00:00 2001 From: Trevor Gamblin <trevor.gamblin@windriver.com> Date: Tue, 29 Oct 2019 14:08:32 -0400 Subject: [PATCH] libgcrypt: fix m4 file for oe-core @@ -17,7 +17,7 @@ Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> 1 file changed, 4 insertions(+), 86 deletions(-) diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4 -index 37dfbea2..3d2e90a8 100644 +index 19d514f..21125c7 100644 --- a/src/libgcrypt.m4 +++ b/src/libgcrypt.m4 @@ -29,41 +29,6 @@ dnl is added to the gpg_config_script_warn variable. @@ -25,7 +25,7 @@ index 37dfbea2..3d2e90a8 100644 AC_DEFUN([AM_PATH_LIBGCRYPT], [ AC_REQUIRE([AC_CANONICAL_HOST]) - AC_ARG_WITH(libgcrypt-prefix, -- AC_HELP_STRING([--with-libgcrypt-prefix=PFX], +- AS_HELP_STRING([--with-libgcrypt-prefix=PFX], - [prefix where LIBGCRYPT is installed (optional)]), - libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") - if test x"${LIBGCRYPT_CONFIG}" = x ; then @@ -144,6 +144,3 @@ index 37dfbea2..3d2e90a8 100644 ifelse([$3], , :, [$3]) fi AC_SUBST(LIBGCRYPT_CFLAGS) --- -2.17.1 - diff --git a/poky/meta/recipes-support/libgcrypt/files/0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch b/poky/meta/recipes-support/libgcrypt/files/0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch deleted file mode 100644 index c82c5b5c8..000000000 --- a/poky/meta/recipes-support/libgcrypt/files/0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch +++ /dev/null @@ -1,332 +0,0 @@ -From 119348dd9aa52ab229afb5e2d3342d2b76fe81bf Mon Sep 17 00:00:00 2001 -From: Jussi Kivilinna <jussi.kivilinna@iki.fi> -Date: Fri, 31 May 2019 17:18:09 +0300 -Subject: [PATCH 2/3] AES: move look-up tables to .data section and unshare between - processes - -* cipher/rijndael-internal.h (ATTR_ALIGNED_64): New. -* cipher/rijndael-tables.h (encT): Move to 'enc_tables' structure. -(enc_tables): New structure for encryption table with counters before -and after. -(encT): New macro. -(dec_tables): Add counters before and after encryption table; Move -from .rodata to .data section. -(do_encrypt): Change 'encT' to 'enc_tables.T'. -(do_decrypt): Change '&dec_tables' to 'dec_tables.T'. -* cipher/cipher-gcm.c (prefetch_table): Make inline; Handle input -with length not multiple of 256. -(prefetch_enc, prefetch_dec): Modify pre- and post-table counters -to unshare look-up table pages between processes. --- - -GnuPG-bug-id: 4541 -Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> - -Upstream-Status: Backport -[https://github.com/gpg/libgcrypt/commit/daedbbb5541cd8ecda1459d3b843ea4d92788762] - -CVE: CVE-2019-12904 - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - cipher/rijndael-internal.h | 4 +- - cipher/rijndael-tables.h | 155 +++++++++++++++++++++++++-------------------- - cipher/rijndael.c | 35 ++++++++-- - 3 files changed, 118 insertions(+), 76 deletions(-) - -diff --git a/cipher/rijndael-internal.h b/cipher/rijndael-internal.h -index 160fb8c..a62d4b7 100644 ---- a/cipher/rijndael-internal.h -+++ b/cipher/rijndael-internal.h -@@ -29,11 +29,13 @@ - #define BLOCKSIZE (128/8) - - --/* Helper macro to force alignment to 16 bytes. */ -+/* Helper macro to force alignment to 16 or 64 bytes. */ - #ifdef HAVE_GCC_ATTRIBUTE_ALIGNED - # define ATTR_ALIGNED_16 __attribute__ ((aligned (16))) -+# define ATTR_ALIGNED_64 __attribute__ ((aligned (64))) - #else - # define ATTR_ALIGNED_16 -+# define ATTR_ALIGNED_64 - #endif - - -diff --git a/cipher/rijndael-tables.h b/cipher/rijndael-tables.h -index 8359470..b54d959 100644 ---- a/cipher/rijndael-tables.h -+++ b/cipher/rijndael-tables.h -@@ -21,80 +21,98 @@ - /* To keep the actual implementation at a readable size we use this - include file to define the tables. */ - --static const u32 encT[256] = -+static struct -+{ -+ volatile u32 counter_head; -+ u32 cacheline_align[64 / 4 - 1]; -+ u32 T[256]; -+ volatile u32 counter_tail; -+} enc_tables ATTR_ALIGNED_64 = - { -- 0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6, -- 0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591, -- 0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56, -- 0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec, -- 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa, -- 0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb, -- 0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45, -- 0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b, -- 0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c, -- 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83, -- 0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9, -- 0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a, -- 0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d, -- 0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f, -- 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df, -- 0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea, -- 0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34, -- 0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b, -- 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d, -- 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413, -- 0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1, -- 0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6, -- 0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972, -- 0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85, -- 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed, -- 0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511, -- 0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe, -- 0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b, -- 0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05, -- 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1, -- 0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142, -- 0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf, -- 0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3, -- 0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e, -- 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a, -- 0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6, -- 0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3, -- 0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b, -- 0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428, -- 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad, -- 0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14, -- 0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8, -- 0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4, -- 0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2, -- 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda, -- 0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949, -- 0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf, -- 0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810, -- 0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c, -- 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697, -- 0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e, -- 0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f, -- 0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc, -- 0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c, -- 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969, -- 0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27, -- 0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122, -- 0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433, -- 0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9, -- 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5, -- 0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a, -- 0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0, -- 0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e, -- 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c -+ 0, -+ { 0, }, -+ { -+ 0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6, -+ 0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591, -+ 0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56, -+ 0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec, -+ 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa, -+ 0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb, -+ 0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45, -+ 0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b, -+ 0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c, -+ 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83, -+ 0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9, -+ 0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a, -+ 0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d, -+ 0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f, -+ 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df, -+ 0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea, -+ 0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34, -+ 0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b, -+ 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d, -+ 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413, -+ 0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1, -+ 0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6, -+ 0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972, -+ 0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85, -+ 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed, -+ 0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511, -+ 0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe, -+ 0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b, -+ 0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05, -+ 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1, -+ 0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142, -+ 0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf, -+ 0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3, -+ 0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e, -+ 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a, -+ 0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6, -+ 0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3, -+ 0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b, -+ 0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428, -+ 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad, -+ 0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14, -+ 0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8, -+ 0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4, -+ 0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2, -+ 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda, -+ 0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949, -+ 0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf, -+ 0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810, -+ 0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c, -+ 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697, -+ 0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e, -+ 0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f, -+ 0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc, -+ 0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c, -+ 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969, -+ 0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27, -+ 0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122, -+ 0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433, -+ 0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9, -+ 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5, -+ 0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a, -+ 0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0, -+ 0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e, -+ 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c -+ }, -+ 0 - }; - --static const struct -+#define encT enc_tables.T -+ -+static struct - { -+ volatile u32 counter_head; -+ u32 cacheline_align[64 / 4 - 1]; - u32 T[256]; - byte inv_sbox[256]; --} dec_tables = -+ volatile u32 counter_tail; -+} dec_tables ATTR_ALIGNED_64 = - { -+ 0, -+ { 0, }, - { - 0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a, - 0xcb6bab3b, 0xf1459d1f, 0xab58faac, 0x9303e34b, -@@ -194,7 +212,8 @@ static const struct - 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61, - 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26, - 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -- } -+ }, -+ 0 - }; - - #define decT dec_tables.T -diff --git a/cipher/rijndael.c b/cipher/rijndael.c -index 8637195..d0edab2 100644 ---- a/cipher/rijndael.c -+++ b/cipher/rijndael.c -@@ -227,11 +227,11 @@ static const char *selftest(void); - - - /* Prefetching for encryption/decryption tables. */ --static void prefetch_table(const volatile byte *tab, size_t len) -+static inline void prefetch_table(const volatile byte *tab, size_t len) - { - size_t i; - -- for (i = 0; i < len; i += 8 * 32) -+ for (i = 0; len - i >= 8 * 32; i += 8 * 32) - { - (void)tab[i + 0 * 32]; - (void)tab[i + 1 * 32]; -@@ -242,17 +242,37 @@ static void prefetch_table(const volatile byte *tab, size_t len) - (void)tab[i + 6 * 32]; - (void)tab[i + 7 * 32]; - } -+ for (; i < len; i += 32) -+ { -+ (void)tab[i]; -+ } - - (void)tab[len - 1]; - } - - static void prefetch_enc(void) - { -- prefetch_table((const void *)encT, sizeof(encT)); -+ /* Modify counters to trigger copy-on-write and unsharing if physical pages -+ * of look-up table are shared between processes. Modifying counters also -+ * causes checksums for pages to change and hint same-page merging algorithm -+ * that these pages are frequently changing. */ -+ enc_tables.counter_head++; -+ enc_tables.counter_tail++; -+ -+ /* Prefetch look-up tables to cache. */ -+ prefetch_table((const void *)&enc_tables, sizeof(enc_tables)); - } - - static void prefetch_dec(void) - { -+ /* Modify counters to trigger copy-on-write and unsharing if physical pages -+ * of look-up table are shared between processes. Modifying counters also -+ * causes checksums for pages to change and hint same-page merging algorithm -+ * that these pages are frequently changing. */ -+ dec_tables.counter_head++; -+ dec_tables.counter_tail++; -+ -+ /* Prefetch look-up tables to cache. */ - prefetch_table((const void *)&dec_tables, sizeof(dec_tables)); - } - -@@ -737,7 +757,7 @@ do_encrypt (const RIJNDAEL_context *ctx, - #ifdef USE_AMD64_ASM - # ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS - return _gcry_aes_amd64_encrypt_block(ctx->keyschenc, bx, ax, ctx->rounds, -- encT); -+ enc_tables.T); - # else - /* Call SystemV ABI function without storing non-volatile XMM registers, - * as target function does not use vector instruction sets. */ -@@ -757,7 +777,8 @@ do_encrypt (const RIJNDAEL_context *ctx, - return ret; - # endif /* HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS */ - #elif defined(USE_ARM_ASM) -- return _gcry_aes_arm_encrypt_block(ctx->keyschenc, bx, ax, ctx->rounds, encT); -+ return _gcry_aes_arm_encrypt_block(ctx->keyschenc, bx, ax, ctx->rounds, -+ enc_tables.T); - #else - return do_encrypt_fn (ctx, bx, ax); - #endif /* !USE_ARM_ASM && !USE_AMD64_ASM*/ -@@ -1120,7 +1141,7 @@ do_decrypt (const RIJNDAEL_context *ctx, unsigned char *bx, - #ifdef USE_AMD64_ASM - # ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS - return _gcry_aes_amd64_decrypt_block(ctx->keyschdec, bx, ax, ctx->rounds, -- &dec_tables); -+ dec_tables.T); - # else - /* Call SystemV ABI function without storing non-volatile XMM registers, - * as target function does not use vector instruction sets. */ -@@ -1141,7 +1162,7 @@ do_decrypt (const RIJNDAEL_context *ctx, unsigned char *bx, - # endif /* HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS */ - #elif defined(USE_ARM_ASM) - return _gcry_aes_arm_decrypt_block(ctx->keyschdec, bx, ax, ctx->rounds, -- &dec_tables); -+ dec_tables.T); - #else - return do_decrypt_fn (ctx, bx, ax); - #endif /*!USE_ARM_ASM && !USE_AMD64_ASM*/ --- -2.7.4 - diff --git a/poky/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch b/poky/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch index d7554f38a..f9c362431 100644 --- a/poky/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch +++ b/poky/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch @@ -1,7 +1,7 @@ -From 97570ef271ea1fb7b5ca903eec88f68407b0ec76 Mon Sep 17 00:00:00 2001 +From 3c6c10eae0993c8ca60879494c6650f7b8f54ebe Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Wed, 16 Aug 2017 10:44:41 +0800 -Subject: [PATCH 2/4] libgcrypt: fix building error with '-O2' in sysroot path +Subject: [PATCH] libgcrypt: fix building error with '-O2' in sysroot path Upstream-Status: Pending @@ -19,23 +19,21 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Rebase to 1.8.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- cipher/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cipher/Makefile.am b/cipher/Makefile.am -index 95c4510..bd52ec7 100644 +index d644005..1cf5072 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am -@@ -116,7 +116,7 @@ gost-s-box: gost-s-box.c +@@ -147,7 +147,7 @@ gost-s-box: gost-s-box.c if ENABLE_O_FLAG_MUNGING --o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' -+o_flag_munging = sed -e 's/ -O\([2-9s][2-9s]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' +-o_flag_munging = sed -e 's/-O\([2-9sg][2-9sg]*\)/-O1/' -e 's/-Ofast/-O1/g' ++o_flag_munging = sed -e 's/ -O\([2-9sg][2-9sg]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' else o_flag_munging = cat endif --- -1.8.3.1 - diff --git a/poky/meta/recipes-support/libgcrypt/files/0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch b/poky/meta/recipes-support/libgcrypt/files/0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch deleted file mode 100644 index b580b7b13..000000000 --- a/poky/meta/recipes-support/libgcrypt/files/0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch +++ /dev/null @@ -1,178 +0,0 @@ -From a4c561aab1014c3630bc88faf6f5246fee16b020 Mon Sep 17 00:00:00 2001 -From: Jussi Kivilinna <jussi.kivilinna@iki.fi> -Date: Fri, 31 May 2019 17:27:25 +0300 -Subject: [PATCH 3/3] GCM: move look-up table to .data section and unshare - between processes - -* cipher/cipher-gcm.c (ATTR_ALIGNED_64): New. -(gcmR): Move to 'gcm_table' structure. -(gcm_table): New structure for look-up table with counters before and -after. -(gcmR): New macro. -(prefetch_table): Handle input with length not multiple of 256. -(do_prefetch_tables): Modify pre- and post-table counters to unshare -look-up table pages between processes. --- - -GnuPG-bug-id: 4541 -Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> - -Upstream-Status: Backport -[https://github.com/gpg/libgcrypt/commit/a4c561aab1014c3630bc88faf6f5246fee16b020] - -CVE: CVE-2019-12904 - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - cipher/cipher-gcm.c | 106 ++++++++++++++++++++++++++++++++++------------------ - 1 file changed, 70 insertions(+), 36 deletions(-) - -diff --git a/cipher/cipher-gcm.c b/cipher/cipher-gcm.c -index 11f119a..194e2ec 100644 ---- a/cipher/cipher-gcm.c -+++ b/cipher/cipher-gcm.c -@@ -30,6 +30,14 @@ - #include "./cipher-internal.h" - - -+/* Helper macro to force alignment to 16 or 64 bytes. */ -+#ifdef HAVE_GCC_ATTRIBUTE_ALIGNED -+# define ATTR_ALIGNED_64 __attribute__ ((aligned (64))) -+#else -+# define ATTR_ALIGNED_64 -+#endif -+ -+ - #ifdef GCM_USE_INTEL_PCLMUL - extern void _gcry_ghash_setup_intel_pclmul (gcry_cipher_hd_t c); - -@@ -83,40 +91,54 @@ ghash_armv7_neon (gcry_cipher_hd_t c, byte *result, const byte *buf, - - - #ifdef GCM_USE_TABLES --static const u16 gcmR[256] = { -- 0x0000, 0x01c2, 0x0384, 0x0246, 0x0708, 0x06ca, 0x048c, 0x054e, -- 0x0e10, 0x0fd2, 0x0d94, 0x0c56, 0x0918, 0x08da, 0x0a9c, 0x0b5e, -- 0x1c20, 0x1de2, 0x1fa4, 0x1e66, 0x1b28, 0x1aea, 0x18ac, 0x196e, -- 0x1230, 0x13f2, 0x11b4, 0x1076, 0x1538, 0x14fa, 0x16bc, 0x177e, -- 0x3840, 0x3982, 0x3bc4, 0x3a06, 0x3f48, 0x3e8a, 0x3ccc, 0x3d0e, -- 0x3650, 0x3792, 0x35d4, 0x3416, 0x3158, 0x309a, 0x32dc, 0x331e, -- 0x2460, 0x25a2, 0x27e4, 0x2626, 0x2368, 0x22aa, 0x20ec, 0x212e, -- 0x2a70, 0x2bb2, 0x29f4, 0x2836, 0x2d78, 0x2cba, 0x2efc, 0x2f3e, -- 0x7080, 0x7142, 0x7304, 0x72c6, 0x7788, 0x764a, 0x740c, 0x75ce, -- 0x7e90, 0x7f52, 0x7d14, 0x7cd6, 0x7998, 0x785a, 0x7a1c, 0x7bde, -- 0x6ca0, 0x6d62, 0x6f24, 0x6ee6, 0x6ba8, 0x6a6a, 0x682c, 0x69ee, -- 0x62b0, 0x6372, 0x6134, 0x60f6, 0x65b8, 0x647a, 0x663c, 0x67fe, -- 0x48c0, 0x4902, 0x4b44, 0x4a86, 0x4fc8, 0x4e0a, 0x4c4c, 0x4d8e, -- 0x46d0, 0x4712, 0x4554, 0x4496, 0x41d8, 0x401a, 0x425c, 0x439e, -- 0x54e0, 0x5522, 0x5764, 0x56a6, 0x53e8, 0x522a, 0x506c, 0x51ae, -- 0x5af0, 0x5b32, 0x5974, 0x58b6, 0x5df8, 0x5c3a, 0x5e7c, 0x5fbe, -- 0xe100, 0xe0c2, 0xe284, 0xe346, 0xe608, 0xe7ca, 0xe58c, 0xe44e, -- 0xef10, 0xeed2, 0xec94, 0xed56, 0xe818, 0xe9da, 0xeb9c, 0xea5e, -- 0xfd20, 0xfce2, 0xfea4, 0xff66, 0xfa28, 0xfbea, 0xf9ac, 0xf86e, -- 0xf330, 0xf2f2, 0xf0b4, 0xf176, 0xf438, 0xf5fa, 0xf7bc, 0xf67e, -- 0xd940, 0xd882, 0xdac4, 0xdb06, 0xde48, 0xdf8a, 0xddcc, 0xdc0e, -- 0xd750, 0xd692, 0xd4d4, 0xd516, 0xd058, 0xd19a, 0xd3dc, 0xd21e, -- 0xc560, 0xc4a2, 0xc6e4, 0xc726, 0xc268, 0xc3aa, 0xc1ec, 0xc02e, -- 0xcb70, 0xcab2, 0xc8f4, 0xc936, 0xcc78, 0xcdba, 0xcffc, 0xce3e, -- 0x9180, 0x9042, 0x9204, 0x93c6, 0x9688, 0x974a, 0x950c, 0x94ce, -- 0x9f90, 0x9e52, 0x9c14, 0x9dd6, 0x9898, 0x995a, 0x9b1c, 0x9ade, -- 0x8da0, 0x8c62, 0x8e24, 0x8fe6, 0x8aa8, 0x8b6a, 0x892c, 0x88ee, -- 0x83b0, 0x8272, 0x8034, 0x81f6, 0x84b8, 0x857a, 0x873c, 0x86fe, -- 0xa9c0, 0xa802, 0xaa44, 0xab86, 0xaec8, 0xaf0a, 0xad4c, 0xac8e, -- 0xa7d0, 0xa612, 0xa454, 0xa596, 0xa0d8, 0xa11a, 0xa35c, 0xa29e, -- 0xb5e0, 0xb422, 0xb664, 0xb7a6, 0xb2e8, 0xb32a, 0xb16c, 0xb0ae, -- 0xbbf0, 0xba32, 0xb874, 0xb9b6, 0xbcf8, 0xbd3a, 0xbf7c, 0xbebe, --}; -+static struct -+{ -+ volatile u32 counter_head; -+ u32 cacheline_align[64 / 4 - 1]; -+ u16 R[256]; -+ volatile u32 counter_tail; -+} gcm_table ATTR_ALIGNED_64 = -+ { -+ 0, -+ { 0, }, -+ { -+ 0x0000, 0x01c2, 0x0384, 0x0246, 0x0708, 0x06ca, 0x048c, 0x054e, -+ 0x0e10, 0x0fd2, 0x0d94, 0x0c56, 0x0918, 0x08da, 0x0a9c, 0x0b5e, -+ 0x1c20, 0x1de2, 0x1fa4, 0x1e66, 0x1b28, 0x1aea, 0x18ac, 0x196e, -+ 0x1230, 0x13f2, 0x11b4, 0x1076, 0x1538, 0x14fa, 0x16bc, 0x177e, -+ 0x3840, 0x3982, 0x3bc4, 0x3a06, 0x3f48, 0x3e8a, 0x3ccc, 0x3d0e, -+ 0x3650, 0x3792, 0x35d4, 0x3416, 0x3158, 0x309a, 0x32dc, 0x331e, -+ 0x2460, 0x25a2, 0x27e4, 0x2626, 0x2368, 0x22aa, 0x20ec, 0x212e, -+ 0x2a70, 0x2bb2, 0x29f4, 0x2836, 0x2d78, 0x2cba, 0x2efc, 0x2f3e, -+ 0x7080, 0x7142, 0x7304, 0x72c6, 0x7788, 0x764a, 0x740c, 0x75ce, -+ 0x7e90, 0x7f52, 0x7d14, 0x7cd6, 0x7998, 0x785a, 0x7a1c, 0x7bde, -+ 0x6ca0, 0x6d62, 0x6f24, 0x6ee6, 0x6ba8, 0x6a6a, 0x682c, 0x69ee, -+ 0x62b0, 0x6372, 0x6134, 0x60f6, 0x65b8, 0x647a, 0x663c, 0x67fe, -+ 0x48c0, 0x4902, 0x4b44, 0x4a86, 0x4fc8, 0x4e0a, 0x4c4c, 0x4d8e, -+ 0x46d0, 0x4712, 0x4554, 0x4496, 0x41d8, 0x401a, 0x425c, 0x439e, -+ 0x54e0, 0x5522, 0x5764, 0x56a6, 0x53e8, 0x522a, 0x506c, 0x51ae, -+ 0x5af0, 0x5b32, 0x5974, 0x58b6, 0x5df8, 0x5c3a, 0x5e7c, 0x5fbe, -+ 0xe100, 0xe0c2, 0xe284, 0xe346, 0xe608, 0xe7ca, 0xe58c, 0xe44e, -+ 0xef10, 0xeed2, 0xec94, 0xed56, 0xe818, 0xe9da, 0xeb9c, 0xea5e, -+ 0xfd20, 0xfce2, 0xfea4, 0xff66, 0xfa28, 0xfbea, 0xf9ac, 0xf86e, -+ 0xf330, 0xf2f2, 0xf0b4, 0xf176, 0xf438, 0xf5fa, 0xf7bc, 0xf67e, -+ 0xd940, 0xd882, 0xdac4, 0xdb06, 0xde48, 0xdf8a, 0xddcc, 0xdc0e, -+ 0xd750, 0xd692, 0xd4d4, 0xd516, 0xd058, 0xd19a, 0xd3dc, 0xd21e, -+ 0xc560, 0xc4a2, 0xc6e4, 0xc726, 0xc268, 0xc3aa, 0xc1ec, 0xc02e, -+ 0xcb70, 0xcab2, 0xc8f4, 0xc936, 0xcc78, 0xcdba, 0xcffc, 0xce3e, -+ 0x9180, 0x9042, 0x9204, 0x93c6, 0x9688, 0x974a, 0x950c, 0x94ce, -+ 0x9f90, 0x9e52, 0x9c14, 0x9dd6, 0x9898, 0x995a, 0x9b1c, 0x9ade, -+ 0x8da0, 0x8c62, 0x8e24, 0x8fe6, 0x8aa8, 0x8b6a, 0x892c, 0x88ee, -+ 0x83b0, 0x8272, 0x8034, 0x81f6, 0x84b8, 0x857a, 0x873c, 0x86fe, -+ 0xa9c0, 0xa802, 0xaa44, 0xab86, 0xaec8, 0xaf0a, 0xad4c, 0xac8e, -+ 0xa7d0, 0xa612, 0xa454, 0xa596, 0xa0d8, 0xa11a, 0xa35c, 0xa29e, -+ 0xb5e0, 0xb422, 0xb664, 0xb7a6, 0xb2e8, 0xb32a, 0xb16c, 0xb0ae, -+ 0xbbf0, 0xba32, 0xb874, 0xb9b6, 0xbcf8, 0xbd3a, 0xbf7c, 0xbebe, -+ }, -+ 0 -+ }; -+ -+#define gcmR gcm_table.R - - static inline - void prefetch_table(const void *tab, size_t len) -@@ -124,7 +146,7 @@ void prefetch_table(const void *tab, size_t len) - const volatile byte *vtab = tab; - size_t i; - -- for (i = 0; i < len; i += 8 * 32) -+ for (i = 0; len - i >= 8 * 32; i += 8 * 32) - { - (void)vtab[i + 0 * 32]; - (void)vtab[i + 1 * 32]; -@@ -135,6 +157,10 @@ void prefetch_table(const void *tab, size_t len) - (void)vtab[i + 6 * 32]; - (void)vtab[i + 7 * 32]; - } -+ for (; i < len; i += 32) -+ { -+ (void)vtab[i]; -+ } - - (void)vtab[len - 1]; - } -@@ -142,8 +168,16 @@ void prefetch_table(const void *tab, size_t len) - static inline void - do_prefetch_tables (const void *gcmM, size_t gcmM_size) - { -+ /* Modify counters to trigger copy-on-write and unsharing if physical pages -+ * of look-up table are shared between processes. Modifying counters also -+ * causes checksums for pages to change and hint same-page merging algorithm -+ * that these pages are frequently changing. */ -+ gcm_table.counter_head++; -+ gcm_table.counter_tail++; -+ -+ /* Prefetch look-up tables to cache. */ - prefetch_table(gcmM, gcmM_size); -- prefetch_table(gcmR, sizeof(gcmR)); -+ prefetch_table(&gcm_table, sizeof(gcm_table)); - } - - #ifdef GCM_TABLES_USE_U64 --- -2.7.4 - diff --git a/poky/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch b/poky/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch index 8622df3ea..5bf0c7f8a 100644 --- a/poky/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch +++ b/poky/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch @@ -1,7 +1,7 @@ -From e20dbdb0b8f0af840ef90b299c4e2277c52ddf87 Mon Sep 17 00:00:00 2001 +From cb06d218ee36e303a64f27c690f30040d5d87960 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Sun, 12 Jun 2016 04:44:29 -0400 -Subject: [PATCH 4/4] tests/Makefile.am: fix undefined reference to +Subject: [PATCH] tests/Makefile.am: fix undefined reference to `pthread_create' Add missing '-lpthread' to CFLAGS @@ -9,20 +9,21 @@ Add missing '-lpthread' to CFLAGS Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 1744ea7..04cf425 100644 +index ab201f0..1cf82d0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -64,4 +64,4 @@ EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl \ - - LDADD = $(standard_ldadd) $(GPG_ERROR_LIBS) - t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) +@@ -75,7 +75,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ + t_secmem_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ + testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ + t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@ -t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) +t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread --- -1.8.3.1 - + testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE) + + # Build a version of the test driver for the build platform. diff --git a/poky/meta/recipes-support/libgcrypt/files/determinism.patch b/poky/meta/recipes-support/libgcrypt/files/determinism.patch deleted file mode 100644 index ad0b8c795..000000000 --- a/poky/meta/recipes-support/libgcrypt/files/determinism.patch +++ /dev/null @@ -1,32 +0,0 @@ -gnutls detects our outer git trees and injects that revision into its objects. -That isn't deterministic so stop it. Also ensure we're not marked as a development -build as its git detection is faulty. - -RP 2020/2/6 - -Upstream-Status: Pending -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - - -Index: libgcrypt-1.8.5/configure.ac -=================================================================== ---- libgcrypt-1.8.5.orig/configure.ac -+++ libgcrypt-1.8.5/configure.ac -@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec], - m4_define([mym4_betastring], - m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ - awk -F- '$3!=0{print"-beta"$3}'])) --m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) -+m4_define([mym4_isgit],[no]) - m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) - - AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org]) -@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui - # - # Provide information about the build. - # --BUILD_REVISION="mym4_revision" -+BUILD_REVISION="None" - AC_SUBST(BUILD_REVISION) - AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION", - [GIT commit id revision used to build this package]) diff --git a/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.7.bb b/poky/meta/recipes-support/libgcrypt/libgcrypt_1.9.2.bb index 0cad41dfa..34735ea5d 100644 --- a/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.7.bb +++ b/poky/meta/recipes-support/libgcrypt/libgcrypt_1.9.2.bb @@ -1,4 +1,7 @@ SUMMARY = "General purpose cryptographic library based on the code from GnuPG" +DESCRIPTION = "A cryptography library developed as a separated module of GnuPG. \ +It can also be used independently of GnuPG, but depends on its error-reporting \ +library Libgpg-error." HOMEPAGE = "http://directory.fsf.org/project/libgcrypt/" BUGTRACKER = "https://bugs.g10code.com/gnupg/index" SECTION = "libs" @@ -11,7 +14,8 @@ LICENSE_dumpsexp-dev = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \ - file://LICENSES;md5=840e3bcb754e5046ffeda7619034cbd8" + file://LICENSES;md5=2dae15d91a37cfde72fe9eae75f8ea14 \ + " DEPENDS = "libgpg-error" @@ -21,12 +25,12 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \ file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \ - file://0001-Prefetch-GCM-look-up-tables.patch \ - file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \ - file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \ - file://determinism.patch \ -" -SRC_URI[sha256sum] = "03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748" + file://0001-Makefile.am-add-a-missing-space.patch \ + " +SRC_URI[sha256sum] = "b2c10d091513b271e47177274607b1ffba3d95b188bbfa8797f948aec9053c5a" + +# Below whitelisted CVEs are disputed and not affecting crypto libraries for any distro. +CVE_CHECK_WHITELIST += "CVE-2018-12433 CVE-2018-12438" BINCONFIG = "${bindir}/libgcrypt-config" diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb b/poky/meta/recipes-support/libgit2/libgit2_1.1.0.bb index 363ed4d65..2bbf59ea7 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb +++ b/poky/meta/recipes-support/libgit2/libgit2_1.1.0.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0" -SRCREV = "0ced29612dacb67eefe0c562a5c1d3aab21cce96" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.1" +SRCREV = "7f4fa178629d559c037a1f72f79f79af9c1ef8ce" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index ca5f6b5c2..83054a9c4 100644 --- a/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +++ b/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch @@ -11,18 +11,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Refactored for 1.33 Signed-off-by: Armin Kuster <akuster808@gmail.com> - +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - configure.ac | 1 + - src/gpg-error.m4 | 71 +++-------------------------------------------------- - 4 files changed, 18 insertions(+), 69 deletions(-) - create mode 100644 src/gpg-error.pc.in + src/gpg-error.m4 | 142 +---------------------------------------------- + 1 file changed, 3 insertions(+), 139 deletions(-) -Index: libgpg-error-1.33/src/gpg-error.m4 -=================================================================== ---- libgpg-error-1.33.orig/src/gpg-error.m4 -+++ libgpg-error-1.33/src/gpg-error.m4 -@@ -26,139 +26,13 @@ dnl is added to the gpg_config_script_wa +diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 +index c9b235f..176bd6a 100644 +--- a/src/gpg-error.m4 ++++ b/src/gpg-error.m4 +@@ -26,139 +26,12 @@ dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_GPG_ERROR], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -31,12 +29,10 @@ Index: libgpg-error-1.33/src/gpg-error.m4 - 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(libgpg-error-prefix, -- AC_HELP_STRING([--with-libgpg-error-prefix=PFX], +- AS_HELP_STRING([--with-libgpg-error-prefix=PFX], - [prefix where GPG Error is installed (optional)]), - [gpg_error_config_prefix="$withval"]) -+ min_gpg_error_version=ifelse([$1], ,0.0,$1) -+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no]) - +- - dnl Accept --with-gpg-error-prefix and make it work the same as - dnl --with-libgpg-error-prefix above, for backwards compatibility, - dnl but do not document this old, inconsistently-named option. @@ -143,6 +139,8 @@ Index: libgpg-error-1.33/src/gpg-error.m4 - fi - fi - AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) ++ min_gpg_error_version=ifelse([$1], ,0.0,$1) ++ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no]) if test $ok = yes; then - GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags` - GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs` @@ -165,7 +163,7 @@ Index: libgpg-error-1.33/src/gpg-error.m4 fi if test x"$gpg_error_config_host" != xnone ; then if test x"$gpg_error_config_host" != x"$host" ; then -@@ -174,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], +@@ -174,15 +47,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], fi fi else @@ -181,3 +179,6 @@ Index: libgpg-error-1.33/src/gpg-error.m4 - AC_SUBST(GPG_ERROR_MT_CFLAGS) - AC_SUBST(GPG_ERROR_MT_LIBS) ]) +-- +2.25.1 + diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error_1.39.bb b/poky/meta/recipes-support/libgpg-error/libgpg-error_1.41.bb index f53056f5c..a0119729d 100644 --- a/poky/meta/recipes-support/libgpg-error/libgpg-error_1.39.bb +++ b/poky/meta/recipes-support/libgpg-error/libgpg-error_1.41.bb @@ -1,4 +1,5 @@ SUMMARY = "Small library that defines common error values for all GnuPG components" +DESCRIPTION = "Contains common error codes and error handling functions used by GnuPG, Libgcrypt, GPGME and more packages. " HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/" BUGTRACKER = "https://bugs.g10code.com/gnupg/index" @@ -18,7 +19,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://0001-Do-not-fail-when-testing-config-scripts.patch \ " -SRC_URI[sha256sum] = "4a836edcae592094ef1c5a4834908f44986ab2b82e0824a0344b49df8cdb298f" +SRC_URI[sha256sum] = "64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742" BINCONFIG = "${bindir}/gpg-error-config" diff --git a/poky/meta/recipes-support/libical/libical_3.0.8.bb b/poky/meta/recipes-support/libical/libical_3.0.8.bb index 6230f09ec..ffc117d43 100644 --- a/poky/meta/recipes-support/libical/libical_3.0.8.bb +++ b/poky/meta/recipes-support/libical/libical_3.0.8.bb @@ -1,4 +1,8 @@ SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library" +DESCRIPTION = "An Open Source implementation of the iCalendar protocols \ +and protocol data units. The iCalendar specification describes how \ +calendar clients can communicate with calendar servers so users can store \ +their calendar data and arrange meetings with other users. " HOMEPAGE = "https://github.com/libical/libical" BUGTRACKER = "https://github.com/libical/libical/issues" LICENSE = "LGPLv2.1 | MPL-2.0" diff --git a/poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb b/poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.1.bb index 953ecfd05..197bb787a 100644 --- a/poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb +++ b/poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.1.bb @@ -5,12 +5,12 @@ 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 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=c69090e97c8fd6372d03099c0a5bc382 \ file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ " SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git" -SRCREV = "a37e57d9b939d1f93a1b92e1486edd44a3c1cb4c" +SRCREV = "747bf030b0ea9c44548b4e29bcfab7ae416675fc" S = "${WORKDIR}/git" do_configure[noexec] = "1" diff --git a/poky/meta/recipes-support/libksba/libksba_1.5.0.bb b/poky/meta/recipes-support/libksba/libksba_1.5.0.bb index 005389eab..8d7043fc0 100644 --- a/poky/meta/recipes-support/libksba/libksba_1.5.0.bb +++ b/poky/meta/recipes-support/libksba/libksba_1.5.0.bb @@ -1,4 +1,9 @@ SUMMARY = "Easy API to create and parse X.509 and CMS related objects" +DESCRIPTION = "A library to make the tasks of working with X.509 certificates, \ +CMS data and related objects more easy. It provides a highlevel interface to \ +the implemented protocols and presents the data in a consistent way. The \ +library does not rely on another cryptographic library but provides \ +hooks for easy integration with Libgcrypt. " HOMEPAGE = "http://www.gnupg.org/related_software/libksba/" LICENSE = "GPLv3+ & (GPLv2+ | LGPLv3+)" LICENSE_${PN} = "GPLv2+ | LGPLv3+" diff --git a/poky/meta/recipes-support/libmd/libmd_1.0.3.bb b/poky/meta/recipes-support/libmd/libmd_1.0.3.bb new file mode 100644 index 000000000..2e6762e49 --- /dev/null +++ b/poky/meta/recipes-support/libmd/libmd_1.0.3.bb @@ -0,0 +1,16 @@ +SUMMARY = "Message Digest functions from BSD systems" +DESCRIPTION = "This library provides message digest functions \ +found on BSD systems either on their libc (NetBSD, OpenBSD) or \ +libmd (FreeBSD, DragonflyBSD, macOS, Solaris) libraries and \ +lacking on others like GNU systems." +HOMEPAGE = "https://www.hadrons.org/software/libmd/" + +LICENSE = "BSD-3-Clause & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=0436d4fb62a71f661d6e8b7812f9e1df" + +SRC_URI = "https://archive.hadrons.org/software/libmd/libmd-${PV}.tar.xz" +SRC_URI[sha256sum] = "5a02097f95cc250a3f1001865e4dbba5f1d15554120f95693c0541923c52af4a" + +inherit autotools + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libnl/files/enable-serial-tests.patch b/poky/meta/recipes-support/libnl/files/enable-serial-tests.patch new file mode 100644 index 000000000..8ea53f874 --- /dev/null +++ b/poky/meta/recipes-support/libnl/files/enable-serial-tests.patch @@ -0,0 +1,28 @@ +From b1476d89bf7a0bc6062438731ee4e9026696328b Mon Sep 17 00:00:00 2001 +From: Eric Xu <chi.xu@windriver.com> +Date: Fri, 9 Mar 2018 03:38:49 +0000 +Subject: [PATCH] Add ptest for libnl + +serial-tests is required to generate those targets. + +Signed-off-by: Eric Xu <chi.xu@windriver.com> +--- + configure.ac | 2 +- + 1 files changed, 1 insertion(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index dfead98..2cc8257 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,7 +46,7 @@ AC_INIT(libnl, [libnl_version], [], [], [http://www.infradead.org/~tgr/libnl/]) + AC_CONFIG_HEADERS([lib/defs.h]) + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) +-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects serial-tests]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)], []) + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + +-- +2.13.3 + diff --git a/poky/meta/recipes-support/libnl/files/run-ptest b/poky/meta/recipes-support/libnl/files/run-ptest new file mode 100755 index 000000000..e5c9eb0a3 --- /dev/null +++ b/poky/meta/recipes-support/libnl/files/run-ptest @@ -0,0 +1,16 @@ +#!/bin/sh + +num_fail=0 + +for test in check* +do + ./"$test" \ + && echo "PASS: $test" \ + || { + echo "FAIL: $test" + num_fail=$(( ${num_fail} + 1)) + } + +done + +exit $num_fail diff --git a/poky/meta/recipes-support/libnl/libnl_3.5.0.bb b/poky/meta/recipes-support/libnl/libnl_3.5.0.bb index 9d0e1441a..9753f9326 100644 --- a/poky/meta/recipes-support/libnl/libnl_3.5.0.bb +++ b/poky/meta/recipes-support/libnl/libnl_3.5.0.bb @@ -1,4 +1,9 @@ SUMMARY = "A library for applications dealing with netlink sockets" +DESCRIPTION = "The libnl suite is a collection of libraries providing \ +APIs to netlink protocol based Linux kernel interfaces. libnl is the core \ +library implementing the fundamentals required to use the netlink protocol \ +such as socket handling, message construction and parsing, and sending \ +and receiving of data." HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" SECTION = "libs/network" @@ -9,19 +14,26 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "flex-native bison-native" -SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz" +SRC_URI = " \ + https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ + file://enable-serial-tests.patch \ + file://run-ptest \ + " + SRC_URI[md5sum] = "74ba57b1b1d6f9f92268aa8141d8e8e4" SRC_URI[sha256sum] = "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa" + UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest FILES_${PN} = "${libdir}/libnl-3.so.* \ ${libdir}/libnl.so.* \ ${sysconfdir}" RREPLACES_${PN} = "libnl2" RCONFLICTS_${PN} = "libnl2" + FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.la" FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" @@ -41,4 +53,23 @@ FILES_${PN}-xfrm = "${libdir}/libnl-xfrm-3.so.*" RREPLACES_${PN}-genl = "libnl-genl2" RCONFLICTS_${PN}-genl = "libnl-genl2" +RDEPENDS_${PN}-ptest += "libcheck" +DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'libcheck', '', d)}" + +# make sure the tests don't link against wrong so file +EXTRA_OECONF += "${@bb.utils.contains('PTEST_ENABLED', '1', '--disable-rpath', '', d)}" + +do_compile_ptest() { + # hack to remove the call to `make runtest-TESTS` + sed -i 's/$(MAKE) $(AM_MAKEFLAGS) runtest-TESTS//g' Makefile + oe_runmake check +} + +do_install_ptest(){ + # legacy? tests are also installed, but ptest-runner will not run them + # upstream are not running these tests in their CI pipeline + # issue opened https://github.com/thom311/libnl/issues/270 + install -m 0755 tests/.libs/* ${D}${PTEST_PATH}/ +} + BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch b/poky/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch deleted file mode 100644 index 89b44f6aa..000000000 --- a/poky/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Inappropriate [debian patch] - -This patch address a namespace collision with libc. - -Although there is no "#include <regex.h>" in the source file, at -runtime, it's unintentionally linked to the libc version, the regcomp of -libc is called instead the pcre one using pcre's data structure... -that looks like a disaster. - -Can patch is from Debian (and Ubuntu 11.04alpha has it also). - -[sgw: added patch comment] -Signed-off-by: Qing He <qing.he@intel.com> -Signed-off-by: Saul Wold <sgw@linux.intel.com> - ---- a/pcreposix.h 2010-05-17 00:17:23.000000000 +0800 -+++ b/pcreposix.h 2009-01-15 04:32:17.000000000 +0800 -@@ -133,14 +130,19 @@ - - /* The functions */ - --PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int); --PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t, -+PCREPOSIX_EXP_DECL int pcreposix_regcomp(regex_t *, const char *, int); -+PCREPOSIX_EXP_DECL int pcreposix_regexec(const regex_t *, const char *, size_t, - regmatch_t *, int); --PCREPOSIX_EXP_DECL size_t regerror(int, const regex_t *, char *, size_t); --PCREPOSIX_EXP_DECL void regfree(regex_t *); -+PCREPOSIX_EXP_DECL size_t pcreposix_regerror(int, const regex_t *, char *, size_t); -+PCREPOSIX_EXP_DECL void pcreposix_regfree(regex_t *); - - #ifdef __cplusplus - } /* extern "C" */ - #endif - -+#define regcomp pcreposix_regcomp -+#define regexec pcreposix_regexec -+#define regerror pcreposix_regerror -+#define regfree pcreposix_regfree -+ - #endif /* End of pcreposix.h */ diff --git a/poky/meta/recipes-support/libpcre/libpcre_8.44.bb b/poky/meta/recipes-support/libpcre/libpcre_8.44.bb index e5471e81d..cd80dc734 100644 --- a/poky/meta/recipes-support/libpcre/libpcre_8.44.bb +++ b/poky/meta/recipes-support/libpcre/libpcre_8.44.bb @@ -8,7 +8,6 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ - file://fix-pcre-name-collision.patch \ file://run-ptest \ file://Makefile \ " diff --git a/poky/meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch b/poky/meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch deleted file mode 100644 index fedda9dd9..000000000 --- a/poky/meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2d73469c7a17ebfe4330ac6643b0c8abdc125d05 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 30 Jan 2019 09:29:44 -0800 -Subject: [PATCH] get-pac-test: Fix build with clang/libc++ - -get-pac-test.cpp:55:10: error: assigning to 'int' from incompatible type '__bind<int &, sockaddr *, unsigned int>' - ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Submitted [https://github.com/libproxy/libproxy/pull/97] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libproxy/test/get-pac-test.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libproxy/test/get-pac-test.cpp b/libproxy/test/get-pac-test.cpp -index 0059dfb..911f296 100644 ---- a/libproxy/test/get-pac-test.cpp -+++ b/libproxy/test/get-pac-test.cpp -@@ -52,7 +52,7 @@ class TestServer { - - setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); - -- ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); -+ ret = ::bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); - assert(!ret); - - ret = listen(m_sock, 1); --- -2.20.1 - diff --git a/poky/meta/recipes-support/libproxy/libproxy/CVE-2020-25219.patch b/poky/meta/recipes-support/libproxy/libproxy/CVE-2020-25219.patch deleted file mode 100644 index 3ef7f8545..000000000 --- a/poky/meta/recipes-support/libproxy/libproxy/CVE-2020-25219.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a83dae404feac517695c23ff43ce1e116e2bfbe0 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@gnome.org> -Date: Wed, 9 Sep 2020 11:12:02 -0500 -Subject: [PATCH] Rewrite url::recvline to be nonrecursive - -This function processes network input. It's semi-trusted, because the -PAC ought to be trusted. But we still shouldn't allow it to control how -far we recurse. A malicious PAC can cause us to overflow the stack by -sending a sufficiently-long line without any '\n' character. - -Also, this function failed to properly handle EINTR, so let's fix that -too, for good measure. - -Fixes #134 - -Upstream-Status: Backport [https://github.com/libproxy/libproxy/commit/836c10b60c65e947ff1e10eb02fbcc676d909ffa] -CVE: CVE-2020-25219 -Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> ---- - libproxy/url.cpp | 28 ++++++++++++++++++---------- - 1 file changed, 18 insertions(+), 10 deletions(-) - -diff --git a/libproxy/url.cpp b/libproxy/url.cpp -index ee776b2..68d69cd 100644 ---- a/libproxy/url.cpp -+++ b/libproxy/url.cpp -@@ -388,16 +388,24 @@ string url::to_string() const { - return m_orig; - } - --static inline string recvline(int fd) { -- // Read a character. -- // If we don't get a character, return empty string. -- // If we are at the end of the line, return empty string. -- char c = '\0'; -- -- if (recv(fd, &c, 1, 0) != 1 || c == '\n') -- return ""; -- -- return string(1, c) + recvline(fd); -+static string recvline(int fd) { -+ string line; -+ int ret; -+ -+ // Reserve arbitrary amount of space to avoid small memory reallocations. -+ line.reserve(128); -+ -+ do { -+ char c; -+ ret = recv(fd, &c, 1, 0); -+ if (ret == 1) { -+ if (c == '\n') -+ return line; -+ line += c; -+ } -+ } while (ret == 1 || (ret == -1 && errno == EINTR)); -+ -+ return line; - } - - char* url::get_pac() { diff --git a/poky/meta/recipes-support/libproxy/libproxy/CVE-2020-26154.patch b/poky/meta/recipes-support/libproxy/libproxy/CVE-2020-26154.patch deleted file mode 100644 index 0ccb99da8..000000000 --- a/poky/meta/recipes-support/libproxy/libproxy/CVE-2020-26154.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 4411b523545b22022b4be7d0cac25aa170ae1d3e Mon Sep 17 00:00:00 2001 -From: Fei Li <lifeibiren@gmail.com> -Date: Fri, 17 Jul 2020 02:18:37 +0800 -Subject: [PATCH] Fix buffer overflow when PAC is enabled - -The bug was found on Windows 10 (MINGW64) when PAC is enabled. It turned -out to be the large PAC file (more than 102400 bytes) returned by a -local proxy program with no content-length present. - -Upstream-Status: Backport [https://github.com/libproxy/libproxy/commit/6d342b50366a048d3d543952e2be271b5742c5f8] -CVE: CVE-2020-26154 -Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> - ---- - libproxy/url.cpp | 44 +++++++++++++++++++++++++++++++------------- - 1 file changed, 31 insertions(+), 13 deletions(-) - -diff --git a/libproxy/url.cpp b/libproxy/url.cpp -index ee776b2..8684086 100644 ---- a/libproxy/url.cpp -+++ b/libproxy/url.cpp -@@ -54,7 +54,7 @@ using namespace std; - #define PAC_MIME_TYPE_FB "text/plain" - - // This is the maximum pac size (to avoid memory attacks) --#define PAC_MAX_SIZE 102400 -+#define PAC_MAX_SIZE 0x800000 - // This is the default block size to use when receiving via HTTP - #define PAC_HTTP_BLOCK_SIZE 512 - -@@ -478,15 +478,13 @@ char* url::get_pac() { - } - - // Get content -- unsigned int recvd = 0; -- buffer = new char[PAC_MAX_SIZE]; -- memset(buffer, 0, PAC_MAX_SIZE); -+ std::vector<char> dynamic_buffer; - do { - unsigned int chunk_length; - - if (chunked) { - // Discard the empty line if we received a previous chunk -- if (recvd > 0) recvline(sock); -+ if (!dynamic_buffer.empty()) recvline(sock); - - // Get the chunk-length line as an integer - if (sscanf(recvline(sock).c_str(), "%x", &chunk_length) != 1 || chunk_length == 0) break; -@@ -498,21 +496,41 @@ char* url::get_pac() { - - if (content_length >= PAC_MAX_SIZE) break; - -- while (content_length == 0 || recvd != content_length) { -- int r = recv(sock, buffer + recvd, -- content_length == 0 ? PAC_HTTP_BLOCK_SIZE -- : content_length - recvd, 0); -+ while (content_length == 0 || dynamic_buffer.size() != content_length) { -+ // Calculate length to recv -+ unsigned int length_to_read = PAC_HTTP_BLOCK_SIZE; -+ if (content_length > 0) -+ length_to_read = content_length - dynamic_buffer.size(); -+ -+ // Prepare buffer -+ dynamic_buffer.resize(dynamic_buffer.size() + length_to_read); -+ -+ int r = recv(sock, dynamic_buffer.data() + dynamic_buffer.size() - length_to_read, length_to_read, 0); -+ -+ // Shrink buffer to fit -+ if (r >= 0) -+ dynamic_buffer.resize(dynamic_buffer.size() - length_to_read + r); -+ -+ // PAC size too large, discard -+ if (dynamic_buffer.size() >= PAC_MAX_SIZE) { -+ chunked = false; -+ dynamic_buffer.clear(); -+ break; -+ } -+ - if (r <= 0) { - chunked = false; - break; - } -- recvd += r; - } - } while (chunked); - -- if (content_length != 0 && string(buffer).size() != content_length) { -- delete[] buffer; -- buffer = NULL; -+ if (content_length == 0 || content_length == dynamic_buffer.size()) { -+ buffer = new char[dynamic_buffer.size() + 1]; -+ if (!dynamic_buffer.empty()) { -+ memcpy(buffer, dynamic_buffer.data(), dynamic_buffer.size()); -+ } -+ buffer[dynamic_buffer.size()] = '\0'; - } - } - diff --git a/poky/meta/recipes-support/libproxy/libproxy/determinism.patch b/poky/meta/recipes-support/libproxy/libproxy/determinism.patch new file mode 100644 index 000000000..09770f68f --- /dev/null +++ b/poky/meta/recipes-support/libproxy/libproxy/determinism.patch @@ -0,0 +1,26 @@ +[PATCH] cmake/modules/config_sysconfig: Allow configuration of sysconfig module + +Checking whether the host system has /etc/sysconfig is not deterministic +when cross compiling. Allow this to be disabled by adding a configure +option for it. OpenEmbedded can set this and have deterministic build +output independent of the host OS. + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Submitted [https://github.com/libproxy/libproxy/pull/160] + +Index: libproxy-0.4.17/libproxy/cmake/modules/config_sysconfig.cmk +=================================================================== +--- libproxy-0.4.17.orig/libproxy/cmake/modules/config_sysconfig.cmk ++++ libproxy-0.4.17/libproxy/cmake/modules/config_sysconfig.cmk +@@ -1,5 +1,8 @@ + if (NOT WIN32 AND NOT APPLE) +- if (EXISTS "/etc/sysconfig" AND IS_DIRECTORY "/etc/sysconfig") +- set(SYSCONFIG_FOUND 1) ++ option(WITH_SYSCONFIG "Build sysconfig module for /etc/sysconfig" ON) ++ if(WITH_SYSCONFIG) ++ if (EXISTS "/etc/sysconfig" AND IS_DIRECTORY "/etc/sysconfig") ++ set(SYSCONFIG_FOUND 1) ++ endif() + endif() + endif() +\ No newline at end of file diff --git a/poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb b/poky/meta/recipes-support/libproxy/libproxy_0.4.17.bb index 6f704d7a9..c2579b394 100644 --- a/poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb +++ b/poky/meta/recipes-support/libproxy/libproxy_0.4.17.bb @@ -1,4 +1,8 @@ SUMMARY = "Library providing automatic proxy configuration management" +DESCRIPTION = "libproxy provides interfaces to get the proxy that will be \ +used to access network resources. It uses various plugins to get proxy \ +configuration via different mechanisms (e.g. environment variables or \ +desktop settings)." HOMEPAGE = "https://github.com/libproxy/libproxy" BUGTRACKER = "https://github.com/libproxy/libproxy/issues" SECTION = "libs" @@ -9,12 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "glib-2.0" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://0001-get-pac-test-Fix-build-with-clang-libc.patch \ - file://CVE-2020-25219.patch \ - file://CVE-2020-26154.patch \ - " -SRC_URI[md5sum] = "f6b1d2a1e17a99cd3debaae6d04ab152" -SRC_URI[sha256sum] = "654db464120c9534654590b6683c7fa3887b3dad0ca1c4cd412af24fbfca6d4f" + file://determinism.patch" +SRC_URI[sha256sum] = "bc89f842f654ee1985a31c0ba56dc7e2ce8044a0264ddca84e650f46cd7f8b05" UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases" UPSTREAM_CHECK_REGEX = "libproxy-(?P<pver>.*)\.tar" @@ -33,6 +33,7 @@ EXTRA_OECMAKE += " \ -DWITH_PYTHON2=no \ -DWITH_PYTHON3=no \ -DWITH_WEBKIT=no \ + -DWITH_SYSCONFIG=no \ -DLIB_INSTALL_DIR=${libdir} \ -DLIBEXEC_INSTALL_DIR=${libexecdir} \ " diff --git a/poky/meta/recipes-support/libpsl/libpsl_0.21.1.bb b/poky/meta/recipes-support/libpsl/libpsl_0.21.1.bb index 0a48db65c..db4b3a599 100644 --- a/poky/meta/recipes-support/libpsl/libpsl_0.21.1.bb +++ b/poky/meta/recipes-support/libpsl/libpsl_0.21.1.bb @@ -1,4 +1,10 @@ SUMMARY = "Public Suffix List library" +DESCRIPTION = "The libpsl package provides a library for accessing and \ +resolving information from the Public Suffix List (PSL). The PSL is a set of \ +domain names beyond the standard suffixes, such as .com." + +HOMEPAGE = "https://rockdaboot.github.io/libpsl/" +BUGTRACKER = "https://github.com/rockdaboot/libpsl/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5437030d9e4fbe7267ced058ddb8a7f5 \ diff --git a/poky/meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb b/poky/meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb index d0bc01961..5b74119d9 100644 --- a/poky/meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb +++ b/poky/meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb @@ -1,4 +1,6 @@ SUMMARY = "An HTTP library implementation in C" +DESCRIPTION = "libsoup is an HTTP client/server library for GNOME. It uses GObjects \ +and the glib main loop, to integrate well with GNOME applications." HOMEPAGE = "https://wiki.gnome.org/Projects/libsoup" BUGTRACKER = "https://bugzilla.gnome.org/" SECTION = "x11/gnome/libs" diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch b/poky/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch index 5ff9bf846..5ff9bf846 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch +++ b/poky/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch diff --git a/poky/meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch b/poky/meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch new file mode 100644 index 000000000..1128c7ea0 --- /dev/null +++ b/poky/meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch @@ -0,0 +1,30 @@ +From efe7101786193eaddb749c0583af6b54aec6f289 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Feb 2021 18:45:16 -0800 +Subject: [PATCH] configure: Conditionally undefine backend m4 macro + +Unlike the M4 builtin, this macro fails if macro is not defined +therefore recover the behavior of the builtin. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index fe5054a..758f8c2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -127,7 +127,7 @@ fi + m4_set_foreach([crypto_backends], [backend], + [AM_CONDITIONAL(m4_toupper(backend), test "$found_crypto" = "backend")] + ) +-m4_undefine([backend]) ++m4_ifdef([backend], [m4_undefine([backend])]) + + + # libz +-- +2.30.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch b/poky/meta/recipes-support/libssh2/files/CVE-2019-17498.patch index 001080072..001080072 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch +++ b/poky/meta/recipes-support/libssh2/files/CVE-2019-17498.patch diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest b/poky/meta/recipes-support/libssh2/files/run-ptest index 5fd7ec65f..5fd7ec65f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest +++ b/poky/meta/recipes-support/libssh2/files/run-ptest diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/poky/meta/recipes-support/libssh2/libssh2_1.9.0.bb index 4a5a05060..0b8ccbd21 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ b/poky/meta/recipes-support/libssh2/libssh2_1.9.0.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ file://CVE-2019-17498.patch \ + file://0001-configure-Conditionally-undefine-backend-m4-macro.patch \ file://run-ptest \ " diff --git a/poky/meta/recipes-support/libunwind/libunwind_1.5.0.bb b/poky/meta/recipes-support/libunwind/libunwind_1.5.0.bb index 089c4064f..5e4693e20 100644 --- a/poky/meta/recipes-support/libunwind/libunwind_1.5.0.bb +++ b/poky/meta/recipes-support/libunwind/libunwind_1.5.0.bb @@ -18,6 +18,9 @@ EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests --enab ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" +COMPATIBLE_HOST_riscv64 = "null" +COMPATIBLE_HOST_riscv32 = "null" + LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared" diff --git a/poky/meta/recipes-support/liburcu/liburcu_0.12.1.bb b/poky/meta/recipes-support/liburcu/liburcu_0.12.2.bb index 3a5ecbcc2..b493e939c 100644 --- a/poky/meta/recipes-support/liburcu/liburcu_0.12.1.bb +++ b/poky/meta/recipes-support/liburcu/liburcu_0.12.2.bb @@ -1,4 +1,7 @@ SUMMARY = "Userspace RCU (read-copy-update) library" +DESCRIPTION = "A userspace RCU (read-copy-update) library. This data \ +synchronization library provides read-side access which scales linearly \ +with the number of cores. " HOMEPAGE = "http://lttng.org/urcu" BUGTRACKER = "http://lttng.org/project/issues" @@ -9,8 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \ SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2" -SRC_URI[md5sum] = "5e419d7b30d0d98bffe0014c704ae936" -SRC_URI[sha256sum] = "bbfaead0345642b97e0de90f889dfbab4b2643a6a5e5c6bb59cd0d26fc0bcd0e" +SRC_URI[md5sum] = "d94347df78e3f1aa744745eb85787df5" +SRC_URI[sha256sum] = "4eefc11e4f6c212fc7d84d871e1cc139da0669a46ff3fda557a6fdd4d74ca67b" S = "${WORKDIR}/userspace-rcu-${PV}" inherit autotools multilib_header diff --git a/poky/meta/recipes-support/libusb/libusb1_1.0.24.bb b/poky/meta/recipes-support/libusb/libusb1_1.0.24.bb index 4c552ae6c..92e66b1b1 100644 --- a/poky/meta/recipes-support/libusb/libusb1_1.0.24.bb +++ b/poky/meta/recipes-support/libusb/libusb1_1.0.24.bb @@ -1,4 +1,6 @@ SUMMARY = "Userspace library to access USB (version 1.0)" +DESCRIPTION = "A cross-platform library to access USB devices from Linux, \ +macOS, Windows, OpenBSD/NetBSD, Haiku and Solaris userspace." HOMEPAGE = "http://libusb.sf.net" BUGTRACKER = "http://www.libusb.org/report" SECTION = "libs" diff --git a/poky/meta/recipes-support/libxslt/libxslt_1.1.34.bb b/poky/meta/recipes-support/libxslt/libxslt_1.1.34.bb index 1961bb5b3..63cce6fe0 100644 --- a/poky/meta/recipes-support/libxslt/libxslt_1.1.34.bb +++ b/poky/meta/recipes-support/libxslt/libxslt_1.1.34.bb @@ -1,4 +1,9 @@ SUMMARY = "GNOME XSLT library" +DESCRIPTION = "libxslt is the XSLT C parser and toolkit developed for the Gnome project. \ +XSLT itself is a an XML language to define transformation for XML. Libxslt is based on \ +libxml2 the XML C library developed for the GNOME project. It also implements most of \ +the EXSLT set of processor-portable extensions functions and some of Saxon's evaluate \ +and expressions extensions." HOMEPAGE = "http://xmlsoft.org/XSLT/" BUGTRACKER = "https://bugzilla.gnome.org/" diff --git a/poky/meta/recipes-support/libyaml/libyaml_0.2.5.bb b/poky/meta/recipes-support/libyaml/libyaml_0.2.5.bb index e39a7b908..778e09163 100644 --- a/poky/meta/recipes-support/libyaml/libyaml_0.2.5.bb +++ b/poky/meta/recipes-support/libyaml/libyaml_0.2.5.bb @@ -15,4 +15,7 @@ S = "${WORKDIR}/yaml-${PV}" inherit autotools +DISABLE_STATIC_class-nativesdk = "" +DISABLE_STATIC_class-native = "" + BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/lzo/lzo_2.10.bb b/poky/meta/recipes-support/lzo/lzo_2.10.bb index 8eefec3cc..85b14b3c5 100644 --- a/poky/meta/recipes-support/lzo/lzo_2.10.bb +++ b/poky/meta/recipes-support/lzo/lzo_2.10.bb @@ -1,4 +1,6 @@ SUMMARY = "Lossless data compression library" +DESCRIPTION = "A portable lossless data compression library written in \ +ANSI C that offers pretty fast compression and *extremely* fast decompression. " HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/" SECTION = "libs" LICENSE = "GPLv2+" diff --git a/poky/meta/recipes-support/mpfr/mpfr_4.1.0.bb b/poky/meta/recipes-support/mpfr/mpfr_4.1.0.bb index 82b5516f2..41897e937 100644 --- a/poky/meta/recipes-support/mpfr/mpfr_4.1.0.bb +++ b/poky/meta/recipes-support/mpfr/mpfr_4.1.0.bb @@ -1,4 +1,5 @@ SUMMARY = "C library for multiple-precision floating-point computations with exact rounding" +DESCRIPTION = "The GNU Multiple Precision Floating-Point Reliable Library (GNU MPFR) is a GNU portable C library for arbitrary-precision binary floating-point computation with correct rounding, based on GNU Multi-Precision Library. MPFR's computation is both efficient and has a well-defined semantics: the functions are completely specified on all the possible operands and the results do not depend on the platform." HOMEPAGE = "https://www.mpfr.org/" LICENSE = "LGPLv3+" SECTION = "devel" diff --git a/poky/meta/recipes-support/nettle/nettle-3.6/Add-target-to-only-build-tests-not-run-them.patch b/poky/meta/recipes-support/nettle/nettle/Add-target-to-only-build-tests-not-run-them.patch index e3f5c6de7..e3f5c6de7 100644 --- a/poky/meta/recipes-support/nettle/nettle-3.6/Add-target-to-only-build-tests-not-run-them.patch +++ b/poky/meta/recipes-support/nettle/nettle/Add-target-to-only-build-tests-not-run-them.patch diff --git a/poky/meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch b/poky/meta/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch index d5f266681..d5f266681 100644 --- a/poky/meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch +++ b/poky/meta/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch diff --git a/poky/meta/recipes-support/nettle/nettle-3.6/dlopen-test.patch b/poky/meta/recipes-support/nettle/nettle/dlopen-test.patch index ab9b91f88..ab9b91f88 100644 --- a/poky/meta/recipes-support/nettle/nettle-3.6/dlopen-test.patch +++ b/poky/meta/recipes-support/nettle/nettle/dlopen-test.patch diff --git a/poky/meta/recipes-support/nettle/nettle-3.6/run-ptest b/poky/meta/recipes-support/nettle/nettle/run-ptest index b90bed66d..b90bed66d 100644 --- a/poky/meta/recipes-support/nettle/nettle-3.6/run-ptest +++ b/poky/meta/recipes-support/nettle/nettle/run-ptest diff --git a/poky/meta/recipes-support/nettle/nettle_3.6.bb b/poky/meta/recipes-support/nettle/nettle_3.7.1.bb index 7c1b1a2d5..3bbcf17c7 100644 --- a/poky/meta/recipes-support/nettle/nettle_3.6.bb +++ b/poky/meta/recipes-support/nettle/nettle_3.7.1.bb @@ -1,4 +1,5 @@ SUMMARY = "A low level cryptographic library" +DESCRIPTION = "Nettle is a cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space." 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 \ @@ -23,8 +24,7 @@ SRC_URI_append_class-target = "\ file://dlopen-test.patch \ " -SRC_URI[md5sum] = "c45ee24ed7361dcda152a035d396fe8a" -SRC_URI[sha256sum] = "d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1" +SRC_URI[sha256sum] = "156621427c7b00a75ff9b34b770b95d34f80ef7a55c3407de94b16cbf436c42e" UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-support/npth/npth_1.6.bb b/poky/meta/recipes-support/npth/npth_1.6.bb index 88484acec..94a3f00ea 100644 --- a/poky/meta/recipes-support/npth/npth_1.6.bb +++ b/poky/meta/recipes-support/npth/npth_1.6.bb @@ -1,4 +1,5 @@ SUMMARY = "New GNU Portable Threads library" +DESCRIPTION = "nPth is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. " HOMEPAGE = "https://www.gnu.org/software/pth/" SECTION = "libs" LICENSE = "LGPLv2+" diff --git a/poky/meta/recipes-support/p11-kit/p11-kit_0.23.21.bb b/poky/meta/recipes-support/p11-kit/p11-kit_0.23.22.bb index b1fd2334b..623afccb5 100644 --- a/poky/meta/recipes-support/p11-kit/p11-kit_0.23.21.bb +++ b/poky/meta/recipes-support/p11-kit/p11-kit_0.23.22.bb @@ -1,18 +1,21 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" +DESCRIPTION = " Provides a standard configuration setup for installing PKCS#11 modules in such a way that they're discoverable. Also solves problems with coordinating the use of PKCS#11 by different components or libraries living in the same process." +HOMEPAGE = "https://p11-glue.github.io/p11-glue/p11-kit.html" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" -inherit meson gettext pkgconfig gtk-doc bash-completion +inherit meson gettext pkgconfig gtk-doc bash-completion manpages DEPENDS = "libtasn1 libtasn1-native libffi" DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" -SRC_URI = "git://github.com/p11-glue/p11-kit" -SRCREV = "fd8b56f3ee971f94dc6fc95411fc01e1c12153ab" +SRC_URI = "git://github.com/p11-glue/p11-kit;branch=0.23" +SRCREV = "bd97afbfe28d5fbbde95ce36ff7a8834fc0291ee" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native" PACKAGECONFIG[trust-paths] = "-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,,,ca-certificates" GTKDOC_MESON_OPTION = 'gtk_doc' diff --git a/poky/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch b/poky/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch deleted file mode 100644 index 431edb035..000000000 --- a/poky/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch +++ /dev/null @@ -1,100 +0,0 @@ -Convert to pkg-config support to match changes done to -the gpg-error recipe for gpg-error.pc generation. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Armin Kuster <akuster@mvista.com> - -Index: pinentry-1.0.0/m4/gpg-error.m4 -=================================================================== ---- pinentry-1.0.0.orig/m4/gpg-error.m4 -+++ pinentry-1.0.0/m4/gpg-error.m4 -@@ -25,74 +25,12 @@ dnl config script does not match the hos - dnl is added to the gpg_config_script_warn variable. - dnl - AC_DEFUN([AM_PATH_GPG_ERROR], --[ AC_REQUIRE([AC_CANONICAL_HOST]) -- gpg_error_config_prefix="" -- dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, -- 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(libgpg-error-prefix, -- AC_HELP_STRING([--with-libgpg-error-prefix=PFX], -- [prefix where GPG Error is installed (optional)]), -- [gpg_error_config_prefix="$withval"]) -- -- dnl Accept --with-gpg-error-prefix and make it work the same as -- dnl --with-libgpg-error-prefix above, for backwards compatibility, -- dnl but do not document this old, inconsistently-named option. -- AC_ARG_WITH(gpg-error-prefix,, -- [gpg_error_config_prefix="$withval"]) -- -- if test x"${GPG_ERROR_CONFIG}" = x ; then -- if test x"${gpg_error_config_prefix}" != x ; then -- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" -- else -- case "${SYSROOT}" in -- /*) -- if test -x "${SYSROOT}/bin/gpg-error-config" ; then -- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" -- fi -- ;; -- '') -- ;; -- *) -- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) -- ;; -- esac -- fi -- fi -- -- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) -+[ - min_gpg_error_version=ifelse([$1], ,0.0,$1) -- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) -- ok=no -- if test "$GPG_ERROR_CONFIG" != "no" \ -- && test -f "$GPG_ERROR_CONFIG" ; then -- req_major=`echo $min_gpg_error_version | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -- req_minor=`echo $min_gpg_error_version | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version` -- major=`echo $gpg_error_config_version | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` -- minor=`echo $gpg_error_config_version | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` -- if test "$major" -gt "$req_major"; then -- ok=yes -- else -- if test "$major" -eq "$req_major"; then -- if test "$minor" -ge "$req_minor"; then -- ok=yes -- fi -- fi -- fi -- fi -+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version gpg-error], [ok=yes], [ok=no]) - if test $ok = yes; then -- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` -- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` -- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` -- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` -- AC_MSG_RESULT([yes ($gpg_error_config_version)]) - ifelse([$2], , :, [$2]) -- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` -+ gpg_error_config_host=`$PKG_CONFIG --host gpg-error 2>/dev/null || echo none` - if test x"$gpg_error_config_host" != xnone ; then - if test x"$gpg_error_config_host" != x"$host" ; then - AC_MSG_WARN([[ -@@ -107,10 +45,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], - fi - fi - else -- GPG_ERROR_CFLAGS="" -- GPG_ERROR_LIBS="" -- GPG_ERROR_MT_CFLAGS="" -- GPG_ERROR_MT_LIBS="" - AC_MSG_RESULT(no) - ifelse([$3], , :, [$3]) - fi diff --git a/poky/meta/recipes-support/pinentry/pinentry-1.1.1/gpg-error_pkconf.patch b/poky/meta/recipes-support/pinentry/pinentry-1.1.1/gpg-error_pkconf.patch new file mode 100644 index 000000000..537735dba --- /dev/null +++ b/poky/meta/recipes-support/pinentry/pinentry-1.1.1/gpg-error_pkconf.patch @@ -0,0 +1,177 @@ +From 7b60f1563ecdb7020c145de8a96cae1c0a66c595 Mon Sep 17 00:00:00 2001 +From: Armin Kuster <akuster@mvista.com> +Date: Fri, 2 Sep 2005 11:50:01 +0000 +Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and + +Convert to pkg-config support to match changes done to +the gpg-error recipe for gpg-error.pc generation. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + m4/gpg-error.m4 | 141 ++---------------------------------------------- + 1 file changed, 4 insertions(+), 137 deletions(-) + +diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 +index c9b235f..a4fd41c 100644 +--- a/m4/gpg-error.m4 ++++ b/m4/gpg-error.m4 +@@ -25,141 +25,12 @@ dnl config script does not match the host specification the script + dnl is added to the gpg_config_script_warn variable. + dnl + AC_DEFUN([AM_PATH_GPG_ERROR], +-[ AC_REQUIRE([AC_CANONICAL_HOST]) +- gpg_error_config_prefix="" +- dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, +- 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(libgpg-error-prefix, +- AS_HELP_STRING([--with-libgpg-error-prefix=PFX], +- [prefix where GPG Error is installed (optional)]), +- [gpg_error_config_prefix="$withval"]) +- +- dnl Accept --with-gpg-error-prefix and make it work the same as +- dnl --with-libgpg-error-prefix above, for backwards compatibility, +- dnl but do not document this old, inconsistently-named option. +- AC_ARG_WITH(gpg-error-prefix,, +- [gpg_error_config_prefix="$withval"]) +- +- if test x"${GPG_ERROR_CONFIG}" = x ; then +- if test x"${gpg_error_config_prefix}" != x ; then +- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" +- else +- case "${SYSROOT}" in +- /*) +- if test -x "${SYSROOT}/bin/gpg-error-config" ; then +- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" +- fi +- ;; +- '') +- ;; +- *) +- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) +- ;; +- esac +- fi +- fi +- +- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) +- min_gpg_error_version=ifelse([$1], ,1.33,$1) +- ok=no +- +- if test "$prefix" = NONE ; then +- prefix_option_expanded=/usr/local +- else +- prefix_option_expanded="$prefix" +- fi +- if test "$exec_prefix" = NONE ; then +- exec_prefix_option_expanded=$prefix_option_expanded +- else +- exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix) +- fi +- libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir) +- +- if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then +- gpgrt_libdir=$libdir_option_expanded +- else +- if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then +- if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then +- if test -f $possible_libdir/pkgconfig/gpg-error.pc; then +- gpgrt_libdir=$possible_libdir +- fi +- fi +- fi +- fi +- +- if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then +- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) +- if test "$GPGRT_CONFIG" = "no"; then +- unset GPGRT_CONFIG +- else +- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" +- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then +- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" +- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) +- gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` +- else +- unset GPGRT_CONFIG +- fi +- fi +- else +- gpg_error_config_version=`$GPG_ERROR_CONFIG --version` +- fi +- if test "$GPG_ERROR_CONFIG" != "no"; then +- req_major=`echo $min_gpg_error_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- req_minor=`echo $min_gpg_error_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- major=`echo $gpg_error_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` +- minor=`echo $gpg_error_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` +- if test "$major" -gt "$req_major"; then +- ok=yes +- else +- if test "$major" -eq "$req_major"; then +- if test "$minor" -ge "$req_minor"; then +- ok=yes +- fi +- fi +- fi +- if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then +- if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then +- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) +- if test "$GPGRT_CONFIG" = "no"; then +- unset GPGRT_CONFIG +- else +- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" +- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then +- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" +- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) +- else +- unset GPGRT_CONFIG +- fi +- fi +- fi +- fi +- fi +- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) ++[ ++ min_gpg_error_version=ifelse([$1], ,0.0,$1) ++ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version gpg-error], [ok=yes], [ok=no]) + if test $ok = yes; then +- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags` +- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs` +- if test -z "$GPGRT_CONFIG"; then +- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null` +- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null` +- else +- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null` +- GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS" +- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null` +- GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS" +- fi +- AC_MSG_RESULT([yes ($gpg_error_config_version)]) + ifelse([$2], , :, [$2]) +- if test -z "$GPGRT_CONFIG"; then +- gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none` +- else +- gpg_error_config_host=`$GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none` +- fi ++ gpg_error_config_host=`$PKG_CONFIG --host gpg-error 2>/dev/null || echo none` + if test x"$gpg_error_config_host" != xnone ; then + if test x"$gpg_error_config_host" != x"$host" ; then + AC_MSG_WARN([[ +@@ -174,10 +45,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], + fi + fi + else +- GPG_ERROR_CFLAGS="" +- GPG_ERROR_LIBS="" +- GPG_ERROR_MT_CFLAGS="" +- GPG_ERROR_MT_LIBS="" + AC_MSG_RESULT(no) + ifelse([$3], , :, [$3]) + fi diff --git a/poky/meta/recipes-support/pinentry/pinentry-1.1.0/libassuan_pkgconf.patch b/poky/meta/recipes-support/pinentry/pinentry-1.1.1/libassuan_pkgconf.patch index 11d564f35..f4aec2d1c 100644 --- a/poky/meta/recipes-support/pinentry/pinentry-1.1.0/libassuan_pkgconf.patch +++ b/poky/meta/recipes-support/pinentry/pinentry-1.1.1/libassuan_pkgconf.patch @@ -1,3 +1,8 @@ +From 26fb6c3faa27180c8ed9ada1728c3d8683a65f3a Mon Sep 17 00:00:00 2001 +From: Armin Kuster <akuster@mvista.com> +Date: Thu, 22 May 2014 10:50:00 +0100 +Subject: [PATCH] libassuan: Improve pkgconfig support + Convert to pkg-config support to match changes done to the libassuan recipe for libassuan.pc generation. @@ -5,55 +10,70 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster <akuster@mvista.com> -Index: pinentry-1.0.0/m4/libassuan.m4 -=================================================================== ---- pinentry-1.0.0.orig/m4/libassuan.m4 -+++ pinentry-1.0.0/m4/libassuan.m4 -@@ -13,34 +13,8 @@ dnl +--- + configure.ac | 4 +-- + m4/libassuan.m4 | 93 ++++--------------------------------------------- + 2 files changed, 9 insertions(+), 88 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d8dcc0c..ca51766 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -267,8 +267,8 @@ if test "$have_libassuan" = "yes"; then + [version of the libassuan library]) + fi + +-COMMON_CFLAGS="$LIBASSUAN_CFLAGS $COMMON_CFLAGS" +-COMMON_LIBS="$LIBASSUAN_LIBS $COMMON_LIBS" ++COMMON_CFLAGS="$LIBASSUAN_COMMON_CFLAGS $COMMON_CFLAGS" ++COMMON_LIBS="$LIBASSUAN_COMMON_LIBS $COMMON_LIBS" + + + dnl Checks for libsecmem. +diff --git a/m4/libassuan.m4 b/m4/libassuan.m4 +index df50484..2057412 100644 +--- a/m4/libassuan.m4 ++++ b/m4/libassuan.m4 +@@ -15,30 +15,8 @@ dnl dnl Common code used for libassuan detection [internal] dnl Returns ok set to yes or no. dnl -AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], -[ AC_REQUIRE([AC_CANONICAL_HOST]) - AC_ARG_WITH(libassuan-prefix, -- AC_HELP_STRING([--with-libassuan-prefix=PFX], +- AS_HELP_STRING([--with-libassuan-prefix=PFX], - [prefix where LIBASSUAN is installed (optional)]), - libassuan_config_prefix="$withval", libassuan_config_prefix="") - if test x$libassuan_config_prefix != x ; then -- libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix" - if test x${LIBASSUAN_CONFIG+set} != xset ; then - LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config - fi -- else -- case "${SYSROOT}" in -- /*) -- if test -x "${SYSROOT}/bin/libassuan-config" ; then -- LIBASSUAN_CONFIG="${SYSROOT}/bin/libassuan-config" -- fi -- ;; -- '') -- ;; -- *) -- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) -- ;; -- esac - fi - -- AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no) +- use_gpgrt_config="" +- if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if $GPGRT_CONFIG libassuan --exists; then +- LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan" +- AC_MSG_NOTICE([Use gpgrt-config as libassuan-config]) +- use_gpgrt_config=yes +- fi +- fi +- if test -z "$use_gpgrt_config"; then +- AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no) +- fi - +AC_DEFUN([AM_PATH_LIBASSUAN_COMMON], +[ tmp=ifelse([$1], ,1:0.9.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -50,51 +24,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -48,58 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], min_libassuan_version="$tmp" fi - AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) - ok=no -- if test "$LIBASSUAN_CONFIG" != "no" \ -- && test -f "$LIBASSUAN_CONFIG" ; then +- if test "$LIBASSUAN_CONFIG" != "no"; then - req_major=`echo $min_libassuan_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - req_minor=`echo $min_libassuan_version | \ @@ -61,7 +81,11 @@ Index: pinentry-1.0.0/m4/libassuan.m4 - req_micro=`echo $min_libassuan_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` - -- libassuan_config_version=`$LIBASSUAN_CONFIG --version` +- if test -z "$use_gpgrt_config"; then +- libassuan_config_version=`$LIBASSUAN_CONFIG --version` +- else +- libassuan_config_version=`$LIBASSUAN_CONFIG --modversion` +- fi - major=`echo $libassuan_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $libassuan_config_version | \ @@ -95,21 +119,29 @@ Index: pinentry-1.0.0/m4/libassuan.m4 if test $ok = yes; then if test "$req_libassuan_api" -gt 0 ; then -- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` +- if test -z "$use_gpgrt_config"; then +- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` +- else +- tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0` +- fi + tmp=`$PKG_CONFIG --variable=api_version libassuan 2>/dev/null || echo 0` if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([LIBASSUAN API version]) if test "$req_libassuan_api" -eq "$tmp" ; then -@@ -109,7 +43,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -114,11 +45,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], if test $ok = yes; then if test x"$host" != x ; then -- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none` +- if test -z "$use_gpgrt_config"; then +- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none` +- else +- libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none` +- fi + libassuan_config_host=`$PKG_CONFIG --host libassuan 2>/dev/null || echo 0` if test x"$libassuan_config_host" != xnone ; then if test x"$libassuan_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -132,7 +66,7 @@ dnl Test whether libassuan has at least +@@ -141,7 +68,7 @@ dnl Test whether libassuan has at least MINIMUM-VERSION. This is dnl used to test for features only available in newer versions. dnl AC_DEFUN([AM_CHECK_LIBASSUAN], @@ -118,15 +150,15 @@ Index: pinentry-1.0.0/m4/libassuan.m4 if test $ok = yes; then ifelse([$2], , :, [$2]) else -@@ -148,16 +82,10 @@ dnl [ACTION-IF-FOUND [ +@@ -157,16 +84,10 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS dnl AC_DEFUN([AM_PATH_LIBASSUAN], -[ _AM_PATH_LIBASSUAN_COMMON($1) +[ AM_PATH_LIBASSUAN_COMMON($1) if test $ok = yes; then -- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags` -- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs` +- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags` +- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs` ifelse([$2], , :, [$2]) else - LIBASSUAN_CFLAGS="" @@ -136,18 +168,3 @@ Index: pinentry-1.0.0/m4/libassuan.m4 - AC_SUBST(LIBASSUAN_CFLAGS) - AC_SUBST(LIBASSUAN_LIBS) ]) -Index: pinentry-1.0.0/configure.ac -=================================================================== ---- pinentry-1.0.0.orig/configure.ac -+++ pinentry-1.0.0/configure.ac -@@ -266,8 +266,8 @@ if test "$have_libassuan" = "yes"; then - [version of the libassuan library]) - fi - --COMMON_CFLAGS="$LIBASSUAN_CFLAGS $COMMON_CFLAGS" --COMMON_LIBS="$LIBASSUAN_LIBS $COMMON_LIBS" -+COMMON_CFLAGS="$LIBASSUAN_COMMON_CFLAGS $COMMON_CFLAGS" -+COMMON_LIBS="$LIBASSUAN_COMMON_LIBS $COMMON_LIBS" - - - dnl Checks for libsecmem. diff --git a/poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb b/poky/meta/recipes-support/pinentry/pinentry_1.1.1.bb index d9ca0732f..98577fe3e 100644 --- a/poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb +++ b/poky/meta/recipes-support/pinentry/pinentry_1.1.1.bb @@ -16,8 +16,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://gpg-error_pkconf.patch \ " -SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6" -SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570" +SRC_URI[sha256sum] = "cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f" inherit autotools pkgconfig diff --git a/poky/meta/recipes-support/popt/popt_1.18.bb b/poky/meta/recipes-support/popt/popt_1.18.bb index 022ece5f4..057c44f22 100644 --- a/poky/meta/recipes-support/popt/popt_1.18.bb +++ b/poky/meta/recipes-support/popt/popt_1.18.bb @@ -1,4 +1,5 @@ SUMMARY = "Library for parsing command line options" +DESCRIPTION = "Popt is a C library for parsing command line parameters. Popt was heavily influenced by the getopt() and getopt_long() functions, but it improves on them by allowing more powerful argument expansion. Popt can parse arbitrary argv[] style arrays and automatically set variables based on command line arguments." HOMEPAGE = "https://www.rpm.org/" SECTION = "libs" diff --git a/poky/meta/recipes-support/re2c/re2c_2.0.3.bb b/poky/meta/recipes-support/re2c/re2c_2.0.3.bb index a0b521ce5..ce04fd39e 100644 --- a/poky/meta/recipes-support/re2c/re2c_2.0.3.bb +++ b/poky/meta/recipes-support/re2c/re2c_2.0.3.bb @@ -1,5 +1,7 @@ SUMMARY = "Tool for writing very fast and very flexible scanners" -HOMEPAGE = "http://re2c.sourceforge.net/" +DESCRIPTION = "A free and open-source lexer generator for C, C++ and Go. It compiles regular expressions to determinisitic finite automata and encodes the automata in the form of a program in the target language. Unlike any other such tool, re2c focuses on generating high efficient code for regular expression matching. As a result this allows a much broader range of use than any traditional lexer." +HOMEPAGE = "http://re2c.org/" +BUGTRACKER = "https://github.com/skvadrik/re2c/issues" AUTHOR = "Marcus Börger <helly@users.sourceforge.net>" SECTION = "devel" LICENSE = "PD" diff --git a/poky/meta/recipes-support/rng-tools/rng-tools/0001-rngd-fix-debug-to-also-filter-syslog-calls.patch b/poky/meta/recipes-support/rng-tools/rng-tools/0001-rngd-fix-debug-to-also-filter-syslog-calls.patch deleted file mode 100644 index 073337866..000000000 --- a/poky/meta/recipes-support/rng-tools/rng-tools/0001-rngd-fix-debug-to-also-filter-syslog-calls.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 213a869e8315ead2c739acfcbde712358a842dee Mon Sep 17 00:00:00 2001 -From: Yann Dirson <yann@blade-group.com> -Date: Fri, 9 Oct 2020 15:12:26 +0200 -Subject: [PATCH] rngd: fix --debug to also filter syslog() calls - -Debug logs were only controlled by --debug flag while in --foreground -mode. In --daemon mode /var/log/message got stuffed with details of -entropy pool refilling, which is useless in production, and hamful -when log rotation then gets rid of the more useful logs. This is -especially true for embedded systems. - -This change makes the two modes consistently only produce debug logs when ---debug is specified. - -Upstream-Status: Backport [213a869e8315ead2c739acfcbde712358a842dee] - -Signed-off-by: Yann Dirson <yann@blade-group.com> ---- - rngd.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/rngd.h b/rngd.h -index 901b6f1..a79ea0f 100644 ---- a/rngd.h -+++ b/rngd.h -@@ -166,13 +166,13 @@ extern bool quiet; - #define message(priority,fmt,args...) do { \ - if (quiet) \ - break;\ -+ if (arguments->debug == false && LOG_PRI(priority) == LOG_DEBUG) \ -+ break;\ - if (am_daemon) { \ - syslog((priority), fmt, ##args); \ - } else if (!msg_squash) { \ -- if ((LOG_PRI(priority) != LOG_DEBUG) || (arguments->debug == true)) {\ -- fprintf(stderr, fmt, ##args); \ -- fflush(stderr); \ -- } \ -+ fprintf(stderr, fmt, ##args); \ -+ fflush(stderr); \ - } \ - } while (0) - --- -2.28.0 - diff --git a/poky/meta/recipes-support/rng-tools/rng-tools/a4b6d9ce64f132e463b9091d0536913ddaf11516.patch b/poky/meta/recipes-support/rng-tools/rng-tools/a4b6d9ce64f132e463b9091d0536913ddaf11516.patch deleted file mode 100644 index 96301617b..000000000 --- a/poky/meta/recipes-support/rng-tools/rng-tools/a4b6d9ce64f132e463b9091d0536913ddaf11516.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a4b6d9ce64f132e463b9091d0536913ddaf11516 Mon Sep 17 00:00:00 2001 -From: Neil Horman <nhorman@tuxdriver.com> -Date: Thu, 30 Apr 2020 16:57:35 -0400 -Subject: [PATCH] Remove name conflict with libc encrypt -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Forgot to fixup the funciton name conflict with libcs encrypt() function -on power systems - -Upstream-Status: Backport [https://github.com/nhorman/rng-tools/commit/a4b6d9ce64f132e463b9091d0536913ddaf11516] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> -Signed-off-by: Neil Horman <nhorman@tuxdriver.com> -Reported-by: Natanael Copa <ncopa@alpinelinux.org> -Reported-by: "Milan P. Stanić" <mps@arvanta.net> ---- - rngd_darn.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rngd_darn.c b/rngd_darn.c -index 35df7a1..9345895 100644 ---- a/rngd_darn.c -+++ b/rngd_darn.c -@@ -109,7 +109,7 @@ static int init_openssl(struct rng *ent_src) - return 0; - } - --int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, -+static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, - unsigned char *iv, unsigned char *ciphertext) - { - int len; -@@ -150,7 +150,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src) - unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS]; - - /* Encrypt the plaintext */ -- ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf, -+ ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf, - ciphertext); - printf("Calling mangle with len %d\n", ciphertext_len); - if (!ciphertext_len) diff --git a/poky/meta/recipes-support/rng-tools/rng-tools/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch b/poky/meta/recipes-support/rng-tools/rng-tools/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch deleted file mode 100644 index 93103ef79..000000000 --- a/poky/meta/recipes-support/rng-tools/rng-tools/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch +++ /dev/null @@ -1,51 +0,0 @@ -From dab16a5fd4efde8ef569b358e19b1fcbc7d0d938 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Mon, 30 Mar 2020 00:10:46 +0200 -Subject: [PATCH] rngd_jitter: disambiguate call to encrypt - -Commit 0f184ea7e792427fb20afe81d471b565aee96f0b disambiguate the call to -encrypt in rngd_rdrand.c but did not update rngd_jitter.c. - -This raise the following build failure: - -rngd_jitter.c:75:12: error: conflicting types for 'encrypt' - static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, - ^~~~~~~ -In file included from rngd_jitter.c:27: -/home/dawncrow/buildroot-test/scripts/instance-0/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/unistd.h:1132:13: note: previous declaration of 'encrypt' was here - extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1)); - ^~~~~~~ -Makefile:770: recipe for target 'rngd-rngd_jitter.o' failed - -Fixes: - - http://autobuild.buildroot.org/results/0ca6bf16e3acbc94065b88c4442d6595424b77cb - -Upstream-Status: Backport [https://github.com/nhorman/rng-tools/commit/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - rngd_jitter.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rngd_jitter.c b/rngd_jitter.c -index c1b1aca..49a3825 100644 ---- a/rngd_jitter.c -+++ b/rngd_jitter.c -@@ -72,7 +72,7 @@ unsigned char *aes_buf; - char key[AES_BLOCK]; - static unsigned char iv_buf[CHUNK_SIZE] __attribute__((aligned(128))); - --static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, -+static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, - unsigned char *iv, unsigned char *ciphertext) - { - EVP_CIPHER_CTX *ctx; -@@ -122,7 +122,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src) - unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS]; - - /* Encrypt the plaintext */ -- ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf, -+ ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf, - ciphertext); - if (!ciphertext_len) - return -1; diff --git a/poky/meta/recipes-support/rng-tools/rng-tools_6.10.bb b/poky/meta/recipes-support/rng-tools/rng-tools_6.11.bb index 40ec5ad67..61a0cef2e 100644 --- a/poky/meta/recipes-support/rng-tools/rng-tools_6.10.bb +++ b/poky/meta/recipes-support/rng-tools/rng-tools_6.11.bb @@ -10,14 +10,11 @@ DEPENDS = "sysfsutils openssl" SRC_URI = "\ git://github.com/nhorman/rng-tools.git \ - file://a4b6d9ce64f132e463b9091d0536913ddaf11516.patch \ - file://dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch \ - file://0001-rngd-fix-debug-to-also-filter-syslog-calls.patch \ file://init \ file://default \ file://rngd.service \ " -SRCREV = "0be82200a66d9321451e0a0785bfae350b9cffdc" +SRCREV = "2ea13473fd5bfea3c861dc0e23bd65e2afe8007b" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-support/serf/serf_1.3.9.bb b/poky/meta/recipes-support/serf/serf_1.3.9.bb index 2fbf96f99..dc917fa16 100644 --- a/poky/meta/recipes-support/serf/serf_1.3.9.bb +++ b/poky/meta/recipes-support/serf/serf_1.3.9.bb @@ -1,4 +1,8 @@ SUMMARY = "High-Performance Asynchronous HTTP Client Library" +DESCRIPTION = "The Apache Serf library is a C-based HTTP client library built upon the Apache \ +Portable Runtime (APR) library. It multiplexes connections, running the \ +read/write communication asynchronously. Memory copies and transformations are \ +kept to a minimum to provide high performance operation." SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://norpath.patch \ file://env.patch \ diff --git a/poky/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb b/poky/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb index e82c818e5..ff32259d8 100644 --- a/poky/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb +++ b/poky/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb @@ -1,4 +1,5 @@ SUMMARY = "Shared MIME type database and specification" +DESCRIPTION = "The shared-mime-info package contains the core database of common types and the update-mime-database command used to extend it. It requires glib2 to be installed for building the update command. Additionally, it uses intltool for translations, though this is only a dependency for the maintainers." HOMEPAGE = "http://freedesktop.org/wiki/Software/shared-mime-info" SECTION = "base" @@ -8,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native xmlto-native" SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https" -SRCREV = "ef58b2b2f7ad4070171c6e45e3b3764daa3ff2c1" -PV = "2.0" +SRCREV = "18e558fa1c8b90b86757ade09a4ba4d6a6cf8f70" +PV = "2.1" S = "${WORKDIR}/git" inherit meson pkgconfig gettext python3native mime diff --git a/poky/meta/recipes-support/sqlite/sqlite3.inc b/poky/meta/recipes-support/sqlite/sqlite3.inc index 07614bdb3..1adc0eba6 100644 --- a/poky/meta/recipes-support/sqlite/sqlite3.inc +++ b/poky/meta/recipes-support/sqlite/sqlite3.inc @@ -1,4 +1,5 @@ SUMMARY = "Embeddable SQL database engine" +DESCRIPTION = "A library that implements a small, fast, self-contained, high-reliability, full-featured, SQL database engine. SQLite is the most used database engine in the world. SQLite is built into all mobile phones and most computers and comes bundled inside countless other applications that people use every day" HOMEPAGE = "http://www.sqlite.org" SECTION = "libs" diff --git a/poky/meta/recipes-support/sqlite/sqlite3_3.34.0.bb b/poky/meta/recipes-support/sqlite/sqlite3_3.34.1.bb index 19996fc06..fe5adb221 100644 --- a/poky/meta/recipes-support/sqlite/sqlite3_3.34.0.bb +++ b/poky/meta/recipes-support/sqlite/sqlite3_3.34.1.bb @@ -3,8 +3,8 @@ 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" +SRC_URI = "http://www.sqlite.org/2021/sqlite-autoconf-${SQLITE_PV}.tar.gz" +SRC_URI[sha256sum] = "2a3bca581117b3b88e5361d0ef3803ba6d8da604b1c1a47d902ef785c1b53e89" # -19242 is only an issue in specific development branch commits CVE_CHECK_WHITELIST += "CVE-2019-19242" diff --git a/poky/meta/recipes-support/taglib/taglib_1.11.1.bb b/poky/meta/recipes-support/taglib/taglib_1.11.1.bb index f4e288295..165bccadc 100644 --- a/poky/meta/recipes-support/taglib/taglib_1.11.1.bb +++ b/poky/meta/recipes-support/taglib/taglib_1.11.1.bb @@ -1,4 +1,5 @@ SUMMARY = "Library for reading and editing the meta-data of popular audio formats" +DESCRIPTION = "Platform-independent library (tested on Windows/Linux) for reading and writing metadata in media files, including video, audio, and photo formats. This is a convenient one-stop-shop to present or tag all your media collection, regardless of which format/container these might use. You can read/write the standard or more common tags/properties of a media, or you can also create and retrieve your own custom tags." SECTION = "libs/multimedia" HOMEPAGE = "http://taglib.github.io/" LICENSE = "LGPLv2.1 | MPL-1.1" diff --git a/poky/meta/recipes-support/vim/files/racefix.patch b/poky/meta/recipes-support/vim/files/racefix.patch new file mode 100644 index 000000000..48dca44ca --- /dev/null +++ b/poky/meta/recipes-support/vim/files/racefix.patch @@ -0,0 +1,33 @@ +The creation of the LINGUAS file is duplicated for each desktop file +which can lead the commands to race against each other. Rework +the makefile to avoid this as the expense of leaving the file on disk. + +Upstream-Status: Pending +RP 2021/2/15 + +Index: git/src/po/Makefile +=================================================================== +--- git.orig/src/po/Makefile ++++ git/src/po/Makefile +@@ -165,17 +165,16 @@ $(PACKAGE).pot: ../*.c ../if_perl.xs ../ + po/gvim.desktop.in po/vim.desktop.in + mv -f ../$(PACKAGE).po $(PACKAGE).pot + +-vim.desktop: vim.desktop.in $(POFILES) ++LINGUAS: + echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS ++ ++vim.desktop: vim.desktop.in $(POFILES) LINGUAS + $(MSGFMT) --desktop -d . --template vim.desktop.in -o tmp_vim.desktop +- rm -f LINGUAS + if command -v desktop-file-validate; then desktop-file-validate tmp_vim.desktop; fi + mv tmp_vim.desktop vim.desktop + +-gvim.desktop: gvim.desktop.in $(POFILES) +- echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS ++gvim.desktop: gvim.desktop.in $(POFILES) LINGUAS + $(MSGFMT) --desktop -d . --template gvim.desktop.in -o tmp_gvim.desktop +- rm -f LINGUAS + if command -v desktop-file-validate; then desktop-file-validate tmp_gvim.desktop; fi + mv tmp_gvim.desktop gvim.desktop + diff --git a/poky/meta/recipes-support/vim/vim.inc b/poky/meta/recipes-support/vim/vim.inc index 4d2886c19..878d0f18a 100644 --- a/poky/meta/recipes-support/vim/vim.inc +++ b/poky/meta/recipes-support/vim/vim.inc @@ -1,6 +1,10 @@ SUMMARY = "Vi IMproved - enhanced vi editor" +DESCRIPTION = "Vim is a greatly improved version of the good old UNIX editor Vi. Many new features have been added: multi-level undo, syntax highlighting, command line history, on-line help, spell checking, filename completion, block operations, script language, etc. There is also a Graphical User Interface (GUI) available." SECTION = "console/utils" +HOMEPAGE = "https://www.vim.org/" +BUGTRACKER = "https://github.com/vim/vim/issues" + DEPENDS = "ncurses gettext-native" # vimdiff doesn't like busybox diff RSUGGESTS_${PN} = "diffutils" @@ -12,6 +16,7 @@ SRC_URI = "git://github.com/vim/vim.git \ file://vim-add-knob-whether-elf.h-are-checked.patch \ file://0001-src-Makefile-improve-reproducibility.patch \ file://no-path-adjust.patch \ + file://racefix.patch \ " SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" @@ -68,8 +73,10 @@ EXTRA_OECONF = " \ --disable-gtktest \ --disable-xim \ --disable-netbeans \ + --disable-desktop-database-update \ --with-tlib=ncurses \ ac_cv_small_wchar_t=no \ + ac_cv_path_GLIB_COMPILE_RESOURCES=no \ vim_cv_getcwd_broken=no \ vim_cv_memmove_handles_overlap=yes \ vim_cv_stat_ignores_slash=no \ diff --git a/poky/meta/recipes-support/vte/vte_0.62.1.bb b/poky/meta/recipes-support/vte/vte_0.62.2.bb index 1a8e21dec..a2164f43d 100644 --- a/poky/meta/recipes-support/vte/vte_0.62.1.bb +++ b/poky/meta/recipes-support/vte/vte_0.62.2.bb @@ -1,4 +1,6 @@ SUMMARY = "Virtual terminal emulator GTK+ widget library" +DESCRIPTION = "VTE provides a virtual terminal widget for GTK applications." +HOMEPAGE = "https://wiki.gnome.org/Apps/Terminal/VTE" BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" LICENSE = "GPLv3 & LGPLv3+ & LGPLv2.1+" LICENSE_libvte = "LGPLv3+" @@ -18,7 +20,7 @@ inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-intros # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" -SRC_URI[archive.sha256sum] = "c369e87c0c8284e09109d0a9aac821f543558f51c0cb9c7acfff3df64153308d" +SRC_URI[archive.sha256sum] = "b0300bbcf0c02df5812a10a3cb8e4fff723bab92c08c97a0a90c167cf543aff0" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/poky/scripts/lib/devtool/standard.py b/poky/scripts/lib/devtool/standard.py index 261d642d4..7b62b7e7b 100644 --- a/poky/scripts/lib/devtool/standard.py +++ b/poky/scripts/lib/devtool/standard.py @@ -474,7 +474,11 @@ def symlink_oelocal_files_srctree(rd,srctree): destpth = os.path.join(srctree, relpth, fn) if os.path.exists(destpth): os.unlink(destpth) - os.symlink('oe-local-files/%s' % fn, destpth) + if relpth != '.': + back_relpth = os.path.relpath(local_files_dir, root) + os.symlink('%s/oe-local-files/%s/%s' % (back_relpth, relpth, fn), destpth) + else: + os.symlink('oe-local-files/%s' % fn, destpth) addfiles.append(os.path.join(relpth, fn)) if addfiles: bb.process.run('git add %s' % ' '.join(addfiles), cwd=srctree) @@ -589,6 +593,16 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works else: task = 'do_patch' + if 'noexec' in (d.getVarFlags(task, False) or []) or 'task' not in (d.getVarFlags(task, False) or []): + logger.info('The %s recipe has %s disabled. Running only ' + 'do_configure task dependencies' % (pn, task)) + + if 'depends' in d.getVarFlags('do_configure', False): + pn = d.getVarFlags('do_configure', False)['depends'] + pn = pn.replace('${PV}', d.getVar('PV')) + pn = pn.replace('${COMPILERDEP}', d.getVar('COMPILERDEP')) + task = None + # Run the fetch + unpack tasks res = tinfoil.build_targets(pn, task, @@ -600,6 +614,17 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works if not res: raise DevtoolError('Extracting source for %s failed' % pn) + if not is_kernel_yocto and ('noexec' in (d.getVarFlags('do_patch', False) or []) or 'task' not in (d.getVarFlags('do_patch', False) or [])): + workshareddir = d.getVar('S') + if os.path.islink(srctree): + os.unlink(srctree) + + os.symlink(workshareddir, srctree) + + # The initial_rev file is created in devtool_post_unpack function that will not be executed if + # do_unpack/do_patch tasks are disabled so we have to directly say that source extraction was successful + return True, True + try: with open(os.path.join(tempdir, 'initial_rev'), 'r') as f: initial_rev = f.read() @@ -847,10 +872,11 @@ def modify(args, config, basepath, workspace): if not initial_rev: return 1 logger.info('Source tree extracted to %s' % srctree) - # Get list of commits since this revision - (stdout, _) = bb.process.run('git rev-list --reverse %s..HEAD' % initial_rev, cwd=srctree) - commits = stdout.split() - check_commits = True + if os.path.exists(os.path.join(srctree, '.git')): + # Get list of commits since this revision + (stdout, _) = bb.process.run('git rev-list --reverse %s..HEAD' % initial_rev, cwd=srctree) + commits = stdout.split() + check_commits = True else: if os.path.exists(os.path.join(srctree, '.git')): # Check if it's a tree previously extracted by us. This is done diff --git a/poky/scripts/lib/recipetool/create_npm.py b/poky/scripts/lib/recipetool/create_npm.py index 579b7ae48..2bcae91df 100644 --- a/poky/scripts/lib/recipetool/create_npm.py +++ b/poky/scripts/lib/recipetool/create_npm.py @@ -204,6 +204,9 @@ class NpmRecipeHandler(RecipeHandler): self._run_npm_install(d, srctree, registry, dev) shrinkwrap_file = self._generate_shrinkwrap(d, srctree, dev) + with open(shrinkwrap_file, "r") as f: + shrinkwrap = json.load(f) + if os.path.exists(lock_copy): bb.utils.movefile(lock_copy, lock_file) @@ -226,7 +229,8 @@ class NpmRecipeHandler(RecipeHandler): value = origvalue.replace("version=" + data["version"], "version=${PV}") value = value.replace("version=latest", "version=${PV}") values = [line.strip() for line in value.strip('\n').splitlines()] - values.append(url_recipe) + if "dependencies" in shrinkwrap: + values.append(url_recipe) return values, None, 4, False (_, newlines) = bb.utils.edit_metadata(lines_before, ["SRC_URI"], _handle_srcuri) diff --git a/poky/scripts/lib/wic/canned-wks/common.wks.inc b/poky/scripts/lib/wic/canned-wks/common.wks.inc index 89880b417..4fd29fa8c 100644 --- a/poky/scripts/lib/wic/canned-wks/common.wks.inc +++ b/poky/scripts/lib/wic/canned-wks/common.wks.inc @@ -1,3 +1,3 @@ # This file is included into 3 canned wks files from this directory part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 -part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024 +part / --source rootfs --use-uuid --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 diff --git a/poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks b/poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks index 8d7d8de6e..cf16c0c30 100644 --- a/poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks +++ b/poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks @@ -4,7 +4,7 @@ part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid +part / --source rootfs --ondisk sda --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid bootloader --ptable gpt --timeout=0 --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0 console=ttyS0,115200n8" diff --git a/poky/scripts/lib/wic/canned-wks/mkefidisk.wks b/poky/scripts/lib/wic/canned-wks/mkefidisk.wks index 9f534fe18..d1878e23e 100644 --- a/poky/scripts/lib/wic/canned-wks/mkefidisk.wks +++ b/poky/scripts/lib/wic/canned-wks/mkefidisk.wks @@ -4,7 +4,7 @@ part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --ondisk sda --label msdos --active --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid +part / --source rootfs --ondisk sda --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid part swap --ondisk sda --size 44 --label swap1 --fstype=swap diff --git a/poky/scripts/lib/wic/misc.py b/poky/scripts/lib/wic/misc.py index 4b08d649c..57c042c50 100644 --- a/poky/scripts/lib/wic/misc.py +++ b/poky/scripts/lib/wic/misc.py @@ -26,6 +26,7 @@ logger = logging.getLogger('wic') # executable -> recipe pairs for exec_native_cmd NATIVE_RECIPES = {"bmaptool": "bmap-tools", + "dumpe2fs": "e2fsprogs", "grub-mkimage": "grub-efi", "isohybrid": "syslinux", "mcopy": "mtools", @@ -138,9 +139,12 @@ def exec_native_cmd(cmd_and_args, native_sysroot, pseudo=""): if pseudo: cmd_and_args = pseudo + cmd_and_args - native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/bin" % \ + hosttools_dir = get_bitbake_var("HOSTTOOLS_DIR") + + native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/bin:%s" % \ (native_sysroot, native_sysroot, - native_sysroot, native_sysroot) + native_sysroot, native_sysroot, + hosttools_dir) native_cmd_and_args = "export PATH=%s:$PATH;%s" % \ (native_paths, cmd_and_args) diff --git a/poky/scripts/lib/wic/partition.py b/poky/scripts/lib/wic/partition.py index 286c7867c..76d144d12 100644 --- a/poky/scripts/lib/wic/partition.py +++ b/poky/scripts/lib/wic/partition.py @@ -54,6 +54,9 @@ class Partition(): self.uuid = args.uuid self.fsuuid = args.fsuuid self.type = args.type + self.updated_fstab_path = None + self.has_fstab = False + self.update_fstab_in_rootfs = False self.lineno = lineno self.source_file = "" @@ -118,11 +121,15 @@ class Partition(): return self.fixed_size if self.fixed_size else self.size def prepare(self, creator, cr_workdir, oe_builddir, rootfs_dir, - bootimg_dir, kernel_dir, native_sysroot): + bootimg_dir, kernel_dir, native_sysroot, updated_fstab_path): """ Prepare content for individual partitions, depending on partition command parameters. """ + self.updated_fstab_path = updated_fstab_path + if self.updated_fstab_path and not (self.fstype.startswith("ext") or self.fstype == "msdos"): + self.update_fstab_in_rootfs = True + if not self.source: if not self.size and not self.fixed_size: raise WicError("The %s partition has a size of zero. Please " @@ -247,7 +254,7 @@ class Partition(): prefix = "ext" if self.fstype.startswith("ext") else self.fstype method = getattr(self, "prepare_rootfs_" + prefix) - method(rootfs, oe_builddir, rootfs_dir, native_sysroot, pseudo) + method(rootfs, cr_workdir, oe_builddir, rootfs_dir, native_sysroot, pseudo) self.source_file = rootfs # get the rootfs size in the right units for kickstart (kB) @@ -255,7 +262,7 @@ class Partition(): out = exec_cmd(du_cmd) self.size = int(out.split()[0]) - def prepare_rootfs_ext(self, rootfs, oe_builddir, rootfs_dir, + def prepare_rootfs_ext(self, rootfs, cr_workdir, oe_builddir, rootfs_dir, native_sysroot, pseudo): """ Prepare content for an ext2/3/4 rootfs partition. @@ -279,10 +286,21 @@ class Partition(): (self.fstype, extraopts, rootfs, label_str, self.fsuuid, rootfs_dir) exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo) + if self.updated_fstab_path and self.has_fstab: + debugfs_script_path = os.path.join(cr_workdir, "debugfs_script") + with open(debugfs_script_path, "w") as f: + f.write("cd etc\n") + f.write("rm fstab\n") + f.write("write %s fstab\n" % (self.updated_fstab_path)) + debugfs_cmd = "debugfs -w -f %s %s" % (debugfs_script_path, rootfs) + exec_native_cmd(debugfs_cmd, native_sysroot) + mkfs_cmd = "fsck.%s -pvfD %s" % (self.fstype, rootfs) exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo) - def prepare_rootfs_btrfs(self, rootfs, oe_builddir, rootfs_dir, + self.check_for_Y2038_problem(rootfs, native_sysroot) + + def prepare_rootfs_btrfs(self, rootfs, cr_workdir, oe_builddir, rootfs_dir, native_sysroot, pseudo): """ Prepare content for a btrfs rootfs partition. @@ -305,7 +323,7 @@ class Partition(): self.mkfs_extraopts, self.fsuuid, rootfs) exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo) - def prepare_rootfs_msdos(self, rootfs, oe_builddir, rootfs_dir, + def prepare_rootfs_msdos(self, rootfs, cr_workdir, oe_builddir, rootfs_dir, native_sysroot, pseudo): """ Prepare content for a msdos/vfat rootfs partition. @@ -321,8 +339,6 @@ class Partition(): label_str = "-n %s" % self.label size_str = "" - if self.fstype == 'msdos': - size_str = "-F 16" # FAT 16 extraopts = self.mkfs_extraopts or '-S 512' @@ -334,12 +350,16 @@ class Partition(): mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (rootfs, rootfs_dir) exec_native_cmd(mcopy_cmd, native_sysroot) + if self.updated_fstab_path and self.has_fstab: + mcopy_cmd = "mcopy -i %s %s ::/etc/fstab" % (rootfs, self.updated_fstab_path) + exec_native_cmd(mcopy_cmd, native_sysroot) + chmod_cmd = "chmod 644 %s" % rootfs exec_cmd(chmod_cmd) prepare_rootfs_vfat = prepare_rootfs_msdos - def prepare_rootfs_squashfs(self, rootfs, oe_builddir, rootfs_dir, + def prepare_rootfs_squashfs(self, rootfs, cr_workdir, oe_builddir, rootfs_dir, native_sysroot, pseudo): """ Prepare content for a squashfs rootfs partition. @@ -368,6 +388,8 @@ class Partition(): (self.fstype, extraopts, label_str, self.fsuuid, rootfs) exec_native_cmd(mkfs_cmd, native_sysroot) + self.check_for_Y2038_problem(rootfs, native_sysroot) + def prepare_empty_partition_btrfs(self, rootfs, oe_builddir, native_sysroot): """ @@ -398,8 +420,6 @@ class Partition(): label_str = "-n %s" % self.label size_str = "" - if self.fstype == 'msdos': - size_str = "-F 16" # FAT 16 extraopts = self.mkfs_extraopts or '-S 512' @@ -429,3 +449,37 @@ class Partition(): mkswap_cmd = "mkswap %s -U %s %s" % (label_str, self.fsuuid, path) exec_native_cmd(mkswap_cmd, native_sysroot) + + def check_for_Y2038_problem(self, rootfs, native_sysroot): + """ + Check if the filesystem is affected by the Y2038 problem + (Y2038 problem = 32 bit time_t overflow in January 2038) + """ + def get_err_str(part): + err = "The {} filesystem {} has no Y2038 support." + if part.mountpoint: + args = [part.fstype, "mounted at %s" % part.mountpoint] + elif part.label: + args = [part.fstype, "labeled '%s'" % part.label] + elif part.part_name: + args = [part.fstype, "in partition '%s'" % part.part_name] + else: + args = [part.fstype, "in partition %s" % part.num] + return err.format(*args) + + # ext2 and ext3 are always affected by the Y2038 problem + if self.fstype in ["ext2", "ext3"]: + logger.warn(get_err_str(self)) + return + + ret, out = exec_native_cmd("dumpe2fs %s" % rootfs, native_sysroot) + + # if ext4 is affected by the Y2038 problem depends on the inode size + for line in out.splitlines(): + if line.startswith("Inode size:"): + size = int(line.split(":")[1].strip()) + if size < 256: + logger.warn("%s Inodes (of size %d) are too small." % + (get_err_str(self), size)) + break + diff --git a/poky/scripts/lib/wic/plugins/imager/direct.py b/poky/scripts/lib/wic/plugins/imager/direct.py index 0ca67b77d..ea709e8c5 100644 --- a/poky/scripts/lib/wic/plugins/imager/direct.py +++ b/poky/scripts/lib/wic/plugins/imager/direct.py @@ -54,15 +54,16 @@ class DirectPlugin(ImagerPlugin): self.native_sysroot = native_sysroot self.oe_builddir = oe_builddir + self.debug = options.debug self.outdir = options.outdir self.compressor = options.compressor self.bmap = options.bmap self.no_fstab_update = options.no_fstab_update - self.original_fstab = None + self.updated_fstab_path = None self.name = "%s-%s" % (os.path.splitext(os.path.basename(wks_file))[0], strftime("%Y%m%d%H%M")) - self.workdir = tempfile.mkdtemp(dir=self.outdir, prefix='tmp.wic.') + self.workdir = self.setup_workdir(options.workdir) self._image = None self.ptable_format = self.ks.bootloader.ptable self.parts = self.ks.partitions @@ -78,6 +79,16 @@ class DirectPlugin(ImagerPlugin): self._image = PartitionedImage(image_path, self.ptable_format, self.parts, self.native_sysroot) + def setup_workdir(self, workdir): + if workdir: + if os.path.exists(workdir): + raise WicError("Internal workdir '%s' specified in wic arguments already exists!" % (workdir)) + + os.makedirs(workdir) + return workdir + else: + return tempfile.mkdtemp(dir=self.outdir, prefix='tmp.wic.') + def do_create(self): """ Plugin entry point. @@ -90,11 +101,8 @@ class DirectPlugin(ImagerPlugin): finally: self.cleanup() - def _write_fstab(self, image_rootfs): - """overriden to generate fstab (temporarily) in rootfs. This is called - from _create, make sure it doesn't get called from - BaseImage.create() - """ + def update_fstab(self, image_rootfs): + """Assume partition order same as in wks""" if not image_rootfs: return @@ -104,18 +112,9 @@ class DirectPlugin(ImagerPlugin): with open(fstab_path) as fstab: fstab_lines = fstab.readlines() - self.original_fstab = fstab_lines.copy() - if self._update_fstab(fstab_lines, self.parts): - with open(fstab_path, "w") as fstab: - fstab.writelines(fstab_lines) - else: - self.original_fstab = None - - def _update_fstab(self, fstab_lines, parts): - """Assume partition order same as in wks""" updated = False - for part in parts: + for part in self.parts: if not part.realnum or not part.mountpoint \ or part.mountpoint == "/": continue @@ -144,7 +143,10 @@ class DirectPlugin(ImagerPlugin): fstab_lines.append(line) updated = True - return updated + if updated: + self.updated_fstab_path = os.path.join(self.workdir, "fstab") + with open(self.updated_fstab_path, "w") as f: + f.writelines(fstab_lines) def _full_path(self, path, name, extention): """ Construct full file path to a file we generate. """ @@ -160,7 +162,7 @@ class DirectPlugin(ImagerPlugin): a partitioned image. """ if not self.no_fstab_update: - self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) + self.update_fstab(self.rootfs_dir.get("ROOTFS_DIR")) for part in self.parts: # get rootfs size from bitbake variable if it's not set in .ks file @@ -273,14 +275,9 @@ class DirectPlugin(ImagerPlugin): if os.path.isfile(path): shutil.move(path, os.path.join(self.outdir, fname)) - #Restore original fstab - if self.original_fstab: - fstab_path = self.rootfs_dir.get("ROOTFS_DIR") + "/etc/fstab" - with open(fstab_path, "w") as fstab: - fstab.writelines(self.original_fstab) - - # remove work directory - shutil.rmtree(self.workdir, ignore_errors=True) + # remove work directory when it is not in debugging mode + if not self.debug: + shutil.rmtree(self.workdir, ignore_errors=True) # Overhead of the MBR partitioning scheme (just one sector) MBR_OVERHEAD = 1 @@ -358,7 +355,8 @@ class PartitionedImage(): # sizes before we can add them and do the layout. part.prepare(imager, imager.workdir, imager.oe_builddir, imager.rootfs_dir, imager.bootimg_dir, - imager.kernel_dir, imager.native_sysroot) + imager.kernel_dir, imager.native_sysroot, + imager.updated_fstab_path) # Converting kB to sectors for parted part.size_sec = part.disk_size * 1024 // self.sector_size diff --git a/poky/scripts/lib/wic/plugins/source/rootfs.py b/poky/scripts/lib/wic/plugins/source/rootfs.py index f1db83f8a..96d940a91 100644 --- a/poky/scripts/lib/wic/plugins/source/rootfs.py +++ b/poky/scripts/lib/wic/plugins/source/rootfs.py @@ -94,6 +94,7 @@ class RootfsPlugin(SourcePlugin): "it is not a valid path, exiting" % part.rootfs_dir) part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir) + part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab")) pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo") if not os.path.lexists(pseudo_dir): logger.warn("%s folder does not exist. " @@ -103,9 +104,9 @@ class RootfsPlugin(SourcePlugin): new_rootfs = None new_pseudo = None # Handle excluded paths. - if part.exclude_path or part.include_path or part.change_directory: - # We need a new rootfs directory we can delete files from. Copy to - # workdir. + if part.exclude_path or part.include_path or part.change_directory or part.update_fstab_in_rootfs: + # We need a new rootfs directory we can safely modify without + # interfering with other tasks. Copy to workdir. new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno)) if os.path.lexists(new_rootfs): @@ -199,17 +200,33 @@ class RootfsPlugin(SourcePlugin): if not os.path.lexists(full_path): continue + if new_pseudo: + pseudo = cls.__get_pseudo(native_sysroot, new_rootfs, new_pseudo) + else: + pseudo = None if path.endswith(os.sep): # Delete content only. for entry in os.listdir(full_path): full_entry = os.path.join(full_path, entry) - if os.path.isdir(full_entry) and not os.path.islink(full_entry): - shutil.rmtree(full_entry) - else: - os.remove(full_entry) + rm_cmd = "rm -rf %s" % (full_entry) + exec_native_cmd(rm_cmd, native_sysroot, pseudo) else: # Delete whole directory. - shutil.rmtree(full_path) + rm_cmd = "rm -rf %s" % (full_path) + exec_native_cmd(rm_cmd, native_sysroot, pseudo) + + # Update part.has_fstab here as fstab may have been added or + # removed by the above modifications. + part.has_fstab = os.path.exists(os.path.join(new_rootfs, "etc/fstab")) + if part.update_fstab_in_rootfs and part.has_fstab: + fstab_path = os.path.join(new_rootfs, "etc/fstab") + # Assume that fstab should always be owned by root with fixed permissions + install_cmd = "install -m 0644 %s %s" % (part.updated_fstab_path, fstab_path) + if new_pseudo: + pseudo = cls.__get_pseudo(native_sysroot, new_rootfs, new_pseudo) + else: + pseudo = None + exec_native_cmd(install_cmd, native_sysroot, pseudo) part.prepare_rootfs(cr_workdir, oe_builddir, new_rootfs or part.rootfs_dir, native_sysroot, diff --git a/poky/scripts/oe-debuginfod b/poky/scripts/oe-debuginfod new file mode 100755 index 000000000..967dd5807 --- /dev/null +++ b/poky/scripts/oe-debuginfod @@ -0,0 +1,31 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: MIT +# + +import os +import sys +scripts_path = os.path.dirname(os.path.realpath(__file__)) +lib_path = scripts_path + "/lib" +sys.path.insert(0, lib_path) +import scriptpath +scriptpath.add_bitbake_lib_path() + +import bb.tinfoil +import subprocess + +if __name__ == "__main__": + with bb.tinfoil.Tinfoil() as tinfoil: + tinfoil.prepare(config_only=True) + package_classes_var = "DEPLOY_DIR_" + tinfoil.config_data.getVar("PACKAGE_CLASSES").split()[0].replace("package_", "").upper() + feed_dir = tinfoil.config_data.getVar(package_classes_var, expand=True) + + try: + if package_classes_var == "DEPLOY_DIR_RPM": + subprocess.check_output(subprocess.run(['oe-run-native', 'elfutils-native', 'debuginfod', '--verbose', '-R', feed_dir])) + else: + subprocess.check_output(subprocess.run(['oe-run-native', 'elfutils-native', 'debuginfod', '--verbose', '-U', feed_dir])) + except subprocess.CalledProcessError: + print("\nTo use the debuginfod server Please ensure that this variable PACKAGECONFIG_pn-elfutils-native = \"debuginfod libdebuginfod\" is set in the local.conf") + except KeyboardInterrupt: + sys.exit(1) diff --git a/poky/scripts/oe-pkgdata-util b/poky/scripts/oe-pkgdata-util index 93220e361..75dd23efa 100755 --- a/poky/scripts/oe-pkgdata-util +++ b/poky/scripts/oe-pkgdata-util @@ -598,6 +598,9 @@ def main(): logger.error("Unable to find bitbake by searching parent directory of this script or PATH") sys.exit(1) logger.debug('Found bitbake path: %s' % bitbakepath) + if not os.environ.get('BUILDDIR', ''): + logger.error("This script can only be run after initialising the build environment (e.g. by using oe-init-build-env)") + sys.exit(1) tinfoil = tinfoil_init() try: args.pkgdata_dir = tinfoil.config_data.getVar('PKGDATA_DIR') diff --git a/poky/scripts/oe-run-native b/poky/scripts/oe-run-native index 4e63e69cc..22958d97e 100755 --- a/poky/scripts/oe-run-native +++ b/poky/scripts/oe-run-native @@ -43,7 +43,7 @@ fi OLD_PATH=$PATH # look for a tool only in native sysroot -PATH=$OECORE_NATIVE_SYSROOT/usr/bin:$OECORE_NATIVE_SYSROOT/bin:$OECORE_NATIVE_SYSROOT/usr/sbin:$OECORE_NATIVE_SYSROOT/sbin$(find $OECORE_NATIVE_SYSROOT/usr/bin/*-native -maxdepth 1 -type d -printf ":%p") +PATH=$OECORE_NATIVE_SYSROOT/usr/bin:$OECORE_NATIVE_SYSROOT/bin:$OECORE_NATIVE_SYSROOT/usr/sbin:$OECORE_NATIVE_SYSROOT/sbin$(find $OECORE_NATIVE_SYSROOT/usr/bin -maxdepth 1 -name "*-native" -type d -printf ":%p") tool_find=`/usr/bin/which $tool 2>/dev/null` if [ -n "$tool_find" ] ; then diff --git a/poky/scripts/runqemu b/poky/scripts/runqemu index e5e66f345..532f2e338 100755 --- a/poky/scripts/runqemu +++ b/poky/scripts/runqemu @@ -65,6 +65,7 @@ of the following environment variables (in any order): MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified) Simplified QEMU command-line options can be passed with: nographic - disable video console + novga - Disable VGA emulation completely sdl - choose the SDL UI frontend gtk - choose the Gtk UI frontend gl - enable virgl-based GL acceleration (also needs gtk or sdl options) @@ -94,11 +95,13 @@ Examples: runqemu qemux86-64 core-image-sato ext4 runqemu qemux86-64 wic-image-minimal wic runqemu path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial - runqemu qemux86 iso/hddimg/wic.vmdk/wic.qcow2/wic.vdi/ramfs/cpio.gz... + runqemu qemux86 iso/hddimg/wic.vmdk/wic.vhd/wic.vhdx/wic.qcow2/wic.vdi/ramfs/cpio.gz... runqemu qemux86 qemuparams="-m 256" runqemu qemux86 bootparams="psplash=false" runqemu path/to/<image>-<machine>.wic runqemu path/to/<image>-<machine>.wic.vmdk + runqemu path/to/<image>-<machine>.wic.vhdx + runqemu path/to/<image>-<machine>.wic.vhd """) def check_tun(): @@ -179,7 +182,7 @@ class BaseConfig(object): self.portlocks = {} self.bitbake_e = '' self.snapshot = False - self.wictypes = ('wic', 'wic.vmdk', 'wic.qcow2', 'wic.vdi') + self.wictypes = ('wic', 'wic.vmdk', 'wic.qcow2', 'wic.vdi', "wic.vhd", "wic.vhdx") self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs', 'cpio.gz', 'cpio', 'ramfs', 'tar.bz2', 'tar.gz') self.vmtypes = ('hddimg', 'iso') @@ -487,6 +490,8 @@ class BaseConfig(object): elif arg == 'egl-headless': self.set_dri_path() self.qemu_opt_script += ' -vga virtio -display egl-headless,show-cursor=on' + elif arg == 'novga': + self.qemu_opt_script += ' -vga none' elif arg == 'serial': self.kernel_cmdline_script += ' console=ttyS0' self.serialconsole = True @@ -1203,7 +1208,7 @@ class BaseConfig(object): return if 'wic.' in self.fstype: self.fstype = self.fstype[4:] - rootfs_format = self.fstype if self.fstype in ('vmdk', 'qcow2', 'vdi') else 'raw' + rootfs_format = self.fstype if self.fstype in ('vmdk', 'vhd', 'vhdx', 'qcow2', 'vdi') else 'raw' qb_rootfs_opt = self.get('QB_ROOTFS_OPT') if qb_rootfs_opt: diff --git a/poky/scripts/wic b/poky/scripts/wic index 24700f380..a741aed36 100755 --- a/poky/scripts/wic +++ b/poky/scripts/wic @@ -312,6 +312,8 @@ def wic_init_parser_create(subparser): subparser.add_argument("-o", "--outdir", dest="outdir", default='.', help="name of directory to create image in") + subparser.add_argument("-w", "--workdir", + help="temporary workdir to use for intermediate files") subparser.add_argument("-e", "--image-name", dest="image_name", help="name of the image to use the artifacts from " "e.g. core-image-sato") |
